@calliopelabs/cli 3.5.4 → 3.7.0

package/README.md

@@ -152,3 +152,11 @@ Issues and PRs welcome — [CONTRIBUTING.md](CONTRIBUTING.md). The codebase is T
 ## License
 
 MIT © Calliope Labs Inc
+
+## Code migration kit
+
+The packaged [migration playbook](docs/migration-playbook.md) provides versioned
+inventory, baseline, assessment and verification helpers for the initial
+JavaScript-to-TypeScript CLI adapter. Discover them offline with
+`calliope migration capabilities --json`; native reviewed execution remains the
+authority for worker commands, budgets and file scope.

package/dist/acp/controls.d.ts

@@ -0,0 +1,10 @@
+import type { ModelPreference } from '../preferences/types.js';
+export interface AcpControls {
+    version: 1;
+    revision: string | null;
+    mode: 'work' | 'plan';
+    selection?: ModelPreference;
+}
+export declare function readAcpControls(id: string, creating?: boolean): AcpControls;
+export declare function saveAcpControls(id: string, value: AcpControls, creating?: boolean): AcpControls;
+//# sourceMappingURL=controls.d.ts.map

package/dist/acp/controls.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"controls.d.ts","sourceRoot":"","sources":["../../src/acp/controls.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,CAAC,CAAC;IACX,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,eAAe,CAAC;CAC7B;AAQD,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,UAAQ,GAAG,WAAW,CAazE;AACD,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,UAAQ,GAAG,WAAW,CAwB7F"}

package/dist/acp/controls.js

@@ -0,0 +1,81 @@
+/** Session controls are preferences, never a grant of execution authority. */
+import * as fs from 'node:fs';
+import { dirname, join } from 'node:path';
+import { randomUUID } from 'node:crypto';
+import { getSessionById, getSessionDirById } from '../storage.js';
+import { assertSessionDirectory, readPrivateSessionFile } from '../sessions/index.js';
+import { validatePreference } from '../preferences/validate.js';
+const invalid = () => new Error('ACP session controls are missing, damaged or changed; reload the session or restore its saved controls.');
+function location(id) {
+    const dir = getSessionDirById(id);
+    if (!dir)
+        throw invalid();
+    assertSessionDirectory(dir);
+    return join(dir, 'acp-controls.json');
+}
+export function readAcpControls(id, creating = false) {
+    const raw = readPrivateSessionFile(location(id), 16384);
+    if (raw === null) {
+        if (!creating && getSessionById(id)?.acpControlsVersion === 1)
+            throw invalid();
+        return { version: 1, revision: null, mode: 'work' };
+    }
+    let value;
+    try {
+        value = JSON.parse(raw);
+    }
+    catch {
+        throw invalid();
+    }
+    if (!value || Array.isArray(value) || value.version !== 1 || typeof value.revision !== 'string' ||
+        !/^[a-f0-9-]{36}$/.test(value.revision) || !['work', 'plan'].includes(value.mode) ||
+        Object.keys(value).some(key => !['version', 'revision', 'mode', 'selection'].includes(key)))
+        throw invalid();
+    if (value.selection !== undefined)
+        value.selection = validatePreference(value.selection);
+    return value;
+}
+export function saveAcpControls(id, value, creating = false) {
+    const file = location(id), lock = file + '.lock', temporary = file + '.' + randomUUID() + '.tmp';
+    let fd;
+    try {
+        fd = fs.openSync(lock, fs.constants.O_CREAT | fs.constants.O_EXCL | fs.constants.O_WRONLY, 0o600);
+    }
+    catch {
+        throw new Error('ACP session controls have another writer; reload before retrying.');
+    }
+    try {
+        if (readAcpControls(id, creating).revision !== value.revision)
+            throw invalid();
+        const next = { version: 1, revision: randomUUID(), mode: value.mode,
+            ...(value.selection ? { selection: validatePreference(value.selection) } : {}) };
+        if (!['work', 'plan'].includes(next.mode))
+            throw invalid();
+        const output = fs.openSync(temporary, fs.constants.O_CREAT | fs.constants.O_EXCL | fs.constants.O_WRONLY, 0o600);
+        try {
+            fs.writeFileSync(output, JSON.stringify(next) + '\n');
+            fs.fsyncSync(output);
+        }
+        finally {
+            fs.closeSync(output);
+        }
+        fs.renameSync(temporary, file);
+        // Match native session commits: NTFS does not support flushing a read-only directory handle.
+        if (process.platform !== 'win32') {
+            const directory = fs.openSync(dirname(file), fs.constants.O_RDONLY);
+            try {
+                fs.fsyncSync(directory);
+            }
+            finally {
+                fs.closeSync(directory);
+            }
+        }
+        return next;
+    }
+    finally {
+        fs.closeSync(fd);
+        fs.rmSync(temporary, { force: true });
+        fs.unlinkSync(lock);
+    }
+}
+//# sourceMappingURL=controls.js.map

