@simonepri/refined-antigravity-acp 0.2.0 → 1.0.0

package/dist/src/fixes/missing-question-fallback/index.js

@@ -0,0 +1,119 @@
+/**
+ * Problem:
+ * Upstream system prompts explicitly forbid the model from providing an "Other" option in
+ * multiple-choice user prompts (`"Do NOT add an 'Other' option to questions"`), stranding users
+ * with no way to enter custom or free-text answers when none of the choices apply.
+ *
+ * Solution:
+ * Injects a prompt override directing the model to always provide an "Other" option for free-text
+ * answers, and intercepts inbound `ask_question` tool calls to append a fallback "Other" choice if omitted.
+ */
+import { ACP_METHODS, SESSION_UPDATES, isMethod, } from "../../core/types.js";
+export const QUESTION_OPTIONS_INSTRUCTIONS = [
+    "Ignore the ask_question 'no other' rule: always include an 'Other' option for free-text responses.",
+];
+export const OTHER_OPTION_REGEX = /\b(?:other|none\s+of\s+the\s+above|something\s+else)\b/i;
+function parsePayload(raw) {
+    if (typeof raw === "string") {
+        try {
+            const parsed = JSON.parse(raw);
+            return typeof parsed === "object" && parsed !== null
+                ? { parsed: parsed, isString: true }
+                : { parsed: null, isString: true };
+        }
+        catch {
+            return { parsed: null, isString: true };
+        }
+    }
+    if (typeof raw === "object" && raw !== null) {
+        return { parsed: raw, isString: false };
+    }
+    return { parsed: null, isString: false };
+}
+function appendOtherIfMissing(question) {
+    if (!Array.isArray(question.options))
+        return false;
+    const hasOther = question.options.some((opt) => typeof opt === "string" && OTHER_OPTION_REGEX.test(opt));
+    if (hasOther)
+        return false;
+    question.options.push("Other");
+    return true;
+}
+export function ensureOtherOption(raw) {
+    if (!raw)
+        return { modified: false, result: raw };
+    const { parsed, isString } = parsePayload(raw);
+    if (!parsed || !Array.isArray(parsed.questions)) {
+        return { modified: false, result: raw };
+    }
+    let anyModified = false;
+    for (const q of parsed.questions) {
+        if (q && appendOtherIfMissing(q)) {
+            anyModified = true;
+        }
+    }
+    if (!anyModified)
+        return { modified: false, result: raw };
+    const finalResult = isString ? JSON.stringify(parsed) : parsed;
+    return { modified: true, result: finalResult };
+}
+function patchFieldIfAskQuestion(container, field) {
+    const value = container[field];
+    if (value === undefined)
+        return;
+    const { modified, result } = ensureOtherOption(value);
+    if (modified) {
+        container[field] = result;
+    }
+}
+function isAskQuestionName(name, title) {
+    if (name === "ask_question")
+        return true;
+    return typeof title === "string" && title.toLowerCase().includes("ask_question");
+}
+function handleSessionUpdate(update) {
+    const isToolCall = update.sessionUpdate === SESSION_UPDATES.TOOL_CALL ||
+        update.sessionUpdate === SESSION_UPDATES.TOOL_CALL_UPDATE;
+    if (!isToolCall)
+        return;
+    if (isAskQuestionName(update.name ?? undefined, update.title ?? undefined)) {
+        patchFieldIfAskQuestion(update, "rawInput");
+        patchFieldIfAskQuestion(update, "arguments");
+    }
+}
+function handleRpcRequest(msg) {
+    if (!("method" in msg) || typeof msg.method !== "string")
+        return;
+    const isToolInvocation = msg.method === "tools/call" || msg.method === "session/requestPermission";
+    if (!isToolInvocation || !msg.params || typeof msg.params !== "object")
+        return;
+    const p = msg.params;
+    const toolName = (p.name ?? p.tool);
+    if (toolName === "ask_question") {
+        patchFieldIfAskQuestion(p, "arguments");
+        patchFieldIfAskQuestion(p, "rawInput");
+    }
+}
+function processInboundToolCall(msg) {
+    if (isMethod(msg, ACP_METHODS.SESSION_UPDATE)) {
+        const update = msg.params?.update;
+        if (update)
+            handleSessionUpdate(update);
+    }
+    else {
+        handleRpcRequest(msg);
+    }
+    return msg;
+}
+export const missingQuestionFallbackFix = {
+    name: "missing-question-fallback",
+    description: "Steers model to include an Other choice and injects a fallback option into ask_question tool calls",
+    getSystemInstructions() {
+        return QUESTION_OPTIONS_INSTRUCTIONS;
+    },
+    onInbound(msg) {
+        return [processInboundToolCall(msg)];
+    },
+};
+export const questionOptionsFix = missingQuestionFallbackFix;
+//# sourceMappingURL=index.js.map

