@amalgm/chat 0.2.2 → 0.2.4

package/dist/normalizers/claude.d.ts

@@ -235,29 +235,6 @@ export declare function createClaudeNormalizer(events: EventConstructors): {
             method?: string | undefined;
             payload?: unknown;
         } | undefined;
-    } | {
-        ts: number;
-        type: "compaction.started";
-        trigger: "auto" | "manual" | "model_triggered";
-        providerSessionId?: string | null | undefined;
-        raw?: {
-            source: string;
-            method?: string | undefined;
-            payload?: unknown;
-        } | undefined;
-    } | {
-        ts: number;
-        type: "compaction.finished";
-        trigger: "auto" | "manual" | "model_triggered";
-        providerSessionId?: string | null | undefined;
-        raw?: {
-            source: string;
-            method?: string | undefined;
-            payload?: unknown;
-        } | undefined;
-        preTokens?: number | null | undefined;
-        postTokens?: number | null | undefined;
-        durationMs?: number | null | undefined;
     } | {
         ts: number;
         type: "warning";
@@ -333,6 +310,29 @@ export declare function createClaudeNormalizer(events: EventConstructors): {
             source: string;
             exact: boolean;
         } | undefined;
+    } | {
+        ts: number;
+        type: "compaction.started";
+        trigger: "auto" | "manual" | "model_triggered";
+        providerSessionId?: string | null | undefined;
+        raw?: {
+            source: string;
+            method?: string | undefined;
+            payload?: unknown;
+        } | undefined;
+    } | {
+        ts: number;
+        type: "compaction.finished";
+        trigger: "auto" | "manual" | "model_triggered";
+        providerSessionId?: string | null | undefined;
+        raw?: {
+            source: string;
+            method?: string | undefined;
+            payload?: unknown;
+        } | undefined;
+        preTokens?: number | null | undefined;
+        postTokens?: number | null | undefined;
+        durationMs?: number | null | undefined;
     })[];
     normalizeClaudeMessage: (message: AnyRecord | null | undefined, state?: ClaudeNormalizerState | null) => ({
         ts: number;
@@ -514,29 +514,6 @@ export declare function createClaudeNormalizer(events: EventConstructors): {
             method?: string | undefined;
             payload?: unknown;
         } | undefined;
-    } | {
-        ts: number;
-        type: "compaction.started";
-        trigger: "auto" | "manual" | "model_triggered";
-        providerSessionId?: string | null | undefined;
-        raw?: {
-            source: string;
-            method?: string | undefined;
-            payload?: unknown;
-        } | undefined;
-    } | {
-        ts: number;
-        type: "compaction.finished";
-        trigger: "auto" | "manual" | "model_triggered";
-        providerSessionId?: string | null | undefined;
-        raw?: {
-            source: string;
-            method?: string | undefined;
-            payload?: unknown;
-        } | undefined;
-        preTokens?: number | null | undefined;
-        postTokens?: number | null | undefined;
-        durationMs?: number | null | undefined;
     } | {
         ts: number;
         type: "warning";
@@ -612,6 +589,29 @@ export declare function createClaudeNormalizer(events: EventConstructors): {
             source: string;
             exact: boolean;
         } | undefined;
+    } | {
+        ts: number;
+        type: "compaction.started";
+        trigger: "auto" | "manual" | "model_triggered";
+        providerSessionId?: string | null | undefined;
+        raw?: {
+            source: string;
+            method?: string | undefined;
+            payload?: unknown;
+        } | undefined;
+    } | {
+        ts: number;
+        type: "compaction.finished";
+        trigger: "auto" | "manual" | "model_triggered";
+        providerSessionId?: string | null | undefined;
+        raw?: {
+            source: string;
+            method?: string | undefined;
+            payload?: unknown;
+        } | undefined;
+        preTokens?: number | null | undefined;
+        postTokens?: number | null | undefined;
+        durationMs?: number | null | undefined;
     })[];
     stableStringify: typeof stableStringify;
     stringifyClaudeContent: typeof stringifyClaudeContent;

package/dist/normalizers/codex.d.ts

@@ -243,29 +243,6 @@ export declare function createCodexNormalizer(events: EventConstructors): {
             method?: string | undefined;
             payload?: unknown;
         } | undefined;
