@moxt-ai/mobius 0.0.389 → 0.0.391

package/dist/{chunk-Z6ERJZ2H.js → chunk-4VUCI4MS.js}

@@ -80,7 +80,7 @@ var __callDispose = (stack, error, hasError) => {
 // package.json
 var package_default = {
   name: "@moxt-ai/mobius",
-  version: "0.0.389",
+  version: "0.0.391",
   description: "Mobius CLI for pairing and running local AI agent services.",
   type: "module",
   bin: {
@@ -171,4 +171,4 @@ export {
   __callDispose,
   package_default
 };
-//# sourceMappingURL=chunk-Z6ERJZ2H.js.map
+//# sourceMappingURL=chunk-4VUCI4MS.js.map

package/dist/{chunk-Z6ERJZ2H.js.map → chunk-4VUCI4MS.js.map}

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../package.json"],
-  "sourcesContent": ["{\n    \"name\": \"@moxt-ai/mobius\",\n    \"version\": \"0.0.389\",\n    \"description\": \"Mobius CLI for pairing and running local AI agent services.\",\n    \"type\": \"module\",\n    \"bin\": {\n        \"mobius\": \"dist/cli.js\"\n    },\n    \"exports\": {\n        \"./engine\": {\n            \"mobius-source\": \"./src/exports/engine.ts\",\n            \"types\": \"./dist/exports/engine.d.ts\",\n            \"default\": \"./dist/engine.js\"\n        }\n    },\n    \"files\": [\n        \"dist\",\n        \"NOTICE\",\n        \"THIRD-PARTY-NOTICES.txt\"\n    ],\n    \"engines\": {\n        \"node\": \">=22.19.0\"\n    },\n    \"publishConfig\": {\n        \"access\": \"public\",\n        \"exports\": {\n            \"./engine\": {\n                \"types\": \"./dist/exports/engine.d.ts\",\n                \"import\": \"./dist/engine.js\",\n                \"default\": \"./dist/engine.js\"\n            }\n        }\n    },\n    \"repository\": {\n        \"type\": \"git\",\n        \"url\": \"git+https://github.com/moxt-ai/mobius.git\",\n        \"directory\": \"packages/cli\"\n    },\n    \"scripts\": {\n        \"prebuild\": \"tsc --project src/engine/acp/harness/claude/upstream/tsconfig.json && tsc --project src/engine/acp/harness/pi/upstream/tsconfig.json\",\n        \"build\": \"node scripts/build.ts && tsc --project tsconfig.build.json\",\n        \"dev\": \"node --watch src/cli/entrypoint.ts\",\n        \"pretypecheck\": \"tsc --project src/engine/acp/harness/claude/upstream/tsconfig.json && tsc --project src/engine/acp/harness/pi/upstream/tsconfig.json\",\n        \"prepack\": \"pnpm build\",\n        \"start\": \"node dist/cli.js\",\n        \"typecheck\": \"tsc --project tsconfig.json && tsc --project tests/tsconfig.json\",\n        \"pretest:controlled\": \"pnpm build\",\n        \"test:controlled\": \"vitest run tests/sessions tests/runtime\",\n        \"pretest:manual\": \"pnpm pretest:controlled\",\n        \"test:manual\": \"vitest run tests/manual\",\n        \"pretest:agents\": \"pnpm build\",\n        \"test:agents\": \"vitest run tests/agents --maxWorkers=2\",\n        \"pretest:pressure\": \"tsc --project src/engine/acp/harness/claude/upstream/tsconfig.json && tsc --project src/engine/acp/harness/pi/upstream/tsconfig.json\",\n        \"test:pressure\": \"node tests/pressure/concurrent-sessions.mjs\"\n    },\n    \"dependencies\": {\n        \"@agentclientprotocol/sdk\": \"^1.4.0\",\n        \"@anthropic-ai/claude-agent-sdk\": \"0.3.257\",\n        \"commander\": \"15.0.0\",\n        \"semver\": \"^7.8.5\",\n        \"undici\": \"8.12.2\",\n        \"zod\": \"^4.6.7\"\n    },\n    \"devDependencies\": {\n        \"@anthropic-ai/sdk\": \"0.122.0\",\n        \"@moxt-ai/mobius-sdk\": \"workspace:*\",\n        \"@moxt-ai/mobius-test\": \"workspace:*\",\n        \"@types/node\": \"^24.13.5\",\n        \"@types/semver\": \"^7.8.0\",\n        \"@types/ws\": \"^8.18.1\",\n        \"drizzle-kit\": \"1.0.0-rc.4\",\n        \"drizzle-orm\": \"1.0.0-rc.4\",\n        \"esbuild\": \"0.28.2\",\n        \"valibot\": \"1.5.0\",\n        \"ws\": \"^8.21.3\"\n    },\n    \"keywords\": [],\n    \"author\": \"Moxt\",\n    \"license\": \"Apache-2.0\",\n    \"bugs\": {\n        \"url\": \"https://github.com/moxt-ai/mobius/issues\"\n    },\n    \"homepage\": \"https://github.com/moxt-ai/mobius#readme\"\n}\n"],
+  "sourcesContent": ["{\n    \"name\": \"@moxt-ai/mobius\",\n    \"version\": \"0.0.391\",\n    \"description\": \"Mobius CLI for pairing and running local AI agent services.\",\n    \"type\": \"module\",\n    \"bin\": {\n        \"mobius\": \"dist/cli.js\"\n    },\n    \"exports\": {\n        \"./engine\": {\n            \"mobius-source\": \"./src/exports/engine.ts\",\n            \"types\": \"./dist/exports/engine.d.ts\",\n            \"default\": \"./dist/engine.js\"\n        }\n    },\n    \"files\": [\n        \"dist\",\n        \"NOTICE\",\n        \"THIRD-PARTY-NOTICES.txt\"\n    ],\n    \"engines\": {\n        \"node\": \">=22.19.0\"\n    },\n    \"publishConfig\": {\n        \"access\": \"public\",\n        \"exports\": {\n            \"./engine\": {\n                \"types\": \"./dist/exports/engine.d.ts\",\n                \"import\": \"./dist/engine.js\",\n                \"default\": \"./dist/engine.js\"\n            }\n        }\n    },\n    \"repository\": {\n        \"type\": \"git\",\n        \"url\": \"git+https://github.com/moxt-ai/mobius.git\",\n        \"directory\": \"packages/cli\"\n    },\n    \"scripts\": {\n        \"prebuild\": \"tsc --project src/engine/acp/harness/claude/upstream/tsconfig.json && tsc --project src/engine/acp/harness/pi/upstream/tsconfig.json\",\n        \"build\": \"node scripts/build.ts && tsc --project tsconfig.build.json\",\n        \"dev\": \"node --watch src/cli/entrypoint.ts\",\n        \"pretypecheck\": \"tsc --project src/engine/acp/harness/claude/upstream/tsconfig.json && tsc --project src/engine/acp/harness/pi/upstream/tsconfig.json\",\n        \"prepack\": \"pnpm build\",\n        \"start\": \"node dist/cli.js\",\n        \"typecheck\": \"tsc --project tsconfig.json && tsc --project tests/tsconfig.json\",\n        \"pretest:controlled\": \"pnpm build\",\n        \"test:controlled\": \"vitest run tests/sessions tests/runtime\",\n        \"pretest:manual\": \"pnpm pretest:controlled\",\n        \"test:manual\": \"vitest run tests/manual\",\n        \"pretest:agents\": \"pnpm build\",\n        \"test:agents\": \"vitest run tests/agents --maxWorkers=2\",\n        \"pretest:pressure\": \"tsc --project src/engine/acp/harness/claude/upstream/tsconfig.json && tsc --project src/engine/acp/harness/pi/upstream/tsconfig.json\",\n        \"test:pressure\": \"node tests/pressure/concurrent-sessions.mjs\"\n    },\n    \"dependencies\": {\n        \"@agentclientprotocol/sdk\": \"^1.4.0\",\n        \"@anthropic-ai/claude-agent-sdk\": \"0.3.257\",\n        \"commander\": \"15.0.0\",\n        \"semver\": \"^7.8.5\",\n        \"undici\": \"8.12.2\",\n        \"zod\": \"^4.6.7\"\n    },\n    \"devDependencies\": {\n        \"@anthropic-ai/sdk\": \"0.122.0\",\n        \"@moxt-ai/mobius-sdk\": \"workspace:*\",\n        \"@moxt-ai/mobius-test\": \"workspace:*\",\n        \"@types/node\": \"^24.13.5\",\n        \"@types/semver\": \"^7.8.0\",\n        \"@types/ws\": \"^8.18.1\",\n        \"drizzle-kit\": \"1.0.0-rc.4\",\n        \"drizzle-orm\": \"1.0.0-rc.4\",\n        \"esbuild\": \"0.28.2\",\n        \"valibot\": \"1.5.0\",\n        \"ws\": \"^8.21.3\"\n    },\n    \"keywords\": [],\n    \"author\": \"Moxt\",\n    \"license\": \"Apache-2.0\",\n    \"bugs\": {\n        \"url\": \"https://github.com/moxt-ai/mobius/issues\"\n    },\n    \"homepage\": \"https://github.com/moxt-ai/mobius#readme\"\n}\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA,EACI,MAAQ;AAAA,EACR,SAAW;AAAA,EACX,aAAe;AAAA,EACf,MAAQ;AAAA,EACR,KAAO;AAAA,IACH,QAAU;AAAA,EACd;AAAA,EACA,SAAW;AAAA,IACP,YAAY;AAAA,MACR,iBAAiB;AAAA,MACjB,OAAS;AAAA,MACT,SAAW;AAAA,IACf;AAAA,EACJ;AAAA,EACA,OAAS;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,EACJ;AAAA,EACA,SAAW;AAAA,IACP,MAAQ;AAAA,EACZ;AAAA,EACA,eAAiB;AAAA,IACb,QAAU;AAAA,IACV,SAAW;AAAA,MACP,YAAY;AAAA,QACR,OAAS;AAAA,QACT,QAAU;AAAA,QACV,SAAW;AAAA,MACf;AAAA,IACJ;AAAA,EACJ;AAAA,EACA,YAAc;AAAA,IACV,MAAQ;AAAA,IACR,KAAO;AAAA,IACP,WAAa;AAAA,EACjB;AAAA,EACA,SAAW;AAAA,IACP,UAAY;AAAA,IACZ,OAAS;AAAA,IACT,KAAO;AAAA,IACP,cAAgB;AAAA,IAChB,SAAW;AAAA,IACX,OAAS;AAAA,IACT,WAAa;AAAA,IACb,sBAAsB;AAAA,IACtB,mBAAmB;AAAA,IACnB,kBAAkB;AAAA,IAClB,eAAe;AAAA,IACf,kBAAkB;AAAA,IAClB,eAAe;AAAA,IACf,oBAAoB;AAAA,IACpB,iBAAiB;AAAA,EACrB;AAAA,EACA,cAAgB;AAAA,IACZ,4BAA4B;AAAA,IAC5B,kCAAkC;AAAA,IAClC,WAAa;AAAA,IACb,QAAU;AAAA,IACV,QAAU;AAAA,IACV,KAAO;AAAA,EACX;AAAA,EACA,iBAAmB;AAAA,IACf,qBAAqB;AAAA,IACrB,uBAAuB;AAAA,IACvB,wBAAwB;AAAA,IACxB,eAAe;AAAA,IACf,iBAAiB;AAAA,IACjB,aAAa;AAAA,IACb,eAAe;AAAA,IACf,eAAe;AAAA,IACf,SAAW;AAAA,IACX,SAAW;AAAA,IACX,IAAM;AAAA,EACV;AAAA,EACA,UAAY,CAAC;AAAA,EACb,QAAU;AAAA,EACV,SAAW;AAAA,EACX,MAAQ;AAAA,IACJ,KAAO;AAAA,EACX;AAAA,EACA,UAAY;AAChB;",
   "names": []
 }

package/dist/{chunk-77O2RBRQ.js → chunk-TQJ2GJH7.js}

@@ -3,7 +3,7 @@ import {
   __export,
   __using,
   package_default
-} from "./chunk-Z6ERJZ2H.js";
+} from "./chunk-4VUCI4MS.js";
 
 // src/engine/runtime/relay/runtime-revocation.ts
 var runtimeRevocationCloseCode = 1008;
@@ -78293,6 +78293,14 @@ var acpSessionStoreMigrations = [
   }
 ];
 
+// src/engine/generated/command-cancellation-migrations.ts
+var commandCancellationMigrations = [
+  {
+    "name": "0000_tired_cardiac.sql",
+    "sql": "CREATE TABLE `cancelled_command` (\n	`command_id` text PRIMARY KEY NOT NULL,\n	`session_id` text NOT NULL\n);\n"
+  }
+];
+
 // src/engine/generated/session-event-cache-migrations.ts
 var sessionEventCacheMigrations = [
   {
@@ -83232,6 +83240,7 @@ var LocalSqliteDatabase = class {
 function channelSessionDatabasePaths(stateDirectory, channelId) {
   const channelHash = createHash4("sha256").update(channelId).digest("hex");
   return {
+    cancellations: join22(stateDirectory, "sessions", `${channelHash}.cancellations.sqlite`),
     events: join22(stateDirectory, "sessions", `${channelHash}.events.sqlite`),
     sessions: join22(stateDirectory, "sessions", `${channelHash}.sqlite`)
   };
@@ -83255,6 +83264,7 @@ var openAcpSessionDatabase = (path7) => {
   recordAppliedAdmissionOrder(path7);
   return new LocalSqliteDatabase(path7, "ACP Session database", acpSessionStoreMigrations);
 };
+var openCommandCancellationDatabase = (path7) => new LocalSqliteDatabase(path7, "Command cancellation database", commandCancellationMigrations);
 var openSessionEventCacheDatabase = (path7) => new LocalSqliteDatabase(path7, "V2 Session event cache", sessionEventCacheMigrations, [
   "PRAGMA journal_mode = WAL",
   "PRAGMA synchronous = OFF",
@@ -85045,6 +85055,33 @@ var AcpSessionTable = class {
   };
 };
 
+// src/engine/schema/command-cancellation/cancelled-command.ts
+var cancelledCommand = sqliteTable("cancelled_command", {
+  commandId: text("command_id").primaryKey(),
+  sessionId: text("session_id").notNull()
+});
+
+// src/engine/storage/session/command-cancellation-table.ts
+var cancellationSchema = external_exports.object({ commandId: external_exports.string(), sessionId: external_exports.string() }).readonly();
+var CommandCancellationTable = class {
+  #database;
+  constructor(database) {
+    this.#database = database;
+  }
+  close = () => this.#database.close();
+  read = (commandId) => {
+    const row = this.#database.orm.select().from(cancelledCommand).where(eq2(cancelledCommand.commandId, commandId)).get();
+    return row === void 0 ? void 0 : cancellationSchema.parse(row);
+  };
+  retain = (cancellations) => {
+    this.#database.transaction(() => {
+      for (const cancellation of cancellations) {
+        this.#database.orm.insert(cancelledCommand).values(cancellation).onConflictDoNothing().run();
+      }
+    });
+  };
+};
+
 // src/engine/storage/session/execution-receipt-table.ts
 var receiptSchema = external_exports.object({
   commandId: external_exports.string(),
@@ -85244,7 +85281,7 @@ var PreparedSession = class {
   prompted;
   restored;
   configurationRevision;
-  constructor(agentName, agentVersion, capabilities, commands, configOptions, prompted, restored, configurationRevision) {
+  constructor(agentName, agentVersion, capabilities, commands, configOptions, prompted, restored, configurationRevision2) {
     this.agentName = agentName;
     this.agentVersion = agentVersion;
     this.capabilities = capabilities;
@@ -85252,7 +85289,7 @@ var PreparedSession = class {
     this.configOptions = configOptions;
     this.prompted = prompted;
     this.restored = restored;
-    this.configurationRevision = configurationRevision;
+    this.configurationRevision = configurationRevision2;
   }
 };
 var AgentSettingsSnapshot = class {
@@ -86026,6 +86063,23 @@ var SqliteSessionStore = class {
   };
 };
 
+// src/engine/session/live/configuration-revision.ts
+import { createHash as createHash6 } from "node:crypto";
+var configurationRevision = (options) => {
+  const canonical = options.map(
+    (option) => JSON.stringify(
+      option.type === "boolean" ? [option.id, option.type, option.category, option.booleanValue] : [
+        option.id,
+        option.type,
+        option.category,
+        option.currentValue,
+        option.values.map((value) => value.value).toSorted()
+      ]
+    )
+  ).toSorted();
+  return createHash6("sha256").update(JSON.stringify(canonical)).digest("hex");
+};
+
 // src/engine/session/live/session-restore.ts
 function hasMethodNotFoundCode(cause) {
   const visited = /* @__PURE__ */ new Set();
@@ -86229,7 +86283,6 @@ var AgentSession = class _AgentSession {
   #agentVersion = "";
   #capabilities = unsupportedSessionCapabilities();
   #commands = [];
-  #configRevision = crypto.randomUUID();
   #configurationChanges = new SerialTaskQueue();
   #configOptions = [];
   #sessionConfigurations = new SessionConfigurations();
@@ -86438,7 +86491,7 @@ var AgentSession = class _AgentSession {
     this.#configOptions,
     this.#prompted,
     this.#restored,
-    this.#configRevision
+    configurationRevision(this.#configOptions)
   );
   ensureHistoryLoaded = async (signal) => {
     if (!this.#capabilities.loadSession) {
@@ -86623,38 +86676,45 @@ var AgentSession = class _AgentSession {
     this.#mobiusSessionId = sessionId;
   };
   #applyConfiguration = async (selection, signal) => {
-    const configRevision = this.#configRevision;
+    const before = this.#configOptions;
     const configured = await this.#writeNativeHistory(
       async () => await this.#adapter.configureSession({ ...this.#target(), selection, signal })
     );
-    if (this.#configRevision === configRevision) {
+    if (this.#configOptions === before) {
       this.#configOptions = configured;
-      this.#configRevision = crypto.randomUUID();
       await this.#publishConfiguration();
     }
   };
-  // The revision check and Agent mutation share one queue, including settings the Runtime applies itself.
+  // The revision check and Agent mutation share one queue with the settings the Runtime applies itself.
   // A lost response may have committed: reread after a conflict, never replay an edit blindly.
   configure = async (options) => this.#configurationChanges.run(async (signal) => {
-    if (options.expectedConfigurationRevision !== null && options.expectedConfigurationRevision !== this.#configRevision) {
+    if (options.expectedConfigurationRevision !== configurationRevision(this.#configOptions)) {
       throw new AcpExecutionError(
         "Session settings changed. Review the current settings before applying your selection again.",
         {},
         "session_configuration_conflict"
       );
     }
+    return await this.#change(options, signal);
+  }, options.signal);
+  /** Applies a setting the Runtime owns, whatever the configuration's current revision. */
+  applyConfiguration = async (change) => this.#configurationChanges.run(async (signal) => await this.#change(change, signal), change.signal);
+  #change = async (change, signal) => {
     await this.#applyConfiguration(
-      options.valueType === "boolean" ? { type: "boolean", configId: options.configId, booleanValue: options.booleanValue } : { type: "select", configId: options.configId, value: options.value },
+      change.valueType === "boolean" ? { type: "boolean", configId: change.configId, booleanValue: change.booleanValue } : { type: "select", configId: change.configId, value: change.value },
       signal
     );
-    const applied = this.#configOptions.find((option) => option.id === options.configId);
+    const applied = this.#configOptions.find((option) => option.id === change.configId);
     if (applied === void 0) {
       throw new AcpExecutionError("The requested ACP configuration option is unavailable");
     }
     this.#sessionConfigurations.select(applied);
     this.writeStoredSession((/* @__PURE__ */ new Date()).toISOString());
-    return { configOptions: this.#configOptions, configurationRevision: this.#configRevision };
-  }, options.signal);
+    return {
+      configOptions: this.#configOptions,
+      configurationRevision: configurationRevision(this.#configOptions)
+    };
+  };
   #publishConfiguration = async () => {
     const event = this.#store.events.append(this.#mobiusSessionId, {
       type: "acp",
@@ -86884,7 +86944,6 @@ var AgentSession = class _AgentSession {
       this.#configOptions = event.kind === "configuration" ? event.configOptions : this.#configOptions.map(
         (option) => option.category === "mode" ? { ...option, currentValue: event.modeId } : option
       );
-      this.#configRevision = crypto.randomUUID();
       this.#captureSelectedConfigurationValues();
     }
     if (this.#sessionLoad.kind === "capturing") {
@@ -86967,7 +87026,6 @@ var AgentSession = class _AgentSession {
   openSessionWithReplay = async (signal) => (await this.#loadSession(signal)).opened;
   setConfigOptions(options) {
     this.#configOptions = options;
-    this.#configRevision = crypto.randomUUID();
   }
   setNativeHistoryOwnership(ownership) {
     this.#nativeHistoryOwnership = ownership;
@@ -86989,7 +87047,7 @@ var AgentSession = class _AgentSession {
   emitConfigUpdate = async () => {
     await this.#getObserver().onConfig({
       configOptions: this.#configOptions,
-      configurationRevision: this.#configRevision,
+      configurationRevision: configurationRevision(this.#configOptions),
       kind: SESSION_CONFIG_UPDATED_KIND,
       requestId: `agent-update-${crypto.randomUUID()}`,
       sessionId: this.#mobiusSessionId
@@ -87297,11 +87355,10 @@ var SessionManager2 = class {
           }
           if (desired.type === "boolean") {
             if (current.booleanValue !== desired.booleanValue) {
-              await runtime.configure({
+              await runtime.applyConfiguration({
                 ...options,
                 booleanValue: desired.booleanValue,
                 configId: desired.id,
-                expectedConfigurationRevision: null,
                 requestId: `execution-prepare-${desired.id}`,
                 value: "",
                 valueType: "boolean"
@@ -87310,11 +87367,10 @@ var SessionManager2 = class {
             continue;
           }
           if (current.currentValue !== desired.currentValue && current.values.some((value) => value.value === desired.currentValue)) {
-            await runtime.configure({
+            await runtime.applyConfiguration({
               ...options,
               booleanValue: false,
               configId: desired.id,
-              expectedConfigurationRevision: null,
               requestId: `execution-prepare-${desired.id}`,
               value: desired.currentValue,
               valueType: "select"
@@ -87458,11 +87514,10 @@ var SessionManager2 = class {
           (option) => option.id === "model" || option.category === "model"
         );
         const modelIsFixed = modelOption2?.type === "select" && modelOption2.values.length < 2 && modelOption2.currentValue === model;
-        const configOptions = model === void 0 || modelIsFixed ? prepared.configOptions : (await runtime.configure({
+        const configOptions = model === void 0 || modelIsFixed ? prepared.configOptions : (await runtime.applyConfiguration({
           ...options2,
           booleanValue: false,
           configId: modelOption2?.id ?? "model",
-          expectedConfigurationRevision: null,
           requestId: "agent-settings-model",
           sessionId: `agent-settings-${crypto.randomUUID()}`,
           value: model,
@@ -87539,12 +87594,20 @@ var SessionManager2 = class {
     }
     return (await this.#replaceExecutionPreparation(existing, options2)).prepared();
   });
+  /** Applies a client's edit only while the Session's configuration still has the revision the client read. */
   configureSession = async (options) => this.#operations.run(options, async (options2) => {
     return await this.#executionProcesses.use(options2.sessionId, async () => {
       const runtime = await this.ensureSession(options2);
       return await runtime.configure(options2);
     });
   });
+  /** Applies a setting the Runtime owns, such as one a prompt or a preparation requested. */
+  applySessionConfiguration = async (change) => this.#operations.run(change, async (change2) => {
+    return await this.#executionProcesses.use(change2.sessionId, async () => {
+      const runtime = await this.ensureSession(change2);
+      return await runtime.applyConfiguration(change2);
+    });
+  });
   renameSession = async (options, title2) => await this.#executionProcesses.use(
     options.sessionId,
     async () => this.#operations.run(options, async (options2) => {
@@ -88326,7 +88389,7 @@ var NativeSessionService = class {
 };
 
 // src/engine/session/prompt/prompt-artifacts.ts
-import { createHash as createHash6 } from "node:crypto";
+import { createHash as createHash7 } from "node:crypto";
 import { pathToFileURL as pathToFileURL2 } from "node:url";
 var PromptArtifactError = class extends OperationError {
   constructor(code, message, options = {}) {
@@ -88352,7 +88415,7 @@ async function resolvePromptArtifacts(read, attachments, signal) {
     signal.throwIfAborted();
     const artifact = await read(attachment, signal);
     const { bytes } = artifact;
-    if (bytes.byteLength !== attachment.byteLength || createHash6("sha256").update(bytes).digest("hex") !== attachment.contentKey) {
+    if (bytes.byteLength !== attachment.byteLength || createHash7("sha256").update(bytes).digest("hex") !== attachment.contentKey) {
       throw new PromptArtifactError(
         "artifact_integrity_failed",
         "The prompt attachment failed integrity validation"
@@ -88574,7 +88637,7 @@ async function settleAbandonedTurn(projection, operations, cancellation) {
 }
 
 // src/engine/session/turn/execution-receipts.ts
-import { createHash as createHash7, randomUUID as randomUUID15 } from "node:crypto";
+import { createHash as createHash8, randomUUID as randomUUID15 } from "node:crypto";
 var MAX_TERMINAL_RECEIPTS = 1024;
 function executionStarted(state) {
   switch (state.kind) {
@@ -88590,6 +88653,13 @@ function executionStarted(state) {
     }
   }
 }
+function cancelledBeforeStart(state) {
+  if (state.kind !== "settled-before-start") {
+    return false;
+  }
+  const outcome = decodeKnownSessionEventPayload(JSON.parse(state.outcome));
+  return outcome?.type === "lifecycle-metadata" && outcome.payload.kind === "prompt.completed" && outcome.payload.stopReason === "cancelled";
+}
 function executionOutcome(state) {
   switch (state.kind) {
     case "pending":
@@ -88611,32 +88681,29 @@ var ExecutionReceipts = class {
   #executions = /* @__PURE__ */ new Map();
   #recoveredCommands = /* @__PURE__ */ new Set();
   #table;
+  #cancellations;
   #closing = false;
   #onCount;
-  constructor(table, onCount = () => void 0) {
+  constructor(table, cancellations, onCount = () => void 0) {
     this.#onCount = onCount;
     this.#table = table;
+    this.#cancellations = cancellations;
+    const retained = [];
     for (const { commandId, started, outcome, updatedAt: _updatedAt, ...identity2 } of table.list()) {
-      const state = { kind: started ? "started" : "pending" };
+      const pending = { kind: started ? "started" : "pending" };
+      const state = outcome === null ? pending : settledExecution(pending, outcome);
       this.#executions.set(commandId, {
         ...identity2,
-        state: outcome === null ? state : settledExecution(state, outcome)
+        state
       });
+      if (cancelledBeforeStart(state)) {
+        retained.push({ commandId, sessionId: identity2.sessionId });
+      }
       this.#recoveredCommands.add(commandId);
     }
+    cancellations.retain(retained);
   }
-  #save = (commandId, receipt, durableOutcome = executionOutcome(receipt.state)) => {
-    const { state, ...identity2 } = receipt;
-    const evicted = this.#closing ? [] : this.#table.save(
-      {
-        ...identity2,
-        commandId,
-        started: executionStarted(state),
-        outcome: durableOutcome,
-        updatedAt: (/* @__PURE__ */ new Date()).toISOString()
-      },
-      MAX_TERMINAL_RECEIPTS
-    );
+  #remember = (commandId, receipt, evicted) => {
     this.#executions.set(commandId, receipt);
     for (const evictedCommandId of evicted) {
       this.#executions.delete(evictedCommandId);
@@ -88650,6 +88717,24 @@ var ExecutionReceipts = class {
     }
     this.#onCount(activeCount);
   };
+  #save = (commandId, receipt, durableOutcome = executionOutcome(receipt.state)) => {
+    const { state, ...identity2 } = receipt;
+    if (!this.#closing && cancelledBeforeStart(state)) {
+      this.#cancellations.retain([{ commandId, sessionId: receipt.sessionId }]);
+      this.#remember(commandId, receipt, []);
+    }
+    const evicted = this.#closing ? [] : this.#table.save(
+      {
+        ...identity2,
+        commandId,
+        started: executionStarted(state),
+        outcome: durableOutcome,
+        updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+      },
+      MAX_TERMINAL_RECEIPTS
+    );
+    this.#remember(commandId, receipt, evicted);
+  };
   #nextAdmissionOrder = () => {
     let latest = 0;
     for (const receipt of this.#executions.values()) {
@@ -88669,7 +88754,7 @@ var ExecutionReceipts = class {
   delivery = (commandId, sessionId) => {
     const receipt = this.#executions.get(commandId);
     if (receipt === void 0) {
-      return this.#table.identity(commandId)?.sessionId === sessionId ? { state: "expired" } : { state: "unknown" };
+      return this.#table.identity(commandId)?.sessionId === sessionId || this.#cancellations.read(commandId)?.sessionId === sessionId ? { state: "expired" } : { state: "unknown" };
     }
     if (receipt.sessionId !== sessionId) {
       return { state: "unknown" };
@@ -88743,11 +88828,23 @@ var ExecutionReceipts = class {
         payload: { kind: "prompt.completed", commandId, stopReason: "cancelled" }
       } : void 0;
     }
+    const cancellation = this.#cancellations.read(commandId);
+    if (cancellation !== void 0) {
+      return cancellation.sessionId === sessionId ? {
+        type: "lifecycle-metadata",
+        payload: {
+          kind: "prompt.completed",
+          commandId,
+          stopReason: "cancelled",
+          execution: "not-started"
+        }
+      } : void 0;
+    }
     const outcome = {
       type: "lifecycle-metadata",
       payload: { kind: "prompt.completed", commandId, stopReason: "cancelled", execution: "not-started" }
     };
-    const commandHash = createHash7("sha256").update(
+    const commandHash = createHash8("sha256").update(
       encodeSessionCancelBeforeStartCommand({
         commandId,
         kind: "session.cancel-before-start",
@@ -88802,7 +88899,16 @@ var ExecutionReceipts = class {
     const recovered = [];
     for (const [commandId, receipt] of [...this.#executions]) {
       const outcome = executionOutcome(receipt.state);
-      const event = outcome === null ? {
+      const restoreCancellation = !this.hasStarted(commandId, receipt.sessionId) && !cancelledBeforeStart(receipt.state) && this.#cancellations.read(commandId)?.sessionId === receipt.sessionId;
+      const event = restoreCancellation ? {
+        type: "lifecycle-metadata",
+        payload: {
+          kind: "prompt.completed",
+          commandId,
+          stopReason: "cancelled",
+          execution: "not-started"
+        }
+      } : outcome === null ? {
         type: "lifecycle-metadata",
         payload: executionStarted(receipt.state) ? {
           kind: "prompt.failed",
@@ -88820,9 +88926,9 @@ var ExecutionReceipts = class {
       if (event === null) {
         continue;
       }
-      const recordedAt = outcome === null ? (/* @__PURE__ */ new Date()).toISOString() : external_exports.object({ recordedAt: external_exports.string() }).parse(JSON.parse(outcome)).recordedAt;
+      const recordedAt = restoreCancellation || outcome === null ? (/* @__PURE__ */ new Date()).toISOString() : external_exports.object({ recordedAt: external_exports.string() }).parse(JSON.parse(outcome)).recordedAt;
       recovered.push({ sessionId: receipt.sessionId, event, recordedAt });
-      if (outcome === null) {
+      if (restoreCancellation || outcome === null) {
         this.#save(commandId, {
           ...receipt,
           state: settledExecution(receipt.state, JSON.stringify({ ...event, recordedAt }))
@@ -88832,7 +88938,7 @@ var ExecutionReceipts = class {
     return recovered;
   };
   claimExecution = (commandId, sessionId, commandJson) => {
-    const commandHash = createHash7("sha256").update(commandJson).digest("hex");
+    const commandHash = createHash8("sha256").update(commandJson).digest("hex");
     let existing = this.#executions.get(commandId);
     const previous = this.outcome(commandId);
     if (existing?.sessionId === sessionId && !executionStarted(existing.state) && previous?.type === "lifecycle-metadata" && previous.payload.kind === "prompt.failed-before-start" && previous.payload.code === "runtime_restarted") {
@@ -88856,6 +88962,9 @@ var ExecutionReceipts = class {
     if (identity2 !== void 0) {
       return identity2.sessionId === sessionId && identity2.commandHash === commandHash ? { kind: "expired" } : { kind: "conflict" };
     }
+    if (this.#cancellations.read(commandId) !== void 0) {
+      return { kind: "conflict" };
+    }
     const attemptId = randomUUID15();
     this.#save(commandId, {
       admissionOrder: this.#nextAdmissionOrder(),
@@ -88878,6 +88987,7 @@ var ExecutionReceipts = class {
   close = () => {
     this.#executions.clear();
     this.#recoveredCommands.clear();
+    this.#cancellations.close();
   };
 };
 
@@ -89473,13 +89583,20 @@ function buildSessionLayer(options) {
   const sessionDatabase = openAcpSessionDatabase(databases.sessions);
   let events;
   let operations;
+  let cancellations;
   try {
-    operations = new ExecutionReceipts(new ExecutionReceiptTable(sessionDatabase), options.onExecutionCountChange);
+    cancellations = new CommandCancellationTable(openCommandCancellationDatabase(databases.cancellations));
+    operations = new ExecutionReceipts(
+      new ExecutionReceiptTable(sessionDatabase),
+      cancellations,
+      options.onExecutionCountChange
+    );
     events = new CachedSessionEventStore(
       new SessionEventCacheTable(openSessionEventCacheDatabase(databases.events)),
       new SqliteSessionLiveEventPosition(new LiveEventPositionTable(sessionDatabase))
     );
   } catch (error62) {
+    cancellations?.close();
     sessionDatabase.close();
     throw error62;
   }
@@ -89570,7 +89687,7 @@ function buildSessionLayer(options) {
 }
 
 // src/engine/session/content/external-content-store.ts
-import { createHash as createHash8 } from "node:crypto";
+import { createHash as createHash9 } from "node:crypto";
 import { extname as extname2, join as join29 } from "node:path";
 import { pathToFileURL as pathToFileURL3 } from "node:url";
 
@@ -89705,7 +89822,7 @@ var LocalExternalContentStore = class {
     const active = AbortSignal.any([signal, this.#lifetime.signal]);
     active.throwIfAborted();
     const metadata = metadataSchema.parse({ kind, mediaType, name: name2 });
-    const key = createHash8("sha256").update(bytes).digest("hex");
+    const key = createHash9("sha256").update(bytes).digest("hex");
     const request = `mobius-content:${kind}:${key}`;
     const existing = this.#entries.get(request);
     if (existing !== void 0 && existing.expiresAt > Date.now()) {
@@ -90425,7 +90542,7 @@ var SessionError = class extends OperationError {
 };
 
 // src/engine/session/settings/discover-agent-settings.ts
-import { createHash as createHash9 } from "node:crypto";
+import { createHash as createHash10 } from "node:crypto";
 
 // src/engine/agent/settings/agent-settings-base.ts
 var AgentSettingsLaunchSelectionResult = class {
@@ -90743,7 +90860,7 @@ function settingsRevision(agent, reportedAgentVersion, settings, modelEffort) {
     unsupportedModelIds: modelEffort.unsupportedModelIds,
     valuesByModel: {}
   };
-  return createHash9("sha256").update(
+  return createHash10("sha256").update(
     JSON.stringify({
       adapterVersion: agent.adapterVersion,
       agentId: agent.id,
@@ -90899,7 +91016,7 @@ function createAgentSettingsCommands(context) {
 }
 
 // src/engine/runtime/command/registry/content-write/index.ts
-import { createHash as createHash10 } from "node:crypto";
+import { createHash as createHash11 } from "node:crypto";
 function createContentWriteCommands(context) {
   const pending = /* @__PURE__ */ new Map();
   const operations = /* @__PURE__ */ new Set();
@@ -90929,7 +91046,7 @@ function createContentWriteCommands(context) {
         pending.set(message.requestId, {
           bytes: new Uint8Array(message.byteLength),
           command: message,
-          hash: createHash10("sha256"),
+          hash: createHash11("sha256"),
           receivedBytes: 0,
           sequence: 0
         });
@@ -91749,13 +91866,12 @@ async function applySessionConfigurationSelection(sessions, options, selection,
   if (sessionConfigurationMatches(option, selection)) {
     return options;
   }
-  return (await sessions.configureSession({
+  return (await sessions.applySessionConfiguration({
     adapter,
     additionalDirectories,
     agent,
     booleanValue: selection.booleanValue,
     configId: selection.configId,
-    expectedConfigurationRevision: null,
     cwd,
     requestId: `cfg_${randomUUID18()}`,
     sessionId,
@@ -92100,11 +92216,10 @@ async function prepareSession(command, recovery, closed, config2, resolveAgent,
     const configuration = command.configuration;
     const snapshot = configuration === void 0 ? prepared : await metrics.measure(
       "configuration",
-      async () => await sessions.configureSession({
+      async () => await sessions.applySessionConfiguration({
         ...preparation,
         booleanValue: configuration.booleanValue,
         configId: configuration.configId,
-        expectedConfigurationRevision: null,
         requestId: command.requestId,
         value: configuration.value,
         valueType: configuration.valueType
@@ -93631,4 +93746,4 @@ export {
   * MIT Licensed
   *)
 */
-//# sourceMappingURL=chunk-77O2RBRQ.js.map
+//# sourceMappingURL=chunk-TQJ2GJH7.js.map