package/dist/src/fixes/missing-question-fallback/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/fixes/missing-question-fallback/index.ts"],"names":[],"mappings":"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"}

package/dist/src/fixes/missing-slash-skills/index.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Problem:
+ * Upstream `agy_acp_server` only advertises built-in model commands and ignores custom
+ * workspace slash skills defined in standard project directories (e.g. `.agents/skills`, `.gemini/skills`).
+ *
+ * Solution:
+ * Recursively discovers `SKILL.md` skill definitions across all configured workspace directories,
+ * injects the skills catalog into active prompts, and dynamically augments `available_commands_update`.
+ */
+import { type AcpFix } from "../../core/types.js";
+import { type AvailableCommand, type DiscoveredSkill, BUILTIN_COMMANDS, parseSkillFile, resolveSkillRoots, discoverSkills, augmentCommands, formatSkillsCatalog } from "./skills.js";
+export { BUILTIN_COMMANDS, parseSkillFile, resolveSkillRoots, discoverSkills, augmentCommands, formatSkillsCatalog, };
+export type { AvailableCommand, DiscoveredSkill };
+export declare function injectSkillsCatalog(prompt: unknown, cwd?: string): void;
+export declare const missingSlashSkillsFix: AcpFix;
+export declare const slashSkillsFix: AcpFix;
+//# sourceMappingURL=index.d.ts.map

package/dist/src/fixes/missing-slash-skills/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/fixes/missing-slash-skills/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAML,KAAK,MAAM,EAOZ,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACpB,gBAAgB,EAChB,cAAc,EACd,iBAAiB,EACjB,cAAc,EACd,eAAe,EACf,mBAAmB,EACpB,MAAM,aAAa,CAAC;AAErB,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,iBAAiB,EACjB,cAAc,EACd,eAAe,EACf,mBAAmB,GACpB,CAAC;AACF,YAAY,EAAE,gBAAgB,EAAE,eAAe,EAAE,CAAC;AA8ClD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAevE;AAiBD,eAAO,MAAM,qBAAqB,EAAE,MAqBnC,CAAC;AAEF,eAAO,MAAM,cAAc,QAAwB,CAAC"}

package/dist/src/fixes/missing-slash-skills/index.js