-    } | {
-        ts: number;
-        type: "compaction.started";
-        trigger: "auto" | "manual" | "model_triggered";
-        providerSessionId?: string | null | undefined;
-        raw?: {
-            source: string;
-            method?: string | undefined;
-            payload?: unknown;
-        } | undefined;
-    } | {
-        ts: number;
-        type: "compaction.finished";
-        trigger: "auto" | "manual" | "model_triggered";
-        providerSessionId?: string | null | undefined;
-        raw?: {
-            source: string;
-            method?: string | undefined;
-            payload?: unknown;
-        } | undefined;
-        preTokens?: number | null | undefined;
-        postTokens?: number | null | undefined;
-        durationMs?: number | null | undefined;
     } | {
         ts: number;
         type: "warning";
@@ -341,6 +318,29 @@ export declare function createCodexNormalizer(events: EventConstructors): {
             source: string;
             exact: boolean;
         } | undefined;
+    } | {
+        ts: number;
+        type: "compaction.started";
+        trigger: "auto" | "manual" | "model_triggered";
+        providerSessionId?: string | null | undefined;
+        raw?: {
+            source: string;
+            method?: string | undefined;
+            payload?: unknown;
+        } | undefined;
+    } | {
+        ts: number;
+        type: "compaction.finished";
+        trigger: "auto" | "manual" | "model_triggered";
+        providerSessionId?: string | null | undefined;
+        raw?: {
+            source: string;
+            method?: string | undefined;
+            payload?: unknown;
+        } | undefined;
+        preTokens?: number | null | undefined;
+        postTokens?: number | null | undefined;
+        durationMs?: number | null | undefined;
     })[];
 };
 /** The Codex normalizer set, closed over injected constructors. */

package/docs/contracts/capabilities-and-instructions.md

@@ -0,0 +1,103 @@
+# Capabilities and instructions
+
+This contract defines the two session inputs that must remain equivalent when
+an Amalgm conversation switches among native and ACP agents: callable
+capabilities and system instructions.
+
+## Purpose
+
+A host should prepare one agent session without knowing which product supplied
+a capability or teaching each caller provider-specific system-prompt fields.
+Tools, Agents, Chat, and third-party integrations therefore enter through the
+same capability boundary, while every instruction source is composed once and
+applied at its real privilege level.
+
+## Capability injection
+
+ACP v1 standardizes tool injection as `mcpServers: McpServer[]` on
+`session/new`, `session/load`, and `session/resume`. Chat imports the official
+`McpServer` union from `@agentclientprotocol/sdk`; it does not maintain an
+Amalgm copy.
+
+```text
+immutable Toolbox selection
+  -> host resolves official ACP McpServer[]
+  -> prepared Chat binding
+  -> native adapter transport projection
+  -> agent session
+```
+
+The selected list is complete. Chat adds no ambient server, and an adapter may
+not discover, drop, rename, or broaden it silently. A transport the selected
+agent did not advertise is a typed preparation/session-admission error.
+Chat currently admits ACP's stable stdio, HTTP, and SSE variants. The
+experimental ACP-channel transport is rejected until Chat owns the matching
+`mcp/connect`, `mcp/message`, and `mcp/disconnect` lifecycle.
+
+An Amalgm product is a platform capability because its MCP server is supplied
+by the authenticated host and its actions are selected from Toolbox. It is not
+a new protocol primitive. The Tools, Agents, and Chat MCP servers use the same
+ACP injection path as any other selected server. Product identity and display
+metadata may use namespaced `_meta`; metadata never grants authority.
+
+SDKs own the behavior behind those servers. MCP, HTTP API, CLI, and Skill
+surfaces are adapters over the corresponding public SDK and may not grow a
+second implementation.
+
+## Instruction injection
+
+Instruction sources resolve during Chat preparation into one immutable bundle:
+
+1. machine-level user instructions;
+2. prepared project/workspace context;
+3. the exact immutable Agent revision instructions.
+
+The resulting text and its digest are host-only prepared facts. Starting,
+resuming, and prompting consume them without rereading files or rediscovering
+an Agent revision. Native adapters translate the exact text into their genuine
+system or developer-instruction field.
+
+Stable ACP v1 deliberately has no arbitrary system-prompt field. Amalgm uses
+ACP's official extensibility mechanism for agents that opt in:
+
+```json
+{
+  "agentCapabilities": {
+    "_meta": {
+      "amalgm.dev": { "sessionInstructions": true }
+    }
+  }
+}
+```
+
+For an advertising agent, Chat attaches the prepared bundle to the lifecycle
+request (`session/new`, `session/load`, or `session/resume`):
+
+```json
+{
+  "_meta": {
+    "amalgm.dev": {
+      "sessionInstructions": {
+        "revisionId": "sha256 digest",
+        "text": "prepared instructions"
+      }
+    }
+  }
+}
+```
+
+An ACP agent that does not advertise the extension is admitted only when the
+prepared instruction text is empty. Instructions are never represented as a
+text block in `session/prompt`; doing so would turn privileged configuration
+into user-authored conversation content and corrupt transcript semantics.
+
+## Predictable behavior
+
+Changing a Toolbox selection or immutable Agent revision creates a different
+prepared binding. Machine and project instruction changes must likewise enter
+preparation through a new execution revision before they affect a new session;
+wiring that source revision through the control plane remains follow-up work.
+An already-prepared session retains the exact MCP servers and instructions it
+was given. Reconnect or resume reapplies the same lifecycle inputs. Switching
+adapters can change only the native projection, never the selected capability
+set, instruction text, ACP output grammar, or SDK ownership boundary.

