Skip to content

Fix effective prompt contract drift #297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chubes4 merged 1 commit into from
Jul 24, 2026
Merged

Fix effective prompt contract drift #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 9 additions & 94 deletions bridges/kimaki/plugins/dm-context-filter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,32 +36,9 @@ Use the composed Data Machine AGENTS.md guidance for the coding runtime, workspa

## Bridge Diagnostics

For Kimaki bridge failures, inspect \`$HOME/.kimaki/kimaki.log\`. The log is reset every time Kimaki restarts, so it only covers the current run.
For Kimaki bridge failures, inspect \$HOME/.kimaki/kimaki.log. The log is reset every time Kimaki restarts, so it only covers the current run.
`;

const KIMAKI_GENERIC_SECTION_HEADINGS = [
"## permissions",
"## upgrading kimaki",
"## debugging kimaki issues",
"## uploading files to discord",
"## requesting files from the user",
"## archiving the current thread",
"## aborting a session",
"## discord user mentions",
"## starting new sessions from CLI",
"## running opencode commands via kimaki send",
"## switching agents in the current session",
"## scheduled sends and task management",
"## reading other sessions",
"## cross-project commands",
"## waiting for a session to finish",
"## creating worktrees",
"## generating audio from text",
"## running dev servers with tunnel access",
"## markdown formatting",
"## Callouts in Kimaki Discord",
];

const fleetContextFilter: Plugin = async () => {
return {
// Replace Kimaki's generic CLI/orchestration prompt with managed guidance.
Expand Down Expand Up @@ -122,85 +99,23 @@ const fleetContextFilter: Plugin = async () => {
};
};

/**
* Identify Kimaki's generated system prompt without matching composed AGENTS.md
* or other OpenCode system blocks from the managed install.
*
* @param {string} block - System prompt block.
* @return {boolean} Whether this block is Kimaki's generated bridge prompt.
*/
function isKimakiSystemPrompt(block: string): boolean {
return (
block.includes("The user is reading your messages from inside Discord, via kimaki.dev") ||
block.includes("## debugging kimaki issues") ||
block.includes("## uploading files to discord") ||
block.includes("Your current OpenCode session ID is:")
);
}

// Replace only positively identified Kimaki prompt text. Both transforms use
// this helper because message transforms also receive unrelated text.
function replaceKimakiSystemPrompt(block: string): string {
const filteredBlock = stripKimakiGenericSections(block);
const kimakiStart = kimakiSystemPromptStart(filteredBlock);
const kimakiStart = kimakiSystemPromptStart(block);
if (kimakiStart === -1) {
return filteredBlock;
}

const prefix = filteredBlock.slice(0, kimakiStart).trimEnd();
return [prefix, MANAGED_KIMAKI_SYSTEM_PROMPT].filter(Boolean).join("\n\n");
}

function stripKimakiGenericSections(block: string): string {
let result = block;
for (const heading of KIMAKI_GENERIC_SECTION_HEADINGS) {
result = stripMarkdownSection(result, heading);
}
return result.replace(/\n{3,}/g, "\n\n").trimEnd();
}

function stripMarkdownSection(block: string, heading: string): string {
const lines = block.split("\n");
const level = headingLevel(heading);
let start = -1;
let inFence = false;

for (let i = 0; i < lines.length; i++) {
if (/^```/.test(lines[i])) {
inFence = !inFence;
continue;
}
if (!inFence && lines[i] === heading) {
start = i;
break;
}
}

if (start === -1) {
return block;
}

let end = lines.length;
inFence = false;
for (let i = start + 1; i < lines.length; i++) {
if (/^```/.test(lines[i])) {
inFence = !inFence;
continue;
}
const match = !inFence ? lines[i].match(/^(#{1,6})\s+\S/) : null;
if (match && match[1].length <= level) {
end = i;
break;
}
}

return [...lines.slice(0, start), ...lines.slice(end)].join("\n");
}

function headingLevel(heading: string): number {
return heading.match(/^#+/)?.[0].length ?? 2;
// Only replace a positively identified Kimaki prompt. Message transforms
// also see ordinary user and composed AGENTS.md text.
const prefix = block.slice(0, kimakiStart).trimEnd();
return [prefix, MANAGED_KIMAKI_SYSTEM_PROMPT].filter(Boolean).join("\n\n");
}

function kimakiSystemPromptStart(block: string): number {
const markers = [
"## Kimaki Discord Bridge",
"The user is reading your messages from inside Discord, via kimaki.dev",
"Your current OpenCode session ID is:",
"## debugging kimaki issues",
Expand Down
3 changes: 2 additions & 1 deletion bridges/kimaki/post-upgrade.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ const fs = require('node:fs')

const file = process.env.SYSTEM_MESSAGE_FILE
const marker = 'wp-coding-agents managed Kimaki system prompt patch'
const literalDollar = '$'
const source = fs.readFileSync(file, 'utf8')

if (source.includes(marker)) {
Expand All @@ -203,7 +204,7 @@ Use the composed Data Machine AGENTS.md guidance for the coding runtime, workspa

## Bridge Diagnostics

For Kimaki bridge failures, inspect $HOME/.kimaki/kimaki.log. The log is reset every time Kimaki restarts, so it only covers the current run.
For Kimaki bridge failures, inspect \\${literalDollar}HOME/.kimaki/kimaki.log. The log is reset every time Kimaki restarts, so it only covers the current run.
\`;
`

Expand Down
Loading
Loading