@@ -0,0 +1,107 @@
+/**
+ * Problem:
+ * Upstream `agy_acp_server` only advertises built-in model commands and ignores custom
+ * workspace slash skills defined in standard project directories (e.g. `.agents/skills`, `.gemini/skills`).
+ *
+ * Solution:
+ * Recursively discovers `SKILL.md` skill definitions across all configured workspace directories,
+ * injects the skills catalog into active prompts, and dynamically augments `available_commands_update`.
+ */
+import { ACP_METHODS, SESSION_UPDATES, isMethod, isJsonRpcSuccessResponse, } from "../../core/types.js";
+import { extractSessionId, getSession, getOrCreateSession } from "../../core/session-cache.js";
+import { BUILTIN_COMMANDS, parseSkillFile, resolveSkillRoots, discoverSkills, augmentCommands, formatSkillsCatalog, } from "./skills.js";
+export { BUILTIN_COMMANDS, parseSkillFile, resolveSkillRoots, discoverSkills, augmentCommands, formatSkillsCatalog, };
+function availableCommandsUpdateOf(msg) {
+    if (!isMethod(msg, ACP_METHODS.SESSION_UPDATE))
+        return null;
+    const params = msg.params;
+    const update = params?.update;
+    if (!update || typeof update !== "object")
+        return null;
+    if (update.sessionUpdate !== SESSION_UPDATES.AVAILABLE_COMMANDS_UPDATE)
+        return null;
+    return { sessionId: params?.sessionId, update };
+}
+function augmentAvailableCommandsUpdate(msg, context) {
+    const found = availableCommandsUpdateOf(msg);
+    if (!found)
+        return;
+    const cwd = getSession(context.sessionCache, found.sessionId)?.cwd;
+    const existing = Array.isArray(found.update.availableCommands)
+        ? found.update.availableCommands
+        : undefined;
+    found.update.availableCommands = augmentCommands(existing, cwd);
+}
+function initialAvailableCommandsOf(msg, context) {
+    if (!isJsonRpcSuccessResponse(msg))
+        return null;
+    const sessionId = typeof msg.result?.sessionId === "string" ? msg.result.sessionId : undefined;
+    if (!sessionId)
+        return null;
+    const cwd = getSession(context.sessionCache, sessionId)?.cwd;
+    const commands = augmentCommands(undefined, cwd);
+    if (commands.length === 0)
+        return null;
+    return {
+        jsonrpc: "2.0",
+        method: ACP_METHODS.SESSION_UPDATE,
+        params: {
+            sessionId,
+            update: {
+                sessionUpdate: SESSION_UPDATES.AVAILABLE_COMMANDS_UPDATE,
+                availableCommands: commands,
+            },
+        },
+    };
+}
+export function injectSkillsCatalog(prompt, cwd) {
+    if (!Array.isArray(prompt))
+        return;
+    const skills = discoverSkills(cwd);
+    const catalog = formatSkillsCatalog(skills);
+    if (!catalog)
+        return;
+    const firstChunk = prompt[0];
+    if (firstChunk && firstChunk.type === "text" && typeof firstChunk.text === "string") {
+        firstChunk.text = `${catalog}\n\n${firstChunk.text}`;
+    }
+    else {
+        prompt.unshift({
+            type: "text",
+            text: catalog,
+        });
+    }
+}
+function handleSessionPromptOutbound(msg, context) {
+    const sessionId = extractSessionId(msg);
+    if (!sessionId)
+        return;
+    const session = getOrCreateSession(context.sessionCache, sessionId);
+    const hasInjected = session.fixData?.get("hasInjectedSkillsCatalog");
+    if (!hasInjected) {
+        const prompt = "params" in msg ? msg.params?.prompt : undefined;
+        injectSkillsCatalog(prompt, session.cwd);
+        session.fixData ??= new Map();
+        session.fixData.set("hasInjectedSkillsCatalog", true);
+    }
+}
+export const missingSlashSkillsFix = {
+    name: "missing-slash-skills",
+    description: "Discovers workspace skills from SKILL.md files and augments ACP available_commands_update",
+    onOutbound(msg, context) {
+        if (isMethod(msg, ACP_METHODS.SESSION_PROMPT)) {
+            handleSessionPromptOutbound(msg, context);
+        }
+        return msg;
+    },
+    onInbound(msg, context) {
+        if ("result" in msg && msg.result) {
+            const initialCommands = initialAvailableCommandsOf(msg, context);
+            return initialCommands ? [msg, initialCommands] : [msg];
+        }
+        augmentAvailableCommandsUpdate(msg, context);
+        return [msg];
+    },
+};
+export const slashSkillsFix = missingSlashSkillsFix;
+//# sourceMappingURL=index.js.map

package/dist/src/fixes/missing-slash-skills/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/fixes/missing-slash-skills/index.ts"],"names":[],"mappings":"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"}

package/dist/src/{skills.d.ts → fixes/missing-slash-skills/skills.d.ts}