package/docs/contracts/conversation-persistence.md

@@ -44,6 +44,9 @@ database.
     moves logical records and immutable batches, never a live SQLite file.
 12. Catalog, history, title, seen-state, replay, and archival read the durable
     store directly. They never start or resume a provider session.
+13. The HTTP client reports turn acceptance only after the host has committed
+    the running turn. A surface may advance durable navigation at that point;
+    an unsuccessful request never reports acceptance.
 
 The canonical application projection uses camelCase `ConversationRecord`,
 `ConversationMessage`, and `ConversationTurn` values from this package.

package/docs/contracts/input-and-execution.md

@@ -34,9 +34,10 @@ discovery and resolution; start and send consume its result.
    defaults or fallback auth modes.
 4. A model is identified by `(agent revision, provider id, model id)`. Model
    settings are ACP session-config selections scoped inside that model choice.
-5. Ordinary tools and MCP tools are selected through one immutable toolset
-   revision. `amalgm-tools` resolves that revision to the complete official ACP
-   MCP server configuration during preparation; Chat adds no ambient server.
+5. Ordinary tools and MCP tools are selected through one immutable deployment-
+   head revision, never a local SQLite sequence. `amalgm-tools` resolves that
+   exact revision to the complete official ACP `McpServer[]` configuration
+   during preparation; Chat adds no ambient server or latest-version fallback.
 6. Secrets are not execution-contract values. Auth names an opaque binding; the
    authorized host resolves secrets into the opaque prepared binding.
 7. A cwd is an absolute, already-materialized path on the selected computer. A
@@ -57,6 +58,10 @@ discovery and resolution; start and send consume its result.
     before prompting. No adapter may silently ignore an attachment, auth mode,
     tool, permission mode, model setting, provider/model choice, cwd, agent
     revision, or computer placement.
+13. Machine, project, and exact Agent-revision instructions compose once during
+    preparation. They are not prompt parts. Native adapters use a real
+    system/developer channel; ACP agents must advertise the `amalgm.dev`
+    session-instructions extension.
 
 ## Public path
 

package/host/adapters/acp-capabilities.js

@@ -1,5 +1,7 @@
 import { UnsupportedExecutionInputError } from './input-capabilities.js';
 
+export const AMALGM_ACP_META_KEY = 'amalgm.dev';
+
 /** Validate optional ACP inputs against the capabilities negotiated at initialize. */
 export function assertAcpMcpCapabilities(adapterId, capabilities, servers) {
   const mcp = capabilities?.mcpCapabilities || {};
@@ -28,3 +30,33 @@ export function assertAcpPromptCapabilities(adapterId, capabilities, prompt) {
     }
   }
 }
