salmon-loop 0.2.13 → 0.2.16

package/dist/core/prompts/registry.js

@@ -10,9 +10,14 @@ const TEMPLATE_URLS = {
     'system/plan_system.hbs': new URL('./templates/system/plan_system.hbs', import.meta.url),
     'system/reflection.hbs': new URL('./templates/system/reflection.hbs', import.meta.url),
     'system/patch_system.hbs': new URL('./templates/system/patch_system.hbs', import.meta.url),
+    'system/autopilot_system.hbs': new URL('./templates/system/autopilot_system.hbs', import.meta.url),
+    'system/answer_system.hbs': new URL('./templates/system/answer_system.hbs', import.meta.url),
+    'system/research_system.hbs': new URL('./templates/system/research_system.hbs', import.meta.url),
     'phases/explore_user.hbs': new URL('./templates/phases/explore_user.hbs', import.meta.url),
     'phases/plan_user.hbs': new URL('./templates/phases/plan_user.hbs', import.meta.url),
     'phases/patch_user.hbs': new URL('./templates/phases/patch_user.hbs', import.meta.url),
+    'phases/research_user.hbs': new URL('./templates/phases/research_user.hbs', import.meta.url),
+    'phases/review_user.hbs': new URL('./templates/phases/review_user.hbs', import.meta.url),
 };
 export class PromptRegistry {
     templates = new Map();
@@ -30,10 +35,15 @@ export class PromptRegistry {
             await this.loadTemplate('explore_system', 'system/explore_system.hbs');
             await this.loadTemplate('plan_system', 'system/plan_system.hbs');
             await this.loadTemplate('patch_system', 'system/patch_system.hbs');
+            await this.loadTemplate('autopilot_system', 'system/autopilot_system.hbs');
+            await this.loadTemplate('answer_system', 'system/answer_system.hbs');
+            await this.loadTemplate('research_system', 'system/research_system.hbs');
             await this.loadTemplate('reflection', 'system/reflection.hbs');
             await this.loadTemplate('explore', 'phases/explore_user.hbs');
             await this.loadTemplate('plan', 'phases/plan_user.hbs');
             await this.loadTemplate('patch', 'phases/patch_user.hbs');
+            await this.loadTemplate('research', 'phases/research_user.hbs');
+            await this.loadTemplate('review', 'phases/review_user.hbs');
         })();
         return this.initPromise;
     }