@@ -12,6 +12,7 @@ export interface DiscoveredSkill {
 export declare function parseSkillFile(filePath: string): DiscoveredSkill | null;
 export declare function resolveSkillRoots(cwd?: string): string[];
 export declare function discoverSkills(cwd?: string): Map<string, DiscoveredSkill>;
+export declare const BUILTIN_COMMANDS: AvailableCommand[];
 export declare function augmentCommands(existingCommands: AvailableCommand[] | undefined, cwd?: string): AvailableCommand[];
-export declare function expandSkillInvocation(text: string, cwd?: string): string;
+export declare function formatSkillsCatalog(skills: Map<string, DiscoveredSkill>): string;
 //# sourceMappingURL=skills.d.ts.map

package/dist/src/fixes/missing-slash-skills/skills.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"skills.d.ts","sourceRoot":"","sources":["../../../../src/fixes/missing-slash-skills/skills.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAmFD,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI,CAiBvE;AAED,wBAAgB,iBAAiB,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAoBxD;AAwBD,wBAAgB,cAAc,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAgBzE;AAED,eAAO,MAAM,gBAAgB,EAAE,gBAAgB,EAuC9C,CAAC;AAEF,wBAAgB,eAAe,CAC7B,gBAAgB,EAAE,gBAAgB,EAAE,GAAG,SAAS,EAChD,GAAG,CAAC,EAAE,MAAM,GACX,gBAAgB,EAAE,CAkBpB;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,MAAM,CAgBhF"}

package/dist/src/fixes/missing-slash-skills/skills.js

@@ -0,0 +1,199 @@
+import { existsSync, readdirSync, readFileSync } from "node:fs";
+import os from "node:os";
+import path from "node:path";
+function unquote(val) {
+    const trimmed = val.trim();
+    if ((trimmed.startsWith('"') && trimmed.endsWith('"')) ||
+        (trimmed.startsWith("'") && trimmed.endsWith("'"))) {
+        return trimmed.slice(1, -1).replace(/''/g, "'");
+    }
+    const commentIdx = trimmed.search(/\s+#/);
+    return commentIdx !== -1 ? trimmed.slice(0, commentIdx).trim() : trimmed;
+}
+function parseInvocable(val) {
+    const v = unquote(val).toLowerCase();
+    return v !== "false" && v !== "no" && v !== "0";
+}
+function parseDescription(rest, lines, i) {
+    if (rest === ">" || rest === ">-" || rest === "|" || rest === "|-") {
+        const block = [];
+        let idx = i + 1;
+        while (idx < lines.length) {
+            const line = lines[idx];
+            if (line === undefined || (!/^\s+/.test(line) && line.trim().length !== 0)) {
+                break;
+            }
+            block.push(line.trim());
+            idx++;
+        }
+        const text = rest.startsWith(">") ? block.join(" ") : block.join("\n").trim();
+        return { desc: text, nextIndex: idx - 1 };
+    }
+    return { desc: unquote(rest), nextIndex: i };
+}
+function parseFrontmatter(frontmatter) {
+    const lines = frontmatter.split(/\r?\n/);
+    let name;
+    let description;
+    let userInvocable = true;
+    for (let i = 0; i < lines.length; i++) {
+        const line = lines[i];
+        if (line === undefined)
+            continue;
+        const nameMatch = line.match(/^name:\s*(.*)$/);
+        if (nameMatch && nameMatch[1] !== undefined)
+            name = unquote(nameMatch[1]);
+        const invocableMatch = line.match(/^(?:user-invocable|user_invocable):\s*(.*)$/);
+        if (invocableMatch && invocableMatch[1] !== undefined) {
+            userInvocable = parseInvocable(invocableMatch[1]);
+        }
+        const descMatch = line.match(/^description:\s*(.*)$/);
+        if (descMatch && descMatch[1] !== undefined) {
+            const parsed = parseDescription(descMatch[1].trim(), lines, i);
+            description = parsed.desc;
+            i = parsed.nextIndex;
+        }
+    }
+    return { name, description, userInvocable };
+}
+function extractFrontmatterAndBody(content) {
+    const fmMatch = content.match(/^---\r?\n([\s\S]*?)\r?\n(?:---|\.\.\.)(?:\r?\n|$)([\s\S]*)$/);
+    if (!fmMatch)
+        return { meta: { userInvocable: true }, instructions: content };
+    const frontmatter = fmMatch[1] ?? "";
+    const body = fmMatch[2] ?? content;
+    return { meta: parseFrontmatter(frontmatter), instructions: body.trim() };
+}
+export function parseSkillFile(filePath) {
+    if (!existsSync(filePath))
+        return null;
+    try {
+        const content = readFileSync(filePath, "utf-8");
+        const { meta, instructions } = extractFrontmatterAndBody(content);
+        const fallbackName = path.basename(path.dirname(filePath));
+        return {
+            name: meta.name || fallbackName,
+            description: meta.description || `Skill: ${fallbackName}`,
+            instructions,
+            userInvocable: meta.userInvocable,
+            filePath,
+        };
+    }
+    catch {
+        return null;
+    }
+}
+export function resolveSkillRoots(cwd) {
+    const candidates = [];
+    if (cwd) {
+        candidates.push(path.join(cwd, ".agents/skills"), path.join(cwd, ".gemini/skills"), path.join(cwd, ".codex/skills"), path.join(cwd, "skills"));
+    }
+    const home = os.homedir();
+    candidates.push(path.join(home, ".gemini/antigravity-cli/skills"), path.join(home, ".gemini/config/skills"), path.join(home, ".gemini/skills"), path.join(home, ".agents/skills"), path.join(home, ".claude/skills"), path.join(home, ".codex/skills"));
+    return Array.from(new Set(candidates.filter((dir) => existsSync(dir))));
+}
+const skillsCache = new Map();
+const SKILLS_CACHE_TTL_MS = 5000;
+function scanSkillRoot(root, skills) {
+    try {
+        for (const entry of readdirSync(root, { withFileTypes: true })) {
+            if (!entry.isDirectory() && !entry.isSymbolicLink())
+                continue;
+            const skill = parseSkillFile(path.join(root, entry.name, "SKILL.md"));
+            if (skill && !skills.has(skill.name)) {
+                skills.set(skill.name, skill);
+            }
+        }
+    }
+    catch {
+        // Ignore unreadable dirs
+    }
+}
+export function discoverSkills(cwd) {
+    const key = cwd ?? "";
+    const now = Date.now();
+    const cached = skillsCache.get(key);
+    if (cached && now - cached.timestamp < SKILLS_CACHE_TTL_MS) {
+        return cached.skills;
+    }
+    const roots = resolveSkillRoots(cwd);
+    const skills = new Map();
+    for (const root of roots) {
+        scanSkillRoot(root, skills);
+    }
+    skillsCache.set(key, { timestamp: now, skills });
+    return skills;
+}
+export const BUILTIN_COMMANDS = [
+    {
+        name: "boost",
+        description: "Deep thinking, strategic planning, multiple perspectives, and rigorous verification (https://antigravity.google/docs/boost/)",
+    },
+    {
+        name: "teamwork",
+        description: "Coordinate a team of autonomous subagents working together on complex tasks (https://antigravity.google/docs/teamwork/)",
+    },
+    {
+        name: "teamwork-preview",
+        description: "Preview multi-agent team orchestration for collaborative parallel tasks",
+    },
+    {
+        name: "goal",
+        description: "Run a long-running task autonomously until the goal is fully achieved",
+    },
+    {
+        name: "plan",
+        description: "Plan complex tasks step-by-step before execution",
+    },
+    {
+        name: "schedule",
+        description: "Run an instruction on a recurring schedule or set a one-time timer",
+    },
+    {
+        name: "browser",
+        description: "Interact with web applications and browse the web",
+    },
+    {
+        name: "grill-me",
+        description: "Interactive interview to resolve design decisions and align on plans",
+    },
+    {
+        name: "learn",
+        description: "Persist learnings, corrections, and complex setups for future tasks",
+    },
+];
+export function augmentCommands(existingCommands, cwd) {
+    const result = new Map();
+    if (Array.isArray(existingCommands)) {
+        for (const cmd of existingCommands) {
+            if (cmd?.name)
+                result.set(cmd.name, cmd);
+        }
+    }
+    for (const cmd of BUILTIN_COMMANDS) {
+        if (!result.has(cmd.name)) {
+            result.set(cmd.name, cmd);
+        }
+    }
+    for (const skill of discoverSkills(cwd).values()) {
+        if (skill.userInvocable && !result.has(skill.name)) {
+            result.set(skill.name, { name: skill.name, description: skill.description });
+        }
+    }
+    return Array.from(result.values());
+}
+export function formatSkillsCatalog(skills) {
+    if (skills.size === 0)
+        return "";
+    const lines = Array.from(skills.values()).map((skill) => `- ${skill.name} (${skill.filePath}): ${skill.description}`);
+    return [
+        "<skills>",
+        "You can use specialized 'skills' to help you with complex tasks.",
+        "If a skill seems relevant to your current task, read its SKILL.md instructions using your file reading tool before proceeding.",
+        "",
+        "Available skills:",
+        ...lines,
+        "</skills>",
+    ].join("\n");
+}
+//# sourceMappingURL=skills.js.map

package/dist/src/fixes/missing-slash-skills/skills.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"skills.js","sourceRoot":"","sources":["../../../../src/fixes/missing-slash-skills/skills.ts"],"names":[],"mappings":"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"}

package/dist/src/fixes/missing-system-prompt/index.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Problem:
+ * Standard ACP protocol clients configure custom system prompts, workspace instructions,
+ * and personas via `_meta.systemPrompt` (or client-nested metadata). Upstream `agy_acp_server`
+ * ignores these metadata fields, providing no native mechanism to inject custom personas or rules.
+ *
+ * Solution:
+ * Caches client system prompts and dynamically injects them into the initial prompt turn
+ * enclosed in `<system_instruction>` and `<user_instruction>` blocks without mutating persisted history.
+ */
+import { type AcpStreamMessage, type AcpFix } from "../../core/types.js";
+export declare const INSTRUCTION_BLOCKS_PREFIX_PATTERN: RegExp;
+export declare function stripSystemContext(text: string): string;
+export declare function formatSystemContext(systemPrompt?: string, harnessInstructions?: readonly string[]): string;
+export declare function extractSystemPrompt(msg: AcpStreamMessage): string | undefined;
+export declare function injectSystemContext(prompt: unknown, systemPrompt?: string, harnessInstructions?: readonly string[]): void;
+export declare const missingSystemPromptFix: AcpFix;
+export declare const systemPromptFix: AcpFix;
+//# sourceMappingURL=index.d.ts.map

package/dist/src/fixes/missing-system-prompt/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/fixes/missing-system-prompt/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAGL,KAAK,gBAAgB,EACrB,KAAK,MAAM,EAGZ,MAAM,qBAAqB,CAAC;AAO7B,eAAO,MAAM,iCAAiC,QAC+I,CAAC;AAE9L,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED,wBAAgB,mBAAmB,CACjC,YAAY,CAAC,EAAE,MAAM,EACrB,mBAAmB,GAAE,SAAS,MAAM,EAAO,GAC1C,MAAM,CAaR;AA8BD,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,gBAAgB,GAAG,MAAM,GAAG,SAAS,CAW7E;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,OAAO,EACf,YAAY,CAAC,EAAE,MAAM,EACrB,mBAAmB,GAAE,SAAS,MAAM,EAAO,GAC1C,IAAI,CAcN;AA8CD,eAAO,MAAM,sBAAsB,EAAE,MAapC,CAAC;AAEF,eAAO,MAAM,eAAe,QAAyB,CAAC"}

package/dist/src/fixes/missing-system-prompt/index.js

@@ -0,0 +1,118 @@
+/**
+ * Problem:
+ * Standard ACP protocol clients configure custom system prompts, workspace instructions,
+ * and personas via `_meta.systemPrompt` (or client-nested metadata). Upstream `agy_acp_server`
+ * ignores these metadata fields, providing no native mechanism to inject custom personas or rules.
+ *
+ * Solution:
+ * Caches client system prompts and dynamically injects them into the initial prompt turn
+ * enclosed in `<system_instruction>` and `<user_instruction>` blocks without mutating persisted history.
+ */
+import { ACP_METHODS, isMethod, } from "../../core/types.js";
+import { extractSessionId, getOrCreateSession, recordPendingSessionMetadata, } from "../../core/session-cache.js";
+export const INSTRUCTION_BLOCKS_PREFIX_PATTERN = /^\s*(?:<\s*(?:system|user)[-_](?:instruction|message)(?:\s+[^>]*)?>[\s\S]*?<\/\s*(?:system|user)[-_](?:instruction|message)\s*>\s*|<\s*skills(?:\s+[^>]*)?>[\s\S]*?<\/\s*skills\s*>\s*)+/i;
+export function stripSystemContext(text) {
+    return text.replace(INSTRUCTION_BLOCKS_PREFIX_PATTERN, "");
+}
+export function formatSystemContext(systemPrompt, harnessInstructions = []) {
+    const blocks = [];
+    if (harnessInstructions.length > 0) {
+        const formatted = harnessInstructions.map((r) => `- ${r}`).join("\n");
+        blocks.push(`<system_instruction>\n${formatted}\n</system_instruction>`);
+    }
+    if (systemPrompt && systemPrompt.trim().length > 0) {
+        blocks.push(`<user_instruction>\n${systemPrompt.trim()}\n</user_instruction>`);
+    }
+    return blocks.join("\n\n");
+}
+function findNestedSystemPrompt(meta) {
+    for (const val of Object.values(meta)) {
+        if (val && typeof val === "object" && "systemPrompt" in val) {
+            const nested = val.systemPrompt;
+            if (typeof nested === "string" && nested.trim().length > 0) {
+                return nested.trim();
+            }
+        }
+    }
+    return undefined;
+}
+export function extractSystemPrompt(msg) {
+    if (!("params" in msg) || !msg.params)
+        return undefined;
+    const params = msg.params;
+    if (!params._meta)
+        return undefined;
+    if (typeof params._meta.systemPrompt === "string") {
+        const trimmed = params._meta.systemPrompt.trim();
+        if (trimmed.length > 0)
+            return trimmed;
+    }
+    return findNestedSystemPrompt(params._meta);
+}
+export function injectSystemContext(prompt, systemPrompt, harnessInstructions = []) {
+    if (!Array.isArray(prompt))
+        return;
+    const context = formatSystemContext(systemPrompt, harnessInstructions);
+    if (!context)
+        return;
+    const firstChunk = prompt[0];
+    if (firstChunk && firstChunk.type === "text" && typeof firstChunk.text === "string") {
+        firstChunk.text = `${context}\n\n${firstChunk.text}`;
+    }
+    else {
+        prompt.unshift({
+            type: "text",
+            text: context,
+        });
+    }
+}
+function handleSessionNewOutbound(msg, context) {
+    const systemPrompt = extractSystemPrompt(msg);
+    if (!systemPrompt || !("id" in msg) || msg.id === null || msg.id === undefined)
+        return;
+    const pending = context.sessionCache.pendingSessionMetadata.get(msg.id) ?? {};
+    pending.fixData ??= new Map();
+    pending.fixData.set("systemPrompt", systemPrompt);
+    recordPendingSessionMetadata(context.sessionCache, msg.id, pending);
+}
+function collectSystemInstructions(fixes, session, context) {
+    if (!fixes)
+        return [];
+    const instructions = [];
+    for (const fix of fixes) {
+        const list = fix.getSystemInstructions?.(session, context);
+        if (list && list.length > 0) {
+            instructions.push(...list);
+        }
+    }
+    return instructions;
+}
+function handleSessionPromptOutbound(msg, context) {
+    const sessionId = extractSessionId(msg);
+    if (!sessionId)
+        return;
+    const session = getOrCreateSession(context.sessionCache, sessionId);
+    if (session.fixData?.get("hasInjectedSystemContext"))
+        return;
+    const systemPrompt = session.fixData?.get("systemPrompt");
+    const prompt = "params" in msg ? msg.params?.prompt : undefined;
+    const instructions = collectSystemInstructions(context.fixes, session, context);
+    injectSystemContext(prompt, systemPrompt, instructions);
+    session.fixData ??= new Map();
+    session.fixData.set("hasInjectedSystemContext", true);
+}
+export const missingSystemPromptFix = {
+    name: "missing-system-prompt",
+    description: "Injects client-configured custom system prompts and instructions into session prompts",
+    onOutbound(msg, context) {
+        if (isMethod(msg, ACP_METHODS.SESSION_NEW)) {
+            handleSessionNewOutbound(msg, context);
+        }
+        else if (isMethod(msg, ACP_METHODS.SESSION_PROMPT)) {
+            handleSessionPromptOutbound(msg, context);
+        }
+        return msg;
+    },
+};
+export const systemPromptFix = missingSystemPromptFix;
+//# sourceMappingURL=index.js.map

package/dist/src/fixes/missing-system-prompt/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/fixes/missing-system-prompt/index.ts"],"names":[],"mappings":"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"}