+
+/**
+ * ACP v1 has no system-prompt field. Apply instructions only through the
+ * advertised Amalgm lifecycle extension; never turn them into prompt content.
+ */
+export function acpSessionParams(adapterId, capabilities, contract, mcpServers) {
+  const instructions = contract?.instructions || { text: '', revisionId: null };
+  const text = String(instructions.text || '').trim();
+  if (!text) return { cwd: contract.cwd, mcpServers };
+  const extension = capabilities?._meta?.[AMALGM_ACP_META_KEY];
+  if (extension?.sessionInstructions !== true) {
+    throw new UnsupportedExecutionInputError(
+      adapterId,
+      'instructions',
+      `agent does not advertise the ACP ${AMALGM_ACP_META_KEY} sessionInstructions extension`,
+    );
+  }
+  return {
+    cwd: contract.cwd,
+    mcpServers,
+    _meta: {
+      [AMALGM_ACP_META_KEY]: {
+        sessionInstructions: {
+          revisionId: instructions.revisionId,
+          text,
+        },
+      },
+    },
+  };
+}

package/host/adapters/acp.js

@@ -3,10 +3,13 @@
 import { PROTOCOL_VERSION } from '@agentclientprotocol/sdk';
 import { toAcpMcpServers } from '../tooling/mcp-bundle.js';
 import { prepareHarnessRuntime } from '../tooling/runtime-home.js';
-import { composeSystemPrompt } from '../tooling/system-prompt.js';
 import { requestPermission } from '../permissions.js';
 import { AcpClient } from './acp-client.js';
-import { assertAcpMcpCapabilities, assertAcpPromptCapabilities } from './acp-capabilities.js';
+import {
+  acpSessionParams,
+  assertAcpMcpCapabilities,
+  assertAcpPromptCapabilities,
+} from './acp-capabilities.js';
 import { nativeInputCapabilities, UnsupportedExecutionInputError } from './input-capabilities.js';
 import { acpPromptParts } from './prompt.js';
 
@@ -125,6 +128,7 @@ export class AcpAdapter {
       authModes: ['platform', 'subscription', 'byok'],
       modelSettings: 'negotiated',
       tools: true,
+      instructions: 'acp_extension',
     });
   }
 
@@ -149,7 +153,6 @@ export class AcpAdapter {
       client,
       capabilities: {},
       permissionMode: contract.permissionMode,
-      needsSystemPrompt: false,
       activePrompt: false,
     };
     client.onRequest((method, params) => this.handleRequest(session, method, params));