package/dist/acp/controls.js.map

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

package/dist/acp.d.ts

@@ -9,7 +9,8 @@
  * agent logic.
  *
  * Baseline agent surface implemented: `initialize`, `authenticate`, `session/new`,
- * `session/load`, `session/prompt`; `session/cancel`; streaming `session/update`
+ * `session/load`, `session/prompt`, `session/set_mode`, `session/set_config_option`;
+ * `session/cancel`; streaming `session/update`
  * notifications; and the `session/request_permission` flow. When the client advertises `fs`
  * capabilities, file tools are routed through the client's `fs/read_text_file` and
  * `fs/write_text_file` so edits land on the editor's (possibly unsaved) buffers.
@@ -19,18 +20,27 @@
  * lazy-loaded from bin.ts only for the `acp` subcommand, so it adds nothing to the
  * default cold-start path.
  */
-import { type AgentContext, type Stream, type InitializeRequest, type InitializeResponse, type NewSessionRequest, type NewSessionResponse, type LoadSessionRequest, type LoadSessionResponse, type AuthenticateResponse, type PromptRequest, type PromptResponse, type CancelNotification } from '@agentclientprotocol/sdk';
+import { type AgentContext, type Stream, type InitializeRequest, type InitializeResponse, type NewSessionRequest, type NewSessionResponse, type LoadSessionRequest, type LoadSessionResponse, type AuthenticateResponse, type PromptRequest, type PromptResponse, type CancelNotification, type SetSessionModeRequest, type SetSessionConfigOptionRequest, type SetSessionConfigOptionResponse } from '@agentclientprotocol/sdk';
+import { type AgentExecution } from './execution/guard.js';
+import { type DelegatedExecutionOptions } from './execution/delegated.js';
 declare class CalliopeAgent {
     private readonly conn;
+    private readonly execution?;
     private readonly approvals;
     private clientCapabilities;
     private readonly sessions;
     /** Tail of the outgoing write chain; awaited to flush notifications. */
     private lastWrite;
-    constructor(conn: AgentContext);
+    constructor(conn: AgentContext, execution?: AgentExecution | undefined);
+    private controlsState;
+    private configOptions;
+    private discoverModels;
+    private idleSession;
+    setMode(params: SetSessionModeRequest, signal?: AbortSignal): Promise<{}>;
+    setConfigOption(params: SetSessionConfigOptionRequest, signal?: AbortSignal): Promise<SetSessionConfigOptionResponse>;
     initialize(params: InitializeRequest): Promise<InitializeResponse>;
     authenticate(): Promise<AuthenticateResponse>;
-    newSession(params: NewSessionRequest): Promise<NewSessionResponse>;
+    newSession(params: NewSessionRequest, signal?: AbortSignal): Promise<NewSessionResponse>;
     /**
      * Restore a saved session and replay its conversation as session/update
      * notifications before responding. Same store and rules as terminal /resume:
@@ -38,7 +48,7 @@ declare class CalliopeAgent {
      * without a recorded result are closed as unknown outcomes. No provider
      * request is made and no tool runs.
      */
-    loadSession(params: LoadSessionRequest): Promise<LoadSessionResponse>;
+    loadSession(params: LoadSessionRequest, signal?: AbortSignal): Promise<LoadSessionResponse>;
     prompt(params: PromptRequest): Promise<PromptResponse>;
     cancel(params: CancelNotification): Promise<void>;
     private runTurn;
@@ -73,11 +83,15 @@ declare class CalliopeAgent {
  * which drive the SDK's client side against it over an in-memory stream pair.
  * The SDK calls onConnect before dispatch, so the returned agent is ready.
  */
-export declare function serveAcp(stream: Stream): CalliopeAgent;
+export declare function serveAcp(stream: Stream, options?: {
+    execution?: AgentExecution;
+}): CalliopeAgent;
 /**
  * Run Calliope as an ACP agent over stdio (stdout/stdin carry JSON-RPC). Started
  * from bin.ts when argv[0] === 'acp'. Resolves when the client closes the stream.
  */
-export declare function runAcpAgent(): Promise<number>;
+export declare function runAcpAgent(options?: {
+    ledger?: DelegatedExecutionOptions;
+}): Promise<number>;
 export {};
 //# sourceMappingURL=acp.d.ts.map

package/dist/acp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"acp.d.ts","sourceRoot":"","sources":["../src/acp.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAOH,OAAO,EAGL,KAAK,YAAY,EAIjB,KAAK,MAAM,EAKX,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EACzB,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,kBAAkB,EACxB,MAAM,0BAA0B,CAAC;AAwKlC,cAAM,aAAa;IAOL,OAAO,CAAC,QAAQ,CAAC,IAAI;IANjC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAuB;IACjD,OAAO,CAAC,kBAAkB,CAA0B;IACpD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAiC;IAC1D,wEAAwE;IACxE,OAAO,CAAC,SAAS,CAAoC;IAErD,YAA6B,IAAI,EAAE,YAAY,EAAI;IAI7C,UAAU,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAoBvE;IAIK,YAAY,IAAI,OAAO,CAAC,oBAAoB,CAAC,CAElD;IAIK,UAAU,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAiCvE;IAID;;;;;;OAMG;IACG,WAAW,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CA6D1E;IAIK,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC,CA0B3D;IAIK,MAAM,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAOtD;YAIa,OAAO;IAsDrB,yEAAyE;IACzE,OAAO,CAAC,gBAAgB;IAkBxB;;;;OAIG;YACW,iBAAiB;IAkC/B;;;;;OAKG;IACH,OAAO,CAAC,gBAAgB;IAsBxB;;;;OAIG;IACH,OAAO,CAAC,IAAI;IAQZ,gDAAgD;IAChD,OAAO,CAAC,KAAK;IAIb,iEAAiE;IAC3D,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAM9B;CACF;AAMD;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,CAatD;AAED;;;GAGG;AACH,wBAAsB,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC,CAkBnD"}
+{"version":3,"file":"acp.d.ts","sourceRoot":"","sources":["../src/acp.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAQH,OAAO,EAGL,KAAK,YAAY,EAIjB,KAAK,MAAM,EAKX,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EACzB,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,kBAAkB,EACvB,KAAK,qBAAqB,EAC1B,KAAK,6BAA6B,EAClC,KAAK,8BAA8B,EAEpC,MAAM,0BAA0B,CAAC;AAkBlC,OAAO,EAAkB,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAuE,KAAK,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AA0J/I,cAAM,aAAa;IAOL,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAgB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;IAN5E,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAuB;IACjD,OAAO,CAAC,kBAAkB,CAA0B;IACpD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAiC;IAC1D,wEAAwE;IACxE,OAAO,CAAC,SAAS,CAAoC;IAErD,YAA6B,IAAI,EAAE,YAAY,EAAmB,SAAS,CAAC,EAAE,cAAc,YAAA,EAAI;IAEhG,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,aAAa;YAOP,cAAc;IAa5B,OAAO,CAAC,WAAW;IAQb,OAAO,CAAC,MAAM,EAAC,qBAAqB,EAAC,MAAM,CAAC,EAAC,WAAW,eAS7D;IACK,eAAe,CAAC,MAAM,EAAC,6BAA6B,EAAC,MAAM,CAAC,EAAC,WAAW,GAAE,OAAO,CAAC,8BAA8B,CAAC,CAkBtH;IAIK,UAAU,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAqBvE;IAIK,YAAY,IAAI,OAAO,CAAC,oBAAoB,CAAC,CAElD;IAIK,UAAU,CAAC,MAAM,EAAE,iBAAiB,EAAE,MAAM,CAAC,EAAC,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAyC5F;IAID;;;;;;OAMG;IACG,WAAW,CAAC,MAAM,EAAE,kBAAkB,EAAE,MAAM,CAAC,EAAC,WAAW,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAmE/F;IAIK,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC,CAuB3D;IAIK,MAAM,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAOtD;YAIa,OAAO;IA4DrB,yEAAyE;IACzE,OAAO,CAAC,gBAAgB;IAkBxB;;;;OAIG;YACW,iBAAiB;IAkC/B;;;;;OAKG;IACH,OAAO,CAAC,gBAAgB;IAsBxB;;;;OAIG;IACH,OAAO,CAAC,IAAI;IAQZ,gDAAgD;IAChD,OAAO,CAAC,KAAK;IAIb,iEAAiE;IAC3D,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAM9B;CACF;AAMD;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE;IAAE,SAAS,CAAC,EAAE,cAAc,CAAA;CAAO,GAAG,aAAa,CAepG;AAED;;;GAGG;AACH,wBAAsB,WAAW,CAAC,OAAO,GAAE;IAAE,MAAM,CAAC,EAAE,yBAAyB,CAAA;CAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAmBvG"}

package/dist/acp.js

@@ -9,7 +9,8 @@
  * agent logic.
  *
  * Baseline agent surface implemented: `initialize`, `authenticate`, `session/new`,
- * `session/load`, `session/prompt`; `session/cancel`; streaming `session/update`
+ * `session/load`, `session/prompt`, `session/set_mode`, `session/set_config_option`;
+ * `session/cancel`; streaming `session/update`
  * notifications; and the `session/request_permission` flow. When the client advertises `fs`
  * capabilities, file tools are routed through the client's `fs/read_text_file` and
  * `fs/write_text_file` so edits land on the editor's (possibly unsaved) buffers.
@@ -20,6 +21,7 @@
  * default cold-start path.
  */
 import { boundAcpInput, ACP_INPUT_LIMIT_METHOD } from './acp/input.js';
+import { readAcpControls, saveAcpControls } from './acp/controls.js';
 import { ApprovalStore } from './approvals/index.js';
 import { realpathSync } from 'node:fs';
 import * as path from 'node:path';
@@ -31,6 +33,7 @@ import { completePendingTools, runTurn } from './runtime/index.js';
 import { createSession, getSessionById, getSessionDirById, readSessionConversation, saveSessionConversation } from './storage.js';
 import { SessionRecoveryError, readToolOutputs } from './sessions/index.js';
 import { resolvePreferences } from './preferences/index.js';
+import { getAvailableModels } from './model-detection.js';
 import { cancellable, isCancellation } from './cancellation.js';
 import { TOOLS } from './tools.js';
 import { DEFAULT_MODELS } from './types.js';
@@ -39,6 +42,8 @@ import * as memory from './memory.js';
 import { resolveIterationLimit } from './iteration-limit.js';
 import { formatBudgetHalt } from './budget.js';
 import { RunLog } from './runlog.js';
+import { ExecutionGuard } from './execution/guard.js';
+import { connectDelegatedExecution, executionBinding, assertExecutionBinding } from './execution/delegated.js';
 // ============================================================================
 // Diagnostics — stderr only (stdout carries the protocol).
 // ============================================================================
@@ -141,10 +146,10 @@ function promptToText(blocks) {
     return parts.join('\n');
 }
 /** Provider/model preferences for a session's project; session/new and session/load resolve them alike. */
-function sessionPreferences(cwd) {
+function sessionPreferences(cwd, controls) {
     let preference;
     try {
-        preference = resolvePreferences(cwd);
+        preference = resolvePreferences(cwd, { session: controls?.selection });
     }
     catch (error) {
         throw RequestError.invalidParams({ error: error instanceof Error ? error.message : String(error) });
@@ -167,13 +172,94 @@ function sessionPreferences(cwd) {
 // ============================================================================
 class CalliopeAgent {
     conn;
+    execution;
     approvals = new ApprovalStore();
     clientCapabilities = {};
     sessions = new Map();
     /** Tail of the outgoing write chain; awaited to flush notifications. */
     lastWrite = Promise.resolve();
-    constructor(conn) {
+    constructor(conn, execution) {
         this.conn = conn;
+        this.execution = execution;
+    }
+    controlsState(session) {
+        return { modes: { currentModeId: session.controls.mode, availableModes: [
+                    { id: 'work', name: 'Work', description: 'Use normal permissions and confirmations.' },
+                    { id: 'plan', name: 'Plan', description: 'Analyze and plan without executing workspace mutations.' },
+                ] }, configOptions: this.configOptions(session) };
+    }
+    configOptions(session) {
+        const current = session.controls.selection?.model ? 'model:' + session.controls.selection.model : 'default';
+        const options = [{ value: 'default', name: this.execution ? 'Parent-managed model' : `Configured model${session.model ? ': ' + session.model : ''}` }];
+        if (!this.execution)
+            options.push(...session.modelOptions);
+        if (!options.some(option => option.value === current))
+            options.push({ value: current, name: session.model });
+        return [{ id: 'model', name: 'Model', category: 'model', type: 'select', currentValue: current, options }];
+    }
+    async discoverModels(session, signal) {
+        session.modelOptions = [];
+        if (this.execution)
+            return;
+        const bounded = signal ? AbortSignal.any([signal, AbortSignal.timeout(5000)]) : AbortSignal.timeout(5000);
+        try {
+            const models = await getAvailableModels(session.resolvedProvider, { quiet: true, signal: bounded });
+            session.modelOptions = models.filter(model => model.evidence?.source === 'live' && model.capabilities?.chat !== false && model.id.length <= 512 && !/[\x00-\x1f\x7f]/.test(model.id))
+                .slice(0, 256).map(model => ({ value: 'model:' + model.id, name: model.name || model.id }));
+        }
+        catch {
+            if (signal?.aborted)
+                throw signal.reason;
+            // Unavailable discovery never invents selectable model IDs.
+        }
+    }
+    idleSession(id) {
+        const session = this.sessions.get(id);
+        if (!session)
+            throw RequestError.invalidParams({ error: `unknown session: ${id}` });
+        if (session.controller)
+            throw RequestError.invalidParams({ error: 'A prompt is already running in this session' });
+        if (readAcpControls(id).revision !== session.controls.revision)
+            throw RequestError.invalidParams({ error: 'Session controls changed; load the current session before continuing.' });
+        if (this.execution)
+            new ExecutionGuard(this.execution, session.cwd).assertActive();
+        return session;
+    }
+    async setMode(params, signal) {
+        signal?.throwIfAborted();
+        let session = this.idleSession(params.sessionId);
+        if (params.modeId !== 'work' && params.modeId !== 'plan')
+            throw RequestError.invalidParams({ error: 'Unsupported session mode' });
+        if (this.execution) {
+            await new ExecutionGuard(this.execution, session.cwd).refreshAuthority(signal);
+            session = this.idleSession(params.sessionId);
+        }
+        signal?.throwIfAborted();
+        session.controls = saveAcpControls(session.id, { ...session.controls, mode: params.modeId });
+        await this.emit(session.id, { sessionUpdate: 'current_mode_update', currentModeId: session.controls.mode });
+        return {};
+    }
+    async setConfigOption(params, signal) {
+        signal?.throwIfAborted();
+        const session = this.idleSession(params.sessionId);
+        if (params.configId !== 'model' || typeof params.value !== 'string')
+            throw RequestError.invalidParams({ error: 'Unsupported session configuration' });
+        if (this.execution)
+            throw RequestError.invalidParams({ error: 'The parent controls the delegated model selection.' });
+        const revision = session.controls.revision, provider = session.resolvedProvider;
+        await this.discoverModels(session, signal);
+        if (this.idleSession(params.sessionId) !== session || session.controls.revision !== revision || session.resolvedProvider !== provider)
+            throw RequestError.invalidParams({ error: 'Session changed during model discovery; retry with its current controls.' });
+        const value = params.value;
+        if (value !== 'default' && !session.modelOptions.some(option => option.value === value))
+            throw RequestError.invalidParams({ error: 'Select a currently discovered model.' });
+        const next = { ...session.controls, selection: value === 'default' ? undefined : { provider: session.resolvedProvider, model: value.slice(6) } };
+        const preferences = sessionPreferences(session.cwd, next);
+        const controls = saveAcpControls(session.id, next);
+        Object.assign(session, preferences, { controls });
+        const configOptions = this.configOptions(session);
+        await this.emit(session.id, { sessionUpdate: 'config_option_update', configOptions });
+        return { configOptions };
     }
     // ---- ACP: initialize --------------------------------------------------
     async initialize(params) {
@@ -186,7 +272,8 @@ class CalliopeAgent {
         return {
             protocolVersion: negotiated,
             agentCapabilities: {
-                // MCP-over-ACP and modes are not implemented yet.
+                _meta: { calliopeDelegation: { version: 1, workspaceBinding: 1, sessionBinding: 1 }, calliopeSessionControls: { version: 1 } },
+                // MCP-over-ACP remains unsupported.
                 loadSession: true,
                 promptCapabilities: { image: false, audio: false, embeddedContext: false },
             },
@@ -200,14 +287,25 @@ class CalliopeAgent {
         return {};
     }
     // ---- ACP: session/new -------------------------------------------------
-    async newSession(params) {
+    async newSession(params, signal) {
         const cwd = params.cwd || process.cwd();
+        let guard;
+        try {
+            if (this.execution) {
+                guard = new ExecutionGuard(this.execution, cwd);
+                guard.assertActive();
+            }
+        }
+        catch (error) {
+            throw RequestError.invalidParams({ error: errMessage(error) });
+        }
         const { preference, provider, resolvedProvider, model } = sessionPreferences(cwd);
         const costModel = model || DEFAULT_MODELS[resolvedProvider];
-        const sessionId = createSession(cwd, { activate: false, prefix: 'acp' }).id;
+        const sessionId = createSession(cwd, { activate: false, prefix: 'acp', acpControlsVersion: 1, ...(this.execution ? { executionBinding: executionBinding(this.execution) } : {}) }).id;
+        const controls = saveAcpControls(sessionId, { version: 1, revision: null, mode: 'work' }, true);
         const runlog = RunLog.open(sessionId);
         const systemPrompt = getSystemPromptForProvider(resolvedProvider);
-        const memoryContext = memory.buildMemoryContext(cwd);
+        const memoryContext = guard ? memory.buildMemoryContext(cwd, { allowPath: file => !guard.check({ id: 'context', name: 'read_file', arguments: { path: file } }) }) : memory.buildMemoryContext(cwd);
         const fullPrompt = memoryContext.trim()
             ? systemPrompt + '\n\n--- Project Context ---\n' + memoryContext
             : systemPrompt;
@@ -226,9 +324,12 @@ class CalliopeAgent {
             messages,
             runlog,
             cancelled: false,
+            controls, modelOptions: [],
         });
+        const session = this.sessions.get(sessionId);
+        await this.discoverModels(session, signal);
         debug(`session/new: ${sessionId} cwd=${cwd} provider=${resolvedProvider} model=${costModel}`);
-        return { sessionId };
+        return { sessionId, ...this.controlsState(session) };
     }
     // ---- ACP: session/load ------------------------------------------------
     /**
@@ -238,7 +339,7 @@ class CalliopeAgent {
      * without a recorded result are closed as unknown outcomes. No provider
      * request is made and no tool runs.
      */
-    async loadSession(params) {
+    async loadSession(params, signal) {
         const { sessionId, cwd } = params;
         if (this.sessions.get(sessionId)?.controller)
             throw RequestError.invalidParams({ error: 'A prompt is already running in this session' });
@@ -247,6 +348,9 @@ class CalliopeAgent {
             throw RequestError.invalidParams({ error: `unknown session: ${sessionId}` });
         let state;
         try {
+            assertExecutionBinding(saved.executionBinding, this.execution, !!this.execution);
+            if (this.execution)
+                new ExecutionGuard(this.execution, cwd).assertActive();
             if (!path.isAbsolute(cwd) || realpathSync(cwd) !== realpathSync(saved.projectPath)) {
                 throw new Error(`Session belongs to ${saved.projectPath}; load it with that working directory.`);
             }
@@ -257,9 +361,13 @@ class CalliopeAgent {
         catch (error) {
             throw RequestError.invalidParams({ error: errMessage(error) });
         }
+        const controls = readAcpControls(sessionId);
+        if (this.execution && controls.selection)
+            throw RequestError.invalidParams({ error: 'A delegated session cannot restore an independently selected model.' });
         const session = {
-            id: sessionId, cwd, ...sessionPreferences(cwd), revision: state.revision,
+            id: sessionId, cwd, ...sessionPreferences(cwd, controls), revision: state.revision,
             messages: state.messages, runlog: RunLog.open(sessionId), cancelled: false,
+            controls, modelOptions: [],
         };
         // An idle copy already open here is replaced by the saved state; a prompt sent
         // before the load responds is refused as an unknown session.
@@ -301,18 +409,16 @@ class CalliopeAgent {
             await this.emit(sessionId, { sessionUpdate: 'agent_thought_chunk', content: { type: 'text', text: `[${notices.join(' ')}]\n` } });
         await this.flush();
         this.sessions.set(sessionId, session);
+        await this.discoverModels(session, signal);
         session.runlog.policyEvent({ tool: 'session', source: 'session-recovery', decision: 'allow', durationMs: 0,
             reason: `session/load revision=${state.revision} messages=${session.messages.length}` });
         await session.runlog.flush();
         debug(`session/load: ${sessionId} cwd=${cwd} messages=${session.messages.length} status=${state.status}`);
-        return {};
+        return this.controlsState(session);
     }
     // ---- ACP: session/prompt ---------------------------------------------
     async prompt(params) {
-        const session = this.sessions.get(params.sessionId);
-        if (!session) {
-            throw RequestError.invalidParams({ error: `unknown session: ${params.sessionId}` });
-        }
+        const session = this.idleSession(params.sessionId);
         if (session.controller)
             throw RequestError.invalidParams({ error: 'A prompt is already running in this session' });
         session.controller = new AbortController();
@@ -353,6 +459,11 @@ class CalliopeAgent {
     // ---- The agent loop (ACP-flavoured mirror of the headless loop) --------
     async runTurn(session, prompt) {
         const messages = { current: session.messages };
+        const controlRevision = session.controls.revision;
+        const assertControls = () => {
+            if (readAcpControls(session.id).revision !== controlRevision)
+                throw new Error('Session controls changed during execution; reload before continuing.');
+        };
         let streamedChars = 0;
         try {
             for (const warning of session.preference.warnings)
@@ -360,6 +471,7 @@ class CalliopeAgent {
             const result = await runTurn({
                 captureToolOutput: true,
                 client: 'acp',
+                execution: this.execution,
                 onSafetyBranch: async () => {
                     const { branchSession } = await import('./session-management/index.js');
                     const branch = await branchSession(session.id, { kind: 'safety', signal: session.controller?.signal, runlog: session.runlog });
@@ -371,11 +483,12 @@ class CalliopeAgent {
                     session.runlog.sessionCheckpoint({ revision: saved.revision, status, messageCount: saved.messages.length, checksum: saved.checksum });
                 },
                 sessionId: session.id, cwd: session.cwd, provider: session.provider,
+                get mode() { assertControls(); return session.controls.mode; },
                 model: session.model || undefined, prompt, messages, signal: session.controller?.signal,
                 preferenceSources: session.preference.sources,
                 runlog: session.runlog, maxIterations: resolveIterationLimit(config.get('maxIterations')),
                 confirmation: 'mutating', approvals: this.approvals, tools: () => TOOLS, toolOptions: { fs: this.clientFsDelegate(session.id) },
-                prepare: async (request) => { streamedChars = 0; return request; },
+                prepare: async (request) => { assertControls(); streamedChars = 0; return request; },
                 approve: (call, decision) => this.requestPermission(session, call, decision.request?.reusable ?? false),
                 onToken: token => {
                     if (!token || session.cancelled)
@@ -528,15 +641,17 @@ class CalliopeAgent {
  * which drive the SDK's client side against it over an in-memory stream pair.
  * The SDK calls onConnect before dispatch, so the returned agent is ready.
  */
-export function serveAcp(stream) {
+export function serveAcp(stream, options = {}) {
     let agent;
     createAgent()
-        .onConnect(connection => { agent = new CalliopeAgent(connection.client); })
+        .onConnect(connection => { agent = new CalliopeAgent(connection.client, options.execution); })
         .onRequest(ACP_INPUT_LIMIT_METHOD, () => undefined, () => { throw RequestError.invalidParams({ error: 'ACP input complexity limit exceeded.' }); })
         .onRequest(methods.agent.initialize, ({ params }) => agent.initialize(params))
         .onRequest(methods.agent.authenticate, () => agent.authenticate())
-        .onRequest(methods.agent.session.new, ({ params }) => agent.newSession(params))
-        .onRequest(methods.agent.session.load, ({ params }) => agent.loadSession(params))
+        .onRequest(methods.agent.session.new, ({ params, signal }) => agent.newSession(params, signal))
+        .onRequest(methods.agent.session.load, ({ params, signal }) => agent.loadSession(params, signal))
+        .onRequest(methods.agent.session.setMode, ({ params, signal }) => agent.setMode(params, signal))
+        .onRequest(methods.agent.session.setConfigOption, ({ params, signal }) => agent.setConfigOption(params, signal))
         .onRequest(methods.agent.session.prompt, ({ params }) => agent.prompt(params))
         .onNotification(methods.agent.session.cancel, ({ params }) => agent.cancel(params))
         .connect({ ...stream, readable: boundAcpInput(stream.readable) });
@@ -546,11 +661,12 @@ export function serveAcp(stream) {
  * Run Calliope as an ACP agent over stdio (stdout/stdin carry JSON-RPC). Started
  * from bin.ts when argv[0] === 'acp'. Resolves when the client closes the stream.
  */
-export async function runAcpAgent() {
+export async function runAcpAgent(options = {}) {
+    const execution = options.ledger ? await connectDelegatedExecution(process.cwd(), options.ledger) : undefined;
     const input = Readable.toWeb(process.stdin);
     const output = Writable.toWeb(process.stdout);
     const stream = ndJsonStream(output, input);
-    const agent = serveAcp(stream);
+    const agent = serveAcp(stream, { execution });
     log(`Calliope ACP agent ready on stdio (protocol v${PROTOCOL_VERSION}). Logs go to stderr.`);
     // Stay alive until the client disconnects (stdin closes).
     await new Promise((resolve) => {