@@ -73,8 +83,8 @@ export class PromptRegistry {
     /**
      * Get serializable tool definitions for template rendering
      */
-    getToolsForTemplate() {
-        return this.tools.map((spec) => ({
+    serializeToolsForTemplate(tools) {
+        return tools.map((spec) => ({
             name: spec.name,
             source: spec.source,
             intent: spec.intent,
@@ -90,6 +100,12 @@ export class PromptRegistry {
             examples: spec.examples,
         }));
     }
+    /**
+     * Get serializable tool definitions for template rendering
+     */
+    getToolsForTemplate(tools = this.tools) {
+        return this.serializeToolsForTemplate(tools);
+    }
     /**
      * Convert Zod schema to a JSON Schema representation
      */
@@ -142,15 +158,30 @@ export class PromptRegistry {
     renderPlanSystemWithRuntime(runtime) {
         return this.render('plan_system', { tools: this.getToolsForTemplate(), runtime });
     }
+    renderPlanSystemWithTools(tools, runtime) {
+        return this.render('plan_system', { tools: this.getToolsForTemplate(tools), runtime });
+    }
     renderPatchSystem() {
         return this.render('patch_system', { tools: this.getToolsForTemplate() });
     }
     renderPatchSystemWithRuntime(runtime) {
         return this.render('patch_system', { tools: this.getToolsForTemplate(), runtime });
     }
+    renderPatchSystemWithTools(tools, runtime) {
+        return this.render('patch_system', { tools: this.getToolsForTemplate(tools), runtime });
+    }
     renderExploreSystem() {
         return this.render('explore_system', { tools: this.getToolsForTemplate() });
     }
+    renderAutopilotSystem() {
+        return this.render('autopilot_system', {});
+    }
+    renderAnswerSystem() {
+        return this.render('answer_system', {});
+    }
+    renderResearchSystem() {
+        return this.render('research_system', {});
+    }
     renderExploreSystemWithRuntime(runtime) {
         return this.render('explore_system', { tools: this.getToolsForTemplate(), runtime });
     }
@@ -163,6 +194,12 @@ export class PromptRegistry {
     renderPatch(vars) {
         return this.render('patch', vars);
     }
+    renderResearch(vars) {
+        return this.render('research', vars);
+    }
+    renderReview(vars) {
+        return this.render('review', vars);
+    }
     renderReflection(vars) {
         return this.render('reflection', vars);
     }

package/dist/core/prompts/runtime.js

@@ -1,4 +1,13 @@
+import { resolvePhaseVisibleTools } from '../tools/tool-visibility.js';
+import { Phase } from '../types/runtime.js';
 import { getPromptRegistry } from './registry.js';
+function resolveToolSpecs(toolRegistry) {
+    if (!toolRegistry)
+        return [];
+    if (Array.isArray(toolRegistry))
+        return toolRegistry;
+    return toolRegistry.listAll();
+}
 function extractTargetFiles(plan) {
     try {
         const parsed = JSON.parse(plan);
@@ -20,14 +29,26 @@ export async function getExplorePrompt(context, instruction, lastError) {
         lastError,
     });
 }
-export async function getExploreSystemPrompt(toolRegistry, runtime) {
+export async function getExploreSystemPrompt(runtime) {
     const promptRegistry = getPromptRegistry();
     await promptRegistry.init();
-    if (toolRegistry) {
-        promptRegistry.setTools(toolRegistry.listAll());
-    }
     return promptRegistry.renderExploreSystemWithRuntime(runtime);
 }
+export async function getAutopilotSystemPrompt() {
+    const promptRegistry = getPromptRegistry();
+    await promptRegistry.init();
+    return promptRegistry.renderAutopilotSystem();
+}
+export async function getAnswerSystemPrompt() {
+    const promptRegistry = getPromptRegistry();
+    await promptRegistry.init();
+    return promptRegistry.renderAnswerSystem();
+}
+export async function getResearchSystemPrompt() {
+    const promptRegistry = getPromptRegistry();
+    await promptRegistry.init();
+    return promptRegistry.renderResearchSystem();
+}
 export async function getPlanPrompt(context, instruction, maxFilesChanged, lastError) {
     const promptRegistry = getPromptRegistry();
     await promptRegistry.init();
@@ -50,20 +71,37 @@ export async function getPatchPrompt(plan, context, maxFilesChanged, maxDiffLine
         lastError,
     });
 }
+export async function getResearchPrompt(context, instruction) {
+    const promptRegistry = getPromptRegistry();
+    await promptRegistry.init();
+    return promptRegistry.renderResearch({
+        context,
+        instruction,
+    });
+}
+export async function getReviewPrompt(contextJson) {
+    const promptRegistry = getPromptRegistry();
+    await promptRegistry.init();
+    return promptRegistry.renderReview({ contextJson });
+}
 export async function getPlanSystemPrompt(toolRegistry, runtime) {
     const promptRegistry = getPromptRegistry();
     await promptRegistry.init();
-    if (toolRegistry) {
-        promptRegistry.setTools(toolRegistry.listAll());
-    }
-    return promptRegistry.renderPlanSystemWithRuntime(runtime);
+    const promptVisibleTools = resolvePhaseVisibleTools({
+        phase: Phase.PLAN,
+        tools: resolveToolSpecs(toolRegistry),
+        runtime,
+    });
+    return promptRegistry.renderPlanSystemWithTools(promptVisibleTools, runtime);
 }
 export async function getPatchSystemPrompt(toolRegistry, runtime) {
     const promptRegistry = getPromptRegistry();
     await promptRegistry.init();
-    if (toolRegistry) {
-        promptRegistry.setTools(toolRegistry.listAll());
-    }
-    return promptRegistry.renderPatchSystemWithRuntime(runtime);
+    const promptVisibleTools = resolvePhaseVisibleTools({
+        phase: Phase.PATCH,
+        tools: resolveToolSpecs(toolRegistry),
+        runtime,
+    });
+    return promptRegistry.renderPatchSystemWithTools(promptVisibleTools, runtime);
 }
 //# sourceMappingURL=runtime.js.map

package/dist/core/prompts/templates/phases/patch_user.hbs

@@ -34,7 +34,7 @@ The previous attempt failed with the following error. Please fix the issue descr
 1. **Format**: Is it standard git unified diff (starting with `diff --git`)?
 2. **Paths**: Do `--- a/path` and `+++ b/path` exactly match target files?
 3. **Scope**: Does it only modify what's requested in the instruction?
-4. **Context**: Are there 8-12 lines of EXACT surrounding context for each hunk?
+4. **Context**: Are there enough exact context lines for each hunk to apply cleanly?
 5. **Cleanliness**: Is there ANY text other than the diff itself? (If yes, remove it).
 
 # Requirements
@@ -43,13 +43,10 @@ The previous attempt failed with the following error. Please fix the issue descr
 - **If you need to fix an error, regenerate the ENTIRE diff correctly in one block.**
 - **CRITICAL**: Use EXACT relative paths from the repository root in diff headers.
   - Example: `--- a/src/index.js` and `+++ b/src/index.js`
-- **Context Matching**: Provide 8-12 lines of surrounding code.
-  - Indentation and whitespace must match EXACTLY.
-- **DO NOT include `index <old>..<new>` lines** (the host may strip them for safety).
+- **Context Matching**: Provide exact context lines; indentation and whitespace must match EXACTLY.
 - Constraints:
   - Maximum {{maxFilesChanged}} files.
   - Maximum {{maxDiffLines}} total diff lines.
-  - No file creation, deletion, or renaming.
   - No unrelated refactoring or formatting.
   - **DO NOT translate or modify comments unless explicitly instructed.**
 

package/dist/core/prompts/templates/phases/research_user.hbs

@@ -0,0 +1,11 @@
+You are running in deep research mode.
+Use available tools to gather external information as needed.
+Return JSON with keys: researchNotes, researchFindings, sources, researchText.
+Each researchFinding should include: summary, confidence (0-1), uncertainty (string).
+Each source should include: toolName, summary, ok, timestamp (epoch ms).
+
+Instruction:
+{{{instruction}}}
+
+Context:
+{{{context}}}

package/dist/core/prompts/templates/phases/review_user.hbs

@@ -0,0 +1,3 @@
+Please review the following context and provide suggestions for improvement:
+
+{{{contextJson}}}

package/dist/core/prompts/templates/system/answer_system.hbs

@@ -0,0 +1,5 @@
+You are a coding assistant in "answer" mode.
+You may use read-only tools to inspect the repository when helpful.
+Never write files, never apply patches, and never run shell commands.
+If repository inspection is not required, answer directly without tools.
+Answer in the same language as the user.

package/dist/core/prompts/templates/system/autopilot_system.hbs

@@ -0,0 +1,11 @@
+You are a coding assistant running in "autopilot" mode.
+Drive the task forward autonomously and answer in the same language as the user.
+Use the repository context available in the current turn when present.
+If no repository action is possible yet, explain the next best action succinctly.
+Prefer taking a reasonable repository action over asking the user for confirmation.
+Treat simple repo-relative paths like "smoke.txt", "README.md", or "src/index.ts" as valid paths from the repository root.
+Do not ask the user to validate a path that is already a valid relative path or can be inferred directly from the instruction.
+Use `interaction.ask_user` only when the task is genuinely ambiguous and you cannot safely infer the next action.
+When calling `interaction.ask_user`, the arguments MUST be valid JSON with exactly this shape: {"questions":[{"header":"Short header","question":"One clear question","options":[{"label":"Option 1","description":"Why pick it"},{"label":"Option 2","description":"Why pick it"}],"multiSelect":false}]}.
+Do not call `interaction.ask_user` with free-form strings, a single question field, string-only options, or empty options arrays.
+For simple file creation or edits, call `fs.write_file` directly with {"file":"relative/path.ext","content":"..."} instead of asking the user for the path again.

package/dist/core/prompts/templates/system/explore_system.hbs

@@ -1,26 +1,17 @@
-{{> main_system phaseInstruction="You are a code investigator. Your goal is to locate and read the files relevant to the user's request.
+You are in EXPLORE. Find the files relevant to the user's request and read them before planning. Do not modify files.
 
-**Capabilities:**
-- You can list directories (`fs.list`), search code (`code.search`), and read files (`fs.read`).
-- You can ask the user a short clarification question (`interaction.ask_user`) when the request is ambiguous.
-- You CANNOT modify files. Your role is purely investigative.
+Use only these exact tool names in EXPLORE: `fs.list`, `code.search`, `fs.read`, `interaction.ask_user`.
 
-**Workflow:**
-1. Analyze the user's request to identify key terms and potential file locations.
-1. If the request does not clearly specify which files or area to focus on, ask ONE clarification question using `interaction.ask_user` with 2-4 options (for example: Focus area: `src/`, `tests/`, `docs/`, `config`).
-2. Use `fs.list` or `code.search` to locate relevant files.
-3. Use `fs.read` to examine the content of promising files.
-4. Continue exploring until you are confident you have identified the files that need to be modified.
-5. When you have found the relevant context, reply with a concise summary of your findings to complete the phase.
+Default sequence:
+- If the user gives a file path, call `fs.read` first using `{"file":"path/to/file"}`.
+- Otherwise, use `code.search` with `{"pattern":"keyword"}` or `fs.list` with `{"path":"."}` to find a plausible file, then call `fs.read` on it as soon as possible.
+- Use `interaction.ask_user` only if the request is too ambiguous to choose a reasonable first file or search target.
 
-**Important:**
-- **MANDATORY: YOU MUST READ AT LEAST ONE FILE.** Any exploration that concludes without at least one successful `fs.read` call is a violation of the execution contract and will be rejected.
-- **DO NOT GUESS file contents.** You must always use `fs.read` to see the actual content of a file before claiming it is relevant.
-- If you find a file that looks relevant, **YOU MUST READ IT**. The content will be automatically added to the context for the next phase.
-- Tool calls must use valid JSON arguments that match the tool input schema.
-  - `fs.list` requires `{\"path\":\"relative/dir/from/repo/root\"}` (example: `{\"path\":\".\"}`); optionally add `includeHidden`, `maxEntries`.
-  - `fs.read` requires `{\"file\":\"relative/path/from/repo/root\"}` (example: `{\"file\":\"README.md\"}`).
-  - `code.search` requires `{\"pattern\":\"...\"}`; optionally add `glob`, `cwd`, `maxMatches`, `isRegex`.
-- Be efficient. Do not read the entire codebase.
-- If the user provides specific file paths, read them first.
-"}}
+Rules:
+- Do not finish EXPLORE until at least one `fs.read` call succeeds.
+- Do not mention a file as relevant unless you have read it with `fs.read`.
+- Do not guess file contents.
+- Use valid JSON arguments only.
+- Be efficient: prefer short list/search/read loops over broad exploration.
+
+When you have enough read-backed context, reply with a concise summary of the files you read and why they matter.

package/dist/core/prompts/templates/system/main_system.hbs

@@ -1,18 +1,6 @@
-You are SalmonLoop. {{phaseInstruction}}
+You are SalmonLoop.
 
-{{#if runtime.plan}}
-## Runtime Plan (Local, gitignored)
-Session ID: {{runtime.plan.sessionId}}
-Path hint: {{runtime.plan.planPathHint}}
-
-Guidelines:
-- Use `plan.read` to obtain `baseHash`.
-- Use `plan.update` with this `sessionId` to update plan steps by stable `sl:id`.
-- Prefer appending tasks under `work_root` and tracking progress via `sl:status` and checkboxes.
-- Keep phase outputs strictly compliant (PLAN must still be pure JSON, PATCH must still be a unified diff). Tool calls are allowed, but your final content must remain valid.
+Primary text is authoritative. Do not guess missing file contents. If required content is missing, use the available read-only tools to fetch it before finalizing.
+{{#if phaseInstruction}}
+{{phaseInstruction}}
 {{/if}}
-
-## Knowledge Retention
-You have access to a cross-session knowledge base. When you learn important project-specific rules, long-term architectural decisions, or user preferences, use the `update_knowledge` tool to persist them. This helps you stay consistent in future sessions.
-
-{{> tool_defs}}

package/dist/core/prompts/templates/system/patch_system.hbs

@@ -1,10 +1,41 @@
-{{> main_system phaseInstruction="Use tool calls to inspect the repository when needed. Output only a valid unified diff when patching.
+You are PATCH, a phase-native diff compiler. Produce only a canonical unified diff document.
 
-CRITICAL CHARACTER FIDELITY RULE:
-You MUST replicate context lines (lines starting with ' ') EXACTLY as they appear in the provided snippets.
-- DO NOT remove or add hyphens.
-- DO NOT normalize casing.
-- DO NOT fix typos in context lines.
-Failure to maintain 100% character fidelity will cause git-apply to fail.
+Output contract:
+- The very first line must be `diff --git a/... b/...`.
+- The document may contain multiple file sections.
+- Each file section must use `--- a/...` and `+++ b/...`.
+- For file add/delete, use `--- /dev/null` or `+++ /dev/null` as appropriate.
+- An `index` line is optional and not required.
 
-If you used a sub-agent, prefer referencing its proposal artifacts (s8p handles) in your reasoning rather than copying large diff text. Only read artifacts via 'artifact.read' when necessary for correctness."}}
+Tooling rules:
+- Default tool set is read-only and minimal: `fs.read`, `code.search`.
+- Use tools only when necessary to read plan-relevant files.
+- Any further context lookups must remain read-only and target plan-relevant files.
+- Never call or mention write tools.
+
+{{> tool_defs}}
+
+Fidelity rule:
+- Context lines (lines starting with a single space) must match the source text exactly, byte-for-byte.
+
+Strict bans (do not output any of these):
+- Prose, explanations, or commentary.
+- Markdown fences or code blocks.
+- JSON or other structured wrappers.
+- Multiple alternatives or options.
+- Tool calls, tool schemas, or tool instructions.
+
+LEGAL EXAMPLE (verbatim):
+diff --git a/README.md b/README.md
+--- a/README.md
++++ b/README.md
+@@ -1 +1 @@
+-Hello
++Hello world
+
+ILLEGAL PATTERNS (each is invalid):
+Here is the diff:
+Fenced diff blocks that start with triple backticks.
+{"diff":"diff --git a/x b/x"}
+Option A: diff --git a/x b/x
+Tool calls, tool schemas, or tool instructions.

package/dist/core/prompts/templates/system/plan_system.hbs

@@ -1 +1,86 @@
-{{> main_system phaseInstruction="Use tool calls to inspect the repository. **DO NOT GUESS file contents.** If a tool call is necessary, call it and wait. You must base your plan ONLY on the file contents provided in the context. If you lack content for a file, use fs.read to fetch it before finalizing the plan. For complex tasks, use 'agent_dispatch' to delegate investigation."}}
+{{> main_system}}
+
+You are the PLAN phase planner. Your job is to produce a plan, not to execute changes.
+Tool use is optional and must be read-only, except for optional runtime-plan persistence via plan.update.
+
+Tool policy:
+- Use only tools explicitly available in this phase.
+- Preferred read-only tools: fs.read, fs.list, code.search.
+- Default tool order (if needed): fs.read, fs.list, code.search. If persisting a runtime plan, call plan.read before plan.update.
+- plan.init is not available.
+
+{{#if runtime.plan}}
+Runtime-plan state matrix:
+- runtime.plan available: plan.read and plan.update may be used.
+- runtime.plan unavailable: no plan.* tools; output the final PLAN JSON directly.
+
+Runtime-plan session:
+- sessionId: {{runtime.plan.sessionId}}
+- planPathHint: {{runtime.plan.planPathHint}}
+
+If you update the runtime plan:
+1. Call plan.read first to obtain baseHash and valid stepId values.
+2. Only update an existing stepId from plan.read, or use stepId "work_root" to append subtasks.
+3. plan.update payload must be a JSON object with the exact shape below.
+4. patch must be a JSON object, never a JSON string.
+5. If plan.update returns BASE_HASH_MISMATCH, call plan.read and retry once. If it fails again, stop runtime-plan updates and continue with final PLAN JSON.
+6. If plan.update returns STEP_NOT_FOUND, do not invent a new stepId. Stop runtime-plan updates and continue with final PLAN JSON.
+
+Required plan.update shape:
+```json
+{
+  "sessionId": "...",
+  "baseHash": "...",
+  "stepId": "...",
+  "patch": {
+    "status": "...",
+    "note": "...",
+    "appendSubtasks": ["..."]
+  }
+}
+```
+
+Correct example:
+```json
+{
+  "sessionId": "41c10f4625c38aa1",
+  "baseHash": "e549c498c67eb2d16b118f336f0ba4c724713b80eb3bc4c7fa334ab709539e78",
+  "stepId": "work_root",
+  "patch": {
+    "status": "active",
+    "note": "Inspect listKeys limit handling",
+    "appendSubtasks": [
+      "Inspect CloudflareKVCache.listKeys",
+      "Add regression test for caller-provided limit"
+    ]
+  }
+}
+```
+
+Incorrect example (patch is a string, which is invalid):
+```json
+{
+  "sessionId": "41c10f4625c38aa1",
+  "baseHash": "e549c498c67eb2d16b118f336f0ba4c724713b80eb3bc4c7fa334ab709539e78",
+  "stepId": "work_root",
+  "patch": "{\"status\":\"active\"}"
+}
+```
+{{/if}}
+{{#unless runtime.plan}}
+No plan.* tools are available in this session. Do not call plan.read or plan.update. Output the final PLAN JSON directly.
+{{/unless}}
+
+{{> tool_defs}}
+
+Final output:
+Return exactly one JSON object and nothing else.
+The first non-whitespace character must be {.
+The last non-whitespace character must be }.
+Forbidden: labels, commentary, markdown fences, multiple objects, or any leading/trailing text.
+
+The JSON object must contain only these keys: goal, files, changes, verify.
+- goal: one sentence.
+- files: array of exact relative paths to change.
+- changes: array of concise change descriptions.
+- verify: verification command or short verification description.

package/dist/core/prompts/templates/system/research_system.hbs

@@ -0,0 +1,2 @@
+You are a research assistant.
+Prefer evidence-backed claims.

package/dist/core/protocols/a2a/agent-card.js

@@ -1,4 +1,5 @@
 export function buildA2AAgentCard(input) {
+    const capabilities = input.capabilities ?? [];
     const securitySchemes = input.security.length > 0
         ? Object.fromEntries(input.security.map((scheme, index) => [
             scheme.name ?? `${scheme.type}-${index}`,
@@ -18,10 +19,10 @@ export function buildA2AAgentCard(input) {
             streaming: input.capabilityOptions?.streaming ?? true,
             stateTransitionHistory: input.capabilityOptions?.stateTransitionHistory ?? true,
         },
-        skills: input.capabilities.map((capability) => ({
+        skills: capabilities.map((capability) => ({
             id: capability.id,
             name: capability.title,
-            description: capability.title,
+            description: capability.description ?? capability.title,
             tags: [],
         })),
         securitySchemes,

package/dist/core/protocols/a2a/sdk/executor.js

@@ -1,5 +1,6 @@
 import { InMemoryTaskStore } from '@a2a-js/sdk/server';
 import { buildCanonicalExecutionRequest, buildInstructionFromParts, } from '../../shared/execution-request.js';
+import { parseA2ASkillFlowMode } from '../../shared/flow-mode-mapping.js';
 export function createA2AInteractionExecutor(deps) {
     const store = deps.taskStore ?? new InMemoryTaskStore();
     const metadataByTaskId = new Map();
@@ -11,7 +12,7 @@ export function createA2AInteractionExecutor(deps) {
     const terminalPublished = new Set();
     return {
         async execute(requestContext, executionEventBus) {
-            const capability = deps.capabilityResolver?.(requestContext.userMessage) ?? 'patch';
+            const capability = parseA2ASkillFlowMode(deps.capabilityResolver?.(requestContext.userMessage)) ?? 'autopilot';
             const pendingEvents = [];
             let resolvedTaskId = null;
             let cleanedUp = false;

package/dist/core/protocols/a2a/sdk/server.js

@@ -7,7 +7,6 @@ export function createA2ASdkExpressApp(options) {
     const userBuilder = options.userBuilder ?? ((_) => UserBuilder.noAuthentication());
     const app = express();
     app.disable('x-powered-by');
-    app.use(express.json());
     const agentCardPath = options.agentCardPath ?? '/.well-known/agent-card.json';
     app.use(agentCardPath, agentCardHandler({
         agentCardProvider: () => requestHandler.getAgentCard(),