@@ -170,7 +173,7 @@ export class AcpAdapter {
 
     const mcpServers = toAcpMcpServers(contract);
     assertAcpMcpCapabilities('acp', session.capabilities, mcpServers);
-    const sessionParams = { cwd: contract.cwd, mcpServers };
+    const sessionParams = acpSessionParams('acp', session.capabilities, contract, mcpServers);
     let response;
     if (session.providerSessionId) {
       if (session.capabilities.loadSession === true) {
@@ -189,7 +192,6 @@ export class AcpAdapter {
     } else {
       response = await client.request('session/new', sessionParams, 600000);
       session.providerSessionId = response?.sessionId || null;
-      session.needsSystemPrompt = true;
     }
     if (!session.providerSessionId) throw new Error('ACP agent did not return a sessionId');
     await applyConfiguration(client, session.providerSessionId, response, contract, launch);
@@ -244,16 +246,10 @@ export class AcpAdapter {
       if (message.params?.update) queue.push(message.params.update);
       wakeLoop();
     });
-    let preamble = '';
-    if (session.needsSystemPrompt) {
-      const systemPrompt = composeSystemPrompt(contract);
-      if (systemPrompt) preamble = `<system-instructions>\n${systemPrompt}\n</system-instructions>`;
-      session.needsSystemPrompt = false;
-    }
     session.activePrompt = true;
     session.client.request('session/prompt', {
       sessionId: session.providerSessionId,
-      prompt: acpPromptParts(prompt, preamble),
+      prompt: acpPromptParts(prompt),
     }, 0).then(() => {
       finished = true;
       wakeLoop();

package/host/adapters/claude.js

@@ -21,7 +21,7 @@ import { toClaudeMcpServers } from '../tooling/mcp-bundle.js';
 import { bundledClaudeBinary } from '../tooling/native-binaries.js';
 import { importPackage } from '../tooling/package-import.js';
 import { prepareHarnessRuntime } from '../tooling/runtime-home.js';
-import { composeSystemPrompt } from '../tooling/system-prompt.js';
+import { preparedSystemPrompt } from '../tooling/system-prompt.js';
 import { allowed, requestPermission } from '../permissions.js';
 import {
   COMMON_REASONING_SETTINGS,
@@ -55,6 +55,7 @@ class ClaudeAdapter {
       authModes: ['platform', 'subscription', 'byok'],
       modelSettings: [...COMMON_REASONING_SETTINGS, ...COMMON_SPEED_SETTINGS],
       tools: true,
+      instructions: 'native',
     });
   }
 
@@ -70,7 +71,7 @@ class ClaudeAdapter {
 
   options(contract, extra = {}) {
     const runtime = prepareHarnessRuntime(contract);
-    const systemPrompt = composeSystemPrompt(contract);
+    const systemPrompt = preparedSystemPrompt(contract);
     const pathToClaudeCodeExecutable = process.env.CLAUDE_CODE_BINARY || bundledClaudeBinary();
     const settings = {
       ...this.renderers.toClaudeSettings(contract.agentConfig),

package/host/adapters/codex.js

@@ -17,11 +17,11 @@ import path from 'node:path';
 import { createEventConstructors } from '../../dist/events/index.js';
 import { codexErrorMessage, createCodexNormalizer } from '../../dist/normalizers/codex.js';
 import { recordNativeEvent } from '../recorder.js';
-import { relayedMcpServers, toCodexMcpToml } from '../tooling/mcp-bundle.js';
+import { codexMcpSectionName, relayedMcpServers, toCodexMcpToml } from '../tooling/mcp-bundle.js';
 import { bundledCodexBinary, bundledCodexPathDirs, executableExists, findOnPath } from '../tooling/native-binaries.js';
 import { syncCodexProviderAuth } from '../tooling/native-config.js';
 import { prepareHarnessRuntime } from '../tooling/runtime-home.js';
-import { composeSystemPrompt } from '../tooling/system-prompt.js';
+import { preparedSystemPrompt } from '../tooling/system-prompt.js';
 import { requestPermission } from '../permissions.js';
 import {
   COMMON_REASONING_SETTINGS,
@@ -447,7 +447,7 @@ function generatedCodexHookTrust(contract, renderers = defaultRenderers) {
 }
 
 function generatedMcpSectionNames(contract) {
-  return relayedMcpServers(contract).map((server) => `mcp_servers.${server.name}`);
+  return relayedMcpServers(contract).map((server) => codexMcpSectionName(server.name));
 }
 
 function buildCodexConfig(contract, existingConfig, syncInfo, renderers = defaultRenderers) {
@@ -524,6 +524,7 @@ class CodexAdapter {
       authModes: ['platform', 'subscription', 'byok'],
       modelSettings: [...COMMON_REASONING_SETTINGS, ...COMMON_SPEED_SETTINGS],
       tools: true,
+      instructions: 'native',
     });
   }
 
@@ -541,7 +542,7 @@ class CodexAdapter {
       sandbox: fullAccess ? 'danger-full-access' : 'workspace-write',
       modelProvider: contract.authMethod === 'amalgm' ? 'amalgm' : 'openai',
       serviceTier: serviceTierForContract(contract),
-      developerInstructions: composeSystemPrompt(contract) || null,
+      developerInstructions: preparedSystemPrompt(contract) || null,
       persistExtendedHistory: true,
     };
     const session = {
@@ -571,6 +572,7 @@ class CodexAdapter {
       'item/commandExecution/requestApproval',
       'item/fileChange/requestApproval',
       'item/permissions/requestApproval',
+      'mcpServer/elicitation/request',
       'execCommandApproval',
       'applyPatchApproval',
     ]);
@@ -580,8 +582,12 @@ class CodexAdapter {
       : await requestPermission(this.permissionPort, {
           adapterId: 'codex',
           providerSessionId: session.providerSessionId,
-          kind: method.includes('fileChange') || method === 'applyPatchApproval' ? 'file_change' : 'command',
-          title: params.reason || params.command || 'Codex requests permission',
+          kind: method === 'mcpServer/elicitation/request'
+            ? 'mcp_tool'
+            : method.includes('fileChange') || method === 'applyPatchApproval'
+              ? 'file_change'
+              : 'command',
+          title: params.message || params.reason || params.command || 'Codex requests permission',
           input: params,
         });
     const allow = decision.outcome === 'allow_once' || decision.outcome === 'allow_always';
@@ -603,6 +609,13 @@ class CodexAdapter {
         scope: always ? 'session' : 'turn',
       };
     }
+    if (method === 'mcpServer/elicitation/request') {
+      return {
+        action: allow ? 'accept' : decision.outcome === 'cancel' ? 'cancel' : 'decline',
+        content: allow ? decision.updatedInput || null : null,
+        _meta: null,
+      };
+    }
     return {
       decision: allow
         ? (always ? 'approved_for_session' : 'approved')

package/host/adapters/cursor.js

@@ -1,7 +1,7 @@
 // Cursor Agent Client Protocol adapter. The generic ACP transport lives in
 // ./acp-client.js; this file is the
 // cursor parameterization (binary resolution, model translation, permission
-// auto-grant, first-prompt system preamble).
+// handling, and ACP lifecycle inputs).
 //
 // Laws come from ../../dist: event constructors via `createEventConstructors`,
 // the normalizer via `createCursorNormalizer`, `cursorStopReason`, and
@@ -16,10 +16,13 @@ import { recordNativeEvent } from '../recorder.js';
 import { toAcpMcpServers } from '../tooling/mcp-bundle.js';
 import { executableExists, findOnPath } from '../tooling/native-binaries.js';
 import { prepareHarnessRuntime } from '../tooling/runtime-home.js';
-import { composeSystemPrompt } from '../tooling/system-prompt.js';
 import { requestPermission } from '../permissions.js';
 import { AcpClient } from './acp-client.js';
-import { assertAcpMcpCapabilities, assertAcpPromptCapabilities } from './acp-capabilities.js';
+import {
+  acpSessionParams,
+  assertAcpMcpCapabilities,
+  assertAcpPromptCapabilities,
+} from './acp-capabilities.js';
 import {
   COMMON_REASONING_SETTINGS,
   COMMON_SPEED_SETTINGS,
@@ -140,6 +143,7 @@ class CursorAdapter {
       authModes: ['subscription', 'byok'],
       modelSettings: [...COMMON_REASONING_SETTINGS, ...COMMON_SPEED_SETTINGS],
       tools: true,
+      instructions: 'acp_extension',
     });
   }
 
@@ -157,7 +161,6 @@ class CursorAdapter {
       sessionId: contract.sessionId,
       providerSessionId: contract.providerSessionId || null,
       client,
-      needsSystemPrompt: false,
       modelWarning: null,
       activePrompt: null,
       cancelRequested: false,
@@ -173,7 +176,7 @@ class CursorAdapter {
     session.capabilities = initialized?.agentCapabilities || {};
     const mcpServers = toAcpMcpServers(contract);
     assertAcpMcpCapabilities('cursor', session.capabilities, mcpServers);
-    const sessionParams = { cwd: contract.cwd, mcpServers };
+    const sessionParams = acpSessionParams('cursor', session.capabilities, contract, mcpServers);
     let acpSession = null;
     if (session.providerSessionId) {
       // session/load replays history as session/update notifications; nothing is
@@ -189,7 +192,6 @@ class CursorAdapter {
     if (!acpSession) {
       acpSession = await client.request('session/new', sessionParams);
       session.providerSessionId = acpSession.sessionId;
-      session.needsSystemPrompt = true;
     }
     await this.selectModel(session, acpSession, contract);
     return session;
@@ -296,17 +298,9 @@ class CursorAdapter {
       });
       for (const e of normalizeCursorUpdate(params.update || {}, state)) push(e);
     });
-    let preamble = '';
-    if (session.needsSystemPrompt) {
-      // ACP has no system-prompt slot; a fresh native session gets the composed
-      // instructions as a preamble on its first prompt only.
-      const systemPrompt = composeSystemPrompt(contract);
-      if (systemPrompt) preamble = `<system-instructions>\n${systemPrompt}\n</system-instructions>`;
-      session.needsSystemPrompt = false;
-    }
     session.client.request('session/prompt', {
       sessionId: session.providerSessionId,
-      prompt: acpPromptParts(input, preamble),
+      prompt: acpPromptParts(input),
     }, 0).then((result) => {
       recordNativeEvent('cursor.acp.prompt_result', result, {
         providerSessionId: session.providerSessionId,

package/host/adapters/input-capabilities.js

@@ -29,6 +29,7 @@ export function nativeInputCapabilities(input = {}) {
       ? 'negotiated'
       : Object.freeze([...(input.modelSettings || [])]),
     tools: input.tools === true,
+    instructions: input.instructions || 'unsupported',
     permissionModes: Object.freeze([...(input.permissionModes || ['ask', 'full_access'])]),
   });
 }

package/host/adapters/opencode.js

@@ -12,7 +12,7 @@ import { toOpenCodeMcpConfig } from '../tooling/mcp-bundle.js';
 import { bundledOpenCodeBinary, executableExists, findOnPath } from '../tooling/native-binaries.js';
 import { importPackage } from '../tooling/package-import.js';
 import { prepareHarnessRuntime } from '../tooling/runtime-home.js';
-import { composeSystemPrompt } from '../tooling/system-prompt.js';
+import { preparedSystemPrompt } from '../tooling/system-prompt.js';
 import { requestPermission } from '../permissions.js';
 import { nativeInputCapabilities, UnsupportedExecutionInputError } from './input-capabilities.js';
 import { openCodePromptParts } from './prompt.js';
@@ -58,7 +58,7 @@ function selectedVariant(contract) {
 function configFor(contract) {
   const model = splitModel(contract.cliModel || contract.usageModelId, contract.auth);
   const variant = selectedVariant(contract);
-  const systemPrompt = composeSystemPrompt(contract);
+  const systemPrompt = preparedSystemPrompt(contract);
   const permission = contract.permissionMode === 'full_access' ? 'allow' : 'ask';
   const config = {
     logLevel: process.env.OPENCODE_LOG_LEVEL || 'ERROR',
@@ -241,6 +241,7 @@ class OpenCodeAdapter {
       authModes: ['platform', 'subscription', 'byok'],
       modelSettings: ['variant'],
       tools: true,
+      instructions: 'native',
     });
   }
 
@@ -423,7 +424,7 @@ class OpenCodeAdapter {
             model,
             ...(variant ? { variant } : {}),
             agent: process.env.AMALGM_CHAT_OPENCODE_AGENT || 'build',
-            system: composeSystemPrompt(contract) || undefined,
+            system: preparedSystemPrompt(contract) || undefined,
             parts: openCodePromptParts(input),
           },
         });

package/host/adapters/pi.js

@@ -15,7 +15,7 @@ import { recordNativeEvent } from '../recorder.js';
 import { relayedMcpServers } from '../tooling/mcp-bundle.js';
 import { executableExists, findOnPath } from '../tooling/native-binaries.js';
 import { prepareHarnessRuntime } from '../tooling/runtime-home.js';
-import { composeSystemPrompt } from '../tooling/system-prompt.js';
+import { preparedSystemPrompt } from '../tooling/system-prompt.js';
 import {
   COMMON_REASONING_SETTINGS,
   nativeInputCapabilities,
@@ -344,7 +344,7 @@ function buildArgs(contract, runtimeHome) {
   const args = ['--mode', 'rpc', '--provider', provider, '--model', piModel(contract, provider)];
   const thinking = thinkingLevelFor(contract);
   if (thinking) args.push('--thinking', thinking);
-  const systemPrompt = composeSystemPrompt(contract);
+  const systemPrompt = preparedSystemPrompt(contract);
   if (systemPrompt) args.push('--system-prompt', systemPrompt);
   if (contract.providerSessionId) args.push('--session', contract.providerSessionId);
   if (contract.authMethod === 'amalgm') args.push('--extension', ensureEgressExtension(runtimeHome));
@@ -362,6 +362,7 @@ class PiAdapter {
       authModes: ['platform', 'subscription', 'byok'],
       modelSettings: COMMON_REASONING_SETTINGS,
       tools: true,
+      instructions: 'native',
     });
   }