@moxt-ai/mobius 0.0.358 → 0.0.360

package/dist/engine/acp/adapter/query-processes.js

@@ -1,7 +1,7 @@
-import { randomUUID } from "node:crypto";
 import { MemorySessionEventStore } from "../../session/history/session-event-store.js";
 import { waitForSharedOperation } from "../../session/manager/operation-drain.js";
 import { RetainedAgentProcesses } from "../../session/process/retained-agent-processes.js";
+import { nativeSessionPreviewKey, nativeSessionQueryKey, } from "./query-scope.js";
 import { AcpQuerySession } from "./query-session.js";
 /** Owns workspace-scoped readers, independently of execution conversations. */
 export class AgentQueryProcesses {
@@ -19,8 +19,8 @@ export class AgentQueryProcesses {
     refreshAgent = (agent) => {
         this.#agent = agent;
     };
-    retire = async (readers, cwd, runtime) => {
-        readers.detach(cwd, runtime);
+    retire = async (readers, key, runtime) => {
+        readers.detach(key, runtime);
         try {
             await this.#processes.retire(runtime, () => runtime.closeProcess());
         }
@@ -28,35 +28,35 @@ export class AgentQueryProcesses {
             runtime.discardEvents();
         }
     };
-    async #ensure(agent, readers, cwd, signal) {
-        signal.throwIfAborted();
-        const pending = readers.pending(cwd);
+    async #ensure(readers, query) {
+        query.signal.throwIfAborted();
+        const key = nativeSessionQueryKey(query);
+        const pending = readers.pending(key);
         if (pending !== undefined) {
-            return await waitForSharedOperation(pending, signal);
+            return await waitForSharedOperation(pending, query.signal);
         }
-        const existing = readers.get(cwd);
+        const existing = readers.get(key);
         if (existing !== undefined && !existing.hasTerminated()) {
-            readers.touch(cwd, existing);
+            readers.touch(key, existing);
             return existing;
         }
-        return await readers.prepare(cwd, async () => {
+        return await readers.prepare(key, async () => {
             if (existing !== undefined) {
-                await this.retire(readers, cwd, existing);
+                await this.retire(readers, key, existing);
             }
-            // This ID belongs to the reader, never to a user's conversation.
-            const readerId = randomUUID();
-            const runtime = await this.#processes.startRetained(signal, () => AcpQuerySession.start(agent, cwd, readerId, this.#store, this.#connector, signal), {
-                isBusy: () => readers.isBusy(cwd),
-                retire: (runtime) => this.retire(readers, cwd, runtime),
-                retireIdle: (runtime) => this.retire(readers, cwd, runtime),
+            const runtime = await this.#processes.startRetained(query.signal, () => AcpQuerySession.start(query, this.#store, this.#connector), {
+                isBusy: () => readers.isBusy(key),
+                retire: (runtime) => this.retire(readers, key, runtime),
+                retireIdle: (runtime) => this.retire(readers, key, runtime),
             });
-            readers.retain(cwd, runtime);
+            readers.retain(key, runtime);
             return runtime;
         });
     }
-    #use = async (cwd, signal, operation) => {
-        // Capture one immutable definition for this operation, including while it waits for capacity.
+    #use = async (query, operation) => {
+        // Capture one immutable catalog definition while waiting for capacity.
         const agent = this.#agent;
+        const scoped = { ...query, agent };
         let readers = this.#processesByAgent.get(agent);
         if (readers === undefined) {
             readers = new RetainedAgentProcesses({
@@ -66,38 +66,38 @@ export class AgentQueryProcesses {
             this.#processesByAgent.set(agent, readers);
         }
         const current = readers;
-        return await current.use(cwd, async () => await operation(await this.#ensure(agent, current, cwd, signal)));
+        return await current.use(nativeSessionQueryKey(scoped), async () => await operation(await this.#ensure(current, scoped)));
     };
-    capabilities = async (cwd, signal) => await this.#use(cwd, signal, async (runtime) => runtime.capabilities());
-    listNativeSessions = async (cwd, cursor, signal) => await this.#use(cwd, signal, async (runtime) => await runtime.listNativeSessions(cursor, signal));
-    previewSessionEvents = async (cwd, additionalDirectories, request, signal) => {
-        signal.throwIfAborted();
-        const agent = this.#agent;
-        const { nativeSessionId, eventLimit, cursor, sessionId } = request;
+    capabilities = async (query) => await this.#use(query, async (runtime) => runtime.capabilities());
+    listNativeSessions = async (query, cursor) => await this.#use(query, async (runtime) => await runtime.listNativeSessions(cursor, query.signal));
+    previewSessionEvents = async (query, request) => {
+        query.signal.throwIfAborted();
+        const scoped = { ...query, agent: this.#agent };
+        const { nativeSessionId, eventLimit, cursor } = request;
+        const key = nativeSessionPreviewKey(nativeSessionQueryKey(scoped), nativeSessionId);
         if (cursor !== null) {
-            const preview = this.#eventPreviewsBySession.get(sessionId);
+            const preview = this.#eventPreviewsBySession.get(key);
             if (preview === undefined || preview.nativeSessionId !== nativeSessionId) {
                 throw new Error("The native event cursor is invalid");
             }
-            return preview.store.page(sessionId, eventLimit, cursor);
+            return preview.store.page(nativeSessionId, eventLimit, cursor);
         }
         const store = new MemorySessionEventStore();
-        const previous = this.#eventPreviewsBySession.get(sessionId);
-        previous?.store.close();
-        this.#eventPreviewsBySession.set(sessionId, { nativeSessionId, store });
+        this.#eventPreviewsBySession.get(key)?.store.close();
+        this.#eventPreviewsBySession.set(key, { nativeSessionId, store });
         try {
-            return await this.#processes.runTransient(signal, async () => await AcpQuerySession.start(agent, cwd, sessionId, store, this.#connector, signal), async (runtime) => await runtime.previewEvents(nativeSessionId, eventLimit, additionalDirectories, signal), async (runtime) => await runtime.closeProcess());
+            return await this.#processes.runTransient(query.signal, () => AcpQuerySession.start(scoped, store, this.#connector), (runtime) => runtime.previewEvents(nativeSessionId, eventLimit, query.signal), (runtime) => runtime.closeProcess());
         }
         catch (error) {
-            if (this.#eventPreviewsBySession.get(sessionId)?.store === store) {
-                this.#eventPreviewsBySession.delete(sessionId);
+            if (this.#eventPreviewsBySession.get(key)?.store === store) {
+                this.#eventPreviewsBySession.delete(key);
             }
             store.close();
             throw error;
         }
     };
     close = async () => {
-        await Promise.all([...this.#processesByAgent.values()].flatMap((readers) => readers.entries().map(async ([cwd, runtime]) => await this.retire(readers, cwd, runtime))));
+        await Promise.all([...this.#processesByAgent.values()].flatMap((readers) => readers.entries().map(async ([key, runtime]) => await this.retire(readers, key, runtime))));
         this.#processesByAgent.clear();
         for (const preview of this.#eventPreviewsBySession.values()) {
             preview.store.close();

package/dist/engine/acp/adapter/query-processes.js.map

@@ -1 +1 @@
-{"version":3,"file":"query-processes.js","sourceRoot":"","sources":["../../../../src/engine/acp/adapter/query-processes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,uBAAuB,EAAyB,MAAM,8CAA8C,CAAC;AAC9G,OAAO,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AAElF,OAAO,EAAE,sBAAsB,EAAE,MAAM,mDAAmD,CAAC;AAI3F,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAGrD,+EAA+E;AAC/E,MAAM,OAAO,mBAAmB;IACnB,uBAAuB,GAAG,IAAI,GAAG,EAGvC,CAAC;IACK,iBAAiB,GAAG,IAAI,GAAG,EAA+D,CAAC;IACpG,MAAM,CAAqB;IAClB,UAAU,CAAmB;IAC7B,MAAM,GAAG,IAAI,uBAAuB,EAAE,CAAC;IACvC,UAAU,CAAsB;IAEzC,YAAY,KAAyB,EAAE,SAA2B,EAAE,SAA8B;QAC9F,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAChC,CAAC;IAEQ,YAAY,GAAG,CAAC,KAAyB,EAAQ,EAAE;QACxD,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACxB,CAAC,CAAC;IAEO,MAAM,GAAG,KAAK,EACnB,OAAgD,EAChD,GAAW,EACX,OAAwB,EACX,EAAE;QACf,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC7B,IAAI,CAAC;YACD,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;QACxE,CAAC;gBAAS,CAAC;YACP,OAAO,CAAC,aAAa,EAAE,CAAC;QAC5B,CAAC;IACL,CAAC,CAAC;IAEF,KAAK,CAAC,OAAO,CACT,KAAyB,EACzB,OAAgD,EAChD,GAAW,EACX,MAAmB;QAEnB,MAAM,CAAC,cAAc,EAAE,CAAC;QACxB,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO,MAAM,sBAAsB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACzD,CAAC;QACD,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,QAAQ,KAAK,SAAS,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,EAAE,CAAC;YACtD,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YAC7B,OAAO,QAAQ,CAAC;QACpB,CAAC;QACD,OAAO,MAAM,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,IAAI,EAAE;YACzC,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBACzB,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;YAC9C,CAAC;YACD,iEAAiE;YACjE,MAAM,QAAQ,GAAG,UAAU,EAAE,CAAC;YAC9B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAC/C,MAAM,EACN,GAAG,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,EACvF;gBACI,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC;gBACjC,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC;gBACvD,UAAU,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC;aAC9D,CACJ,CAAC;YACF,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAC7B,OAAO,OAAO,CAAC;QACnB,CAAC,CAAC,CAAC;IACP,CAAC;IAEQ,IAAI,GAAG,KAAK,EACjB,GAAW,EACX,MAAmB,EACnB,SAAmD,EACzC,EAAE;QACZ,8FAA8F;QAC9F,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAI,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAChD,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO,GAAG,IAAI,sBAAsB,CAAkB;gBAClD,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,KAAK;gBAC5B,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,aAAa;aACzC,CAAC,CAAC;YACH,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC/C,CAAC;QACD,MAAM,OAAO,GAAG,OAAO,CAAC;QACxB,OAAO,MAAM,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,SAAS,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;IAChH,CAAC,CAAC;IAEO,YAAY,GAAG,KAAK,EAAE,GAAW,EAAE,MAAmB,EAAgC,EAAE,CAC7F,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IAEnE,kBAAkB,GAAG,KAAK,EAC/B,GAAW,EACX,MAAqB,EACrB,MAAmB,EACO,EAAE,CAC5B,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,MAAM,OAAO,CAAC,kBAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAE7F,oBAAoB,GAAG,KAAK,EACjC,GAAW,EACX,qBAAwC,EACxC,OAAoC,EACpC,MAAmB,EACM,EAAE;QAC3B,MAAM,CAAC,cAAc,EAAE,CAAC;QACxB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,MAAM,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;QACnE,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YAClB,MAAM,OAAO,GAAG,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAC5D,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,CAAC,eAAe,KAAK,eAAe,EAAE,CAAC;gBACvE,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;YAC1D,CAAC;YACD,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;QAC7D,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,uBAAuB,EAAE,CAAC;QAC5C,MAAM,QAAQ,GAAG,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC7D,QAAQ,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC;QACxB,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,CAAC;QACxE,IAAI,CAAC;YACD,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,YAAY,CACrC,MAAM,EACN,KAAK,IAAI,EAAE,CAAC,MAAM,eAAe,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,EAC9F,KAAK,EAAE,OAAO,EAAE,EAAE,CACd,MAAM,OAAO,CAAC,aAAa,CAAC,eAAe,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,CAAC,EAC3F,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,MAAM,OAAO,CAAC,YAAY,EAAE,CAClD,CAAC;QACN,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,KAAK,KAAK,KAAK,EAAE,CAAC;gBAC/D,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACnD,CAAC;YACD,KAAK,CAAC,KAAK,EAAE,CAAC;YACd,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC,CAAC;IAEO,KAAK,GAAG,KAAK,IAAmB,EAAE;QACvC,MAAM,OAAO,CAAC,GAAG,CACb,CAAC,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CACrD,OAAO,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,CAC5F,CACJ,CAAC;QACF,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAC;QAC/B,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,uBAAuB,CAAC,MAAM,EAAE,EAAE,CAAC;YAC1D,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QAC1B,CAAC;QACD,IAAI,CAAC,uBAAuB,CAAC,KAAK,EAAE,CAAC;QACrC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC,CAAC;CACL"}
+{"version":3,"file":"query-processes.js","sourceRoot":"","sources":["../../../../src/engine/acp/adapter/query-processes.ts"],"names":[],"mappings":"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"}

package/dist/engine/acp/adapter/query-scope.d.ts

@@ -0,0 +1,8 @@
+import type { BrandedType } from "../../util/branded-type.ts";
+import type { NativeSessionQuery } from "../native-history/preview-contract.ts";
+export type NativeSessionQueryKey = BrandedType<string, "NativeSessionQueryKey">;
+export type NativeSessionPreviewKey = BrandedType<string, "NativeSessionPreviewKey">;
+/** Query-process identity is native workspace scope, never a product conversation. */
+export declare function nativeSessionQueryKey(query: NativeSessionQuery): NativeSessionQueryKey;
+export declare function nativeSessionPreviewKey(queryKey: NativeSessionQueryKey, nativeSessionId: string): NativeSessionPreviewKey;
+//# sourceMappingURL=query-scope.d.ts.map

package/dist/engine/acp/adapter/query-scope.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"query-scope.d.ts","sourceRoot":"","sources":["../../../../src/engine/acp/adapter/query-scope.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAKhF,MAAM,MAAM,qBAAqB,GAAG,WAAW,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC;AACjF,MAAM,MAAM,uBAAuB,GAAG,WAAW,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC;AAErF,sFAAsF;AACtF,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,kBAAkB,GAAG,qBAAqB,CAStF;AAED,wBAAgB,uBAAuB,CACnC,QAAQ,EAAE,qBAAqB,EAC/B,eAAe,EAAE,MAAM,GACxB,uBAAuB,CAEzB"}

package/dist/engine/acp/adapter/query-scope.js

@@ -0,0 +1,16 @@
+import { z } from "zod";
+const queryKeySchema = z.string().brand();
+const previewKeySchema = z.string().brand();
+/** Query-process identity is native workspace scope, never a product conversation. */
+export function nativeSessionQueryKey(query) {
+    return queryKeySchema.parse(JSON.stringify([
+        query.agent.id,
+        query.cwd,
+        query.additionalDirectories,
+        Object.entries(query.agent.environment).sort(([left], [right]) => left.localeCompare(right)),
+    ]));
+}
+export function nativeSessionPreviewKey(queryKey, nativeSessionId) {
+    return previewKeySchema.parse(JSON.stringify([queryKey, nativeSessionId]));
+}
+//# sourceMappingURL=query-scope.js.map

package/dist/engine/acp/adapter/query-scope.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"query-scope.js","sourceRoot":"","sources":["../../../../src/engine/acp/adapter/query-scope.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,EAA2B,CAAC;AACnE,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,EAA6B,CAAC;AAKvE,sFAAsF;AACtF,MAAM,UAAU,qBAAqB,CAAC,KAAyB;IAC3D,OAAO,cAAc,CAAC,KAAK,CACvB,IAAI,CAAC,SAAS,CAAC;QACX,KAAK,CAAC,KAAK,CAAC,EAAE;QACd,KAAK,CAAC,GAAG;QACT,KAAK,CAAC,qBAAqB;QAC3B,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;KAC/F,CAAC,CACL,CAAC;AACN,CAAC;AAED,MAAM,UAAU,uBAAuB,CACnC,QAA+B,EAC/B,eAAuB;IAEvB,OAAO,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;AAC/E,CAAC"}

package/dist/engine/acp/adapter/query-session.d.ts

@@ -1,17 +1,16 @@
 import type { SessionCapabilities } from "@moxt-ai/mobius-sdk/protocol";
-import type { AcpAgentDefinition } from "../agent/agent-definition.ts";
-import type { SessionEventPage, SessionEventStore } from "../native-history/preview-contract.ts";
+import type { NativeSessionQuery, SessionEventPage, SessionEventStore } from "../native-history/preview-contract.ts";
 import { type NativeSessionPage } from "../protocol/native-session.ts";
 import type { AcpSessionConnector } from "./session-events.ts";
 /** Adapter-owned ACP reader. It has neither a live observer nor interactive-session state. */
 export declare class AcpQuerySession {
     #private;
     private constructor();
-    static readonly start: (agent: AcpAgentDefinition, cwd: string, sessionId: string, events: SessionEventStore, connector: AcpSessionConnector, signal: AbortSignal) => Promise<AcpQuerySession>;
+    static readonly start: (options: NativeSessionQuery, events: SessionEventStore, connector: AcpSessionConnector) => Promise<AcpQuerySession>;
     readonly capabilities: () => SessionCapabilities;
     readonly hasTerminated: () => boolean;
     readonly listNativeSessions: (cursor: string | null, signal: AbortSignal) => Promise<NativeSessionPage>;
-    readonly previewEvents: (nativeSessionId: string, eventLimit: number, additionalDirectories: readonly string[], signal: AbortSignal) => Promise<SessionEventPage>;
+    readonly previewEvents: (nativeSessionId: string, eventLimit: number, signal: AbortSignal) => Promise<SessionEventPage>;
     readonly closeProcess: () => Promise<void>;
     readonly discardEvents: () => void;
 }

package/dist/engine/acp/adapter/query-session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query-session.d.ts","sourceRoot":"","sources":["../../../../src/engine/acp/adapter/query-session.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAuB,MAAM,8BAA8B,CAAC;AAE7F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AACjG,OAAO,EAAE,KAAK,iBAAiB,EAA2B,MAAM,+BAA+B,CAAC;AAOhG,OAAO,KAAK,EAAE,mBAAmB,EAA4B,MAAM,qBAAqB,CAAC;AAEzF,8FAA8F;AAC9F,qBAAa,eAAe;;IASxB,OAAO,eAyBN;IAED,MAAM,CAAC,QAAQ,CAAC,KAAK,UACV,kBAAkB,OACpB,MAAM,aACA,MAAM,UACT,iBAAiB,aACd,mBAAmB,UACtB,WAAW,KACpB,OAAO,CAAC,eAAe,CAAC,CA2BzB;IAEF,QAAQ,CAAC,YAAY,QAAO,mBAAmB,CAAuB;IACtE,QAAQ,CAAC,aAAa,QAAO,OAAO,CAWlC;IACF,QAAQ,CAAC,kBAAkB,WAAkB,MAAM,GAAG,IAAI,UAAU,WAAW,KAAG,OAAO,CAAC,iBAAiB,CAAC,CAwB1G;IAEF,QAAQ,CAAC,aAAa,oBACD,MAAM,cACX,MAAM,yBACK,SAAS,MAAM,EAAE,UAChC,WAAW,KACpB,OAAO,CAAC,gBAAgB,CAAC,CA2B1B;IAEF,QAAQ,CAAC,YAAY,QAAa,OAAO,CAAC,IAAI,CAAC,CAA0C;IACzF,QAAQ,CAAC,aAAa,QAAO,IAAI,CAAyC;CAC7E"}
+{"version":3,"file":"query-session.d.ts","sourceRoot":"","sources":["../../../../src/engine/acp/adapter/query-session.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAExE,OAAO,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AACrH,OAAO,EAAE,KAAK,iBAAiB,EAA2B,MAAM,+BAA+B,CAAC;AAEhG,OAAO,KAAK,EAAE,mBAAmB,EAA4B,MAAM,qBAAqB,CAAC;AAEzF,8FAA8F;AAC9F,qBAAa,eAAe;;IAOxB,OAAO,eAcN;IAED,MAAM,CAAC,QAAQ,CAAC,KAAK,YACR,kBAAkB,UACnB,iBAAiB,aACd,mBAAmB,KAC/B,OAAO,CAAC,eAAe,CAAC,CAsBzB;IAEF,QAAQ,CAAC,YAAY,QAAO,mBAAmB,CAA6C;IAC5F,QAAQ,CAAC,aAAa,QAAO,OAAO,CAWlC;IACF,QAAQ,CAAC,kBAAkB,WAAkB,MAAM,GAAG,IAAI,UAAU,WAAW,KAAG,OAAO,CAAC,iBAAiB,CAAC,CAwB1G;IAEF,QAAQ,CAAC,aAAa,oBACD,MAAM,cACX,MAAM,UACV,WAAW,KACpB,OAAO,CAAC,gBAAgB,CAAC,CA8B1B;IAEF,QAAQ,CAAC,YAAY,QAAa,OAAO,CAAC,IAAI,CAAC,CAA0C;IACzF,QAAQ,CAAC,aAAa,QAAO,IAAI,CAA0C;CAC9E"}

package/dist/engine/acp/adapter/query-session.js

@@ -1,44 +1,36 @@
 import { methods } from "@agentclientprotocol/sdk";
 import { AcpExecutionError } from "../acp-error.js";
 import { nativeSessionPageSchema } from "../protocol/native-session.js";
-import { unsupportedSessionCapabilities } from "../protocol/session-capabilities.js";
-import { initializeAgentConnection, RetryableAcpInitializationError, validateAgentRuntime, } from "./agent-initialization.js";
+import { RetryableAcpInitializationError, validateAgentRuntime } from "./agent-initialization.js";
 /** Adapter-owned ACP reader. It has neither a live observer nor interactive-session state. */
 export class AcpQuerySession {
-    #cwd;
-    #sessionId;
+    #options;
     #events;
     #connection;
     #lifecycle = { kind: "open" };
-    #capabilities = unsupportedSessionCapabilities();
-    #configOptions = [];
-    constructor(agent, cwd, sessionId, events, connector) {
-        this.#cwd = cwd;
-        this.#sessionId = sessionId;
+    #eventScope = crypto.randomUUID();
+    constructor(options, events, connector) {
+        this.#options = options;
         this.#events = events;
         this.#connection = connector.connectQuerySession({
-            agent,
-            cwd,
-            sessionId: () => sessionId,
-            configOptions: () => this.#configOptions,
+            agent: options.agent,
+            cwd: options.cwd,
+            ...(options.externalizeUpdate === undefined ? {} : { externalizeUpdate: options.externalizeUpdate }),
             onEvent: async (event) => {
-                this.#events.append(sessionId, { type: "acp", payload: event.payload });
-                if (event.kind === "configuration") {
-                    this.#configOptions = event.configOptions;
-                }
+                this.#events.append(this.#eventScope, { type: "acp", payload: event.payload });
             },
         });
         void this.#connection.termination.then(() => {
             this.#lifecycle = { kind: "terminated" };
         });
     }
-    static start = async (agent, cwd, sessionId, events, connector, signal) => {
+    static start = async (options, events, connector) => {
+        const { agent, signal } = options;
         for (let attempt = 1; attempt <= 2; attempt += 1) {
             await validateAgentRuntime(agent, signal);
-            const runtime = new AcpQuerySession(agent, cwd, sessionId, events, connector);
+            const runtime = new AcpQuerySession(options, events, connector);
             try {
-                const initialized = await initializeAgentConnection(runtime.#connection, agent.id, agent.agentVersion, signal);
-                runtime.#capabilities = initialized.capabilities;
+                await runtime.#connection.initializeAgent(options.signal);
                 return runtime;
             }
             catch (error) {
@@ -56,7 +48,7 @@ export class AcpQuerySession {
         }
         throw new AcpExecutionError("ACP agent initialization failed");
     };
-    capabilities = () => this.#capabilities;
+    capabilities = () => this.#connection.snapshot().capabilities;
     hasTerminated = () => {
         switch (this.#lifecycle.kind) {
             case "open":
@@ -70,7 +62,7 @@ export class AcpQuerySession {
         }
     };
     listNativeSessions = async (cursor, signal) => {
-        if (!this.#capabilities.listSessions) {
+        if (!this.capabilities().listSessions) {
             throw new AcpExecutionError("This Agent does not support native session listing", {}, "native_session_unsupported");
         }
         const response = await this.#connection.race(this.#connection.connection.agent.request(methods.agent.session.list, cursor === null ? {} : { cursor }, {
@@ -82,23 +74,26 @@ export class AcpQuerySession {
         }
         return decoded.data;
     };
-    previewEvents = async (nativeSessionId, eventLimit, additionalDirectories, signal) => {
-        if (!this.#capabilities.loadSession) {
+    previewEvents = async (nativeSessionId, eventLimit, signal) => {
+        if (!this.capabilities().loadSession) {
             throw new AcpExecutionError("This Agent restores context but does not provide message history.", {}, "native_history_unsupported");
         }
-        this.#events.reset(this.#sessionId);
+        this.#eventScope = nativeSessionId;
+        this.#events.reset(nativeSessionId);
         this.#connection.events.select(nativeSessionId);
-        await this.#connection.race(this.#connection.connection.agent.request(methods.agent.session.load, {
-            additionalDirectories: [...additionalDirectories],
-            cwd: this.#cwd,
+        this.#connection.beginStateChange();
+        const response = await this.#connection.race(this.#connection.connection.agent.request(methods.agent.session.load, {
+            additionalDirectories: [...this.#options.additionalDirectories],
+            cwd: this.#options.cwd,
             mcpServers: [],
             sessionId: nativeSessionId,
         }, { cancellationSignal: signal }), "ACP agent exited while loading history", signal);
         await this.#connection.events.drained();
         signal.throwIfAborted();
-        return this.#events.page(this.#sessionId, eventLimit, null);
+        this.#connection.commitLifecycle(response);
+        return this.#events.page(nativeSessionId, eventLimit, null);
     };
     closeProcess = async () => await this.#connection.closeProcess();
-    discardEvents = () => this.#events.remove(this.#sessionId);
+    discardEvents = () => this.#events.remove(this.#eventScope);
 }
 //# sourceMappingURL=query-session.js.map

package/dist/engine/acp/adapter/query-session.js.map

@@ -1 +1 @@
-{"version":3,"file":"query-session.js","sourceRoot":"","sources":["../../../../src/engine/acp/adapter/query-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAGpD,OAAO,EAA0B,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAChG,OAAO,EAAE,8BAA8B,EAAE,MAAM,qCAAqC,CAAC;AACrF,OAAO,EACH,yBAAyB,EACzB,+BAA+B,EAC/B,oBAAoB,GACvB,MAAM,2BAA2B,CAAC;AAGnC,8FAA8F;AAC9F,MAAM,OAAO,eAAe;IACf,IAAI,CAAS;IACb,UAAU,CAAS;IACnB,OAAO,CAAoB;IAC3B,WAAW,CAA2B;IAC/C,UAAU,GAAgE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAC3F,aAAa,GAAwB,8BAA8B,EAAE,CAAC;IACtE,cAAc,GAAmC,EAAE,CAAC;IAEpD,YACI,KAAyB,EACzB,GAAW,EACX,SAAiB,EACjB,MAAyB,EACzB,SAA8B;QAE9B,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;QAChB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC,mBAAmB,CAAC;YAC7C,KAAK;YACL,GAAG;YACH,SAAS,EAAE,GAAG,EAAE,CAAC,SAAS;YAC1B,aAAa,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc;YACxC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;gBACrB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;gBACxE,IAAI,KAAK,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;oBACjC,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC,aAAa,CAAC;gBAC9C,CAAC;YACL,CAAC;SACJ,CAAC,CAAC;QACH,KAAK,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE;YACxC,IAAI,CAAC,UAAU,GAAG,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;QAC7C,CAAC,CAAC,CAAC;IACP,CAAC;IAED,MAAM,CAAU,KAAK,GAAG,KAAK,EACzB,KAAyB,EACzB,GAAW,EACX,SAAiB,EACjB,MAAyB,EACzB,SAA8B,EAC9B,MAAmB,EACK,EAAE;QAC1B,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,CAAC,EAAE,OAAO,IAAI,CAAC,EAAE,CAAC;YAC/C,MAAM,oBAAoB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YAC1C,MAAM,OAAO,GAAG,IAAI,eAAe,CAAC,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;YAC9E,IAAI,CAAC;gBACD,MAAM,WAAW,GAAG,MAAM,yBAAyB,CAC/C,OAAO,CAAC,WAAW,EACnB,KAAK,CAAC,EAAE,EACR,KAAK,CAAC,YAAY,EAClB,MAAM,CACT,CAAC;gBACF,OAAO,CAAC,aAAa,GAAG,WAAW,CAAC,YAAY,CAAC;gBACjD,OAAO,OAAO,CAAC;YACnB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC;gBAC7B,MAAM,CAAC,cAAc,EAAE,CAAC;gBACxB,IAAI,KAAK,YAAY,+BAA+B,IAAI,OAAO,KAAK,CAAC,EAAE,CAAC;oBACpE,OAAO,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,EAAE,sDAAsD,CAAC,CAAC;oBACjF,SAAS;gBACb,CAAC;gBACD,IAAI,KAAK,YAAY,iBAAiB,EAAE,CAAC;oBACrC,MAAM,KAAK,CAAC;gBAChB,CAAC;gBACD,MAAM,IAAI,iBAAiB,CAAC,iCAAiC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;YACrF,CAAC;QACL,CAAC;QACD,MAAM,IAAI,iBAAiB,CAAC,iCAAiC,CAAC,CAAC;IACnE,CAAC,CAAC;IAEO,YAAY,GAAG,GAAwB,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC;IAC7D,aAAa,GAAG,GAAY,EAAE;QACnC,QAAQ,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;YAC3B,KAAK,MAAM;gBACP,OAAO,KAAK,CAAC;YACjB,KAAK,YAAY;gBACb,OAAO,IAAI,CAAC;YAChB,SAAS,CAAC;gBACN,MAAM,WAAW,GAAU,IAAI,CAAC,UAAU,CAAC;gBAC3C,OAAO,WAAW,CAAC;YACvB,CAAC;QACL,CAAC;IACL,CAAC,CAAC;IACO,kBAAkB,GAAG,KAAK,EAAE,MAAqB,EAAE,MAAmB,EAA8B,EAAE;QAC3G,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,CAAC;YACnC,MAAM,IAAI,iBAAiB,CACvB,oDAAoD,EACpD,EAAE,EACF,4BAA4B,CAC/B,CAAC;QACN,CAAC;QACD,MAAM,QAAQ,GAAY,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CACjD,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;YACrG,kBAAkB,EAAE,MAAM;SAC7B,CAAC,EACF,yCAAyC,EACzC,MAAM,CACT,CAAC;QACF,MAAM,OAAO,GAAG,uBAAuB,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC5D,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YACnB,MAAM,IAAI,iBAAiB,CACvB,mDAAmD,EACnD,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,EACxB,iCAAiC,CACpC,CAAC;QACN,CAAC;QACD,OAAO,OAAO,CAAC,IAAI,CAAC;IACxB,CAAC,CAAC;IAEO,aAAa,GAAG,KAAK,EAC1B,eAAuB,EACvB,UAAkB,EAClB,qBAAwC,EACxC,MAAmB,EACM,EAAE;QAC3B,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC;YAClC,MAAM,IAAI,iBAAiB,CACvB,mEAAmE,EACnE,EAAE,EACF,4BAA4B,CAC/B,CAAC;QACN,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACpC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QAChD,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CACvB,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CACrC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAC1B;YACI,qBAAqB,EAAE,CAAC,GAAG,qBAAqB,CAAC;YACjD,GAAG,EAAE,IAAI,CAAC,IAAI;YACd,UAAU,EAAE,EAAE;YACd,SAAS,EAAE,eAAe;SAC7B,EACD,EAAE,kBAAkB,EAAE,MAAM,EAAE,CACjC,EACD,wCAAwC,EACxC,MAAM,CACT,CAAC;QACF,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACxC,MAAM,CAAC,cAAc,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;IAChE,CAAC,CAAC;IAEO,YAAY,GAAG,KAAK,IAAmB,EAAE,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC;IAChF,aAAa,GAAG,GAAS,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;CAC7E"}
+{"version":3,"file":"query-session.js","sourceRoot":"","sources":["../../../../src/engine/acp/adapter/query-session.ts"],"names":[],"mappings":"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"}

package/dist/engine/acp/adapter/session-events.d.ts

@@ -3,7 +3,7 @@ import type { AcpAgentDefinition } from "../agent/agent-definition.ts";
 import type { BackgroundActivity } from "../agent/in-process-endpoint.ts";
 import { AgentUpdateStream } from "../connection/agent-update-stream.ts";
 import type { AcpClientHandler } from "../connection/create-client.ts";
-import type { AcpContentExternalizer } from "../content/content-externalizer.ts";
+import type { AcpContentExternalizer, ExternalizeSessionUpdate } from "../content/content-externalizer.ts";
 type SessionInfoChange = {
     readonly kind: "title";
     readonly value: string;
@@ -35,22 +35,26 @@ export type AdapterSessionEvent = {
 interface SessionConnectionScope {
     readonly agent: AcpAgentDefinition;
     readonly cwd: string;
-    readonly sessionId: () => string;
-    readonly configOptions: () => readonly SessionConfigOption[];
+    readonly externalizeUpdate?: ExternalizeSessionUpdate;
     readonly onEvent: (event: AdapterSessionEvent) => Promise<void>;
 }
 export interface AdapterSessionConnectionOptions extends SessionConnectionScope {
     readonly onBackgroundActivity?: (activity: BackgroundActivity) => void;
     readonly interactions: Pick<AcpClientHandler, "onPermission" | "onElicitation" | "onElicitationComplete">;
 }
-export interface LiveSessionConnectionOptions extends AdapterSessionConnectionOptions {
-    readonly additionalDirectories: readonly string[];
-    readonly capabilities: () => SessionCapabilities;
+export interface AdapterSessionSubscriber {
+    readonly onSessionEvent: (nativeSessionId: string, event: AdapterSessionEvent) => Promise<void>;
+    readonly onBackgroundActivity?: (activity: BackgroundActivity) => void;
+    readonly interactions: AdapterSessionConnectionOptions["interactions"];
 }
 /** Internal execution port shared by the live session and adapter-owned history capture. */
 export interface AdapterSessionConnector {
     readonly connectSession: (options: AdapterSessionConnectionOptions) => AdapterSessionConnection;
 }
+export interface AdapterSessionSnapshot {
+    readonly capabilities: SessionCapabilities;
+    readonly configOptions: readonly SessionConfigOption[];
+}
 /** ACP subscription lifetime, ordered delivery and harness normalization belong to the adapter. */
 export declare class AdapterSessionConnection {
     #private;
@@ -59,7 +63,31 @@ export declare class AdapterSessionConnection {
     constructor(options: AdapterSessionConnectionOptions, externalizer: Pick<AcpContentExternalizer, "update">, normalizeEvent: (event: unknown) => unknown, onClosed?: () => void);
     get connection(): import("@agentclientprotocol/sdk").ClientConnection;
     get termination(): Promise<import("../agent/in-process-endpoint.ts").AcpEndpointTermination>;
+    readonly snapshot: () => AdapterSessionSnapshot;
+    readonly beginStateChange: () => void;
+    readonly cancelStateChange: () => void;
+    readonly commitConfiguration: (options: readonly SessionConfigOption[]) => readonly SessionConfigOption[];
+    readonly commitLifecycle: (response: unknown) => AdapterSessionSnapshot;
     readonly initialize: (signal: AbortSignal) => Promise<void>;
+    readonly initializeAgent: (signal: AbortSignal) => Promise<{
+        capabilities: Readonly<{
+            additionalDirectories: boolean;
+            audioPrompt: boolean;
+            closeSession: boolean;
+            deleteSession: boolean;
+            embeddedContextPrompt: boolean;
+            imagePrompt: boolean;
+            listSessions: boolean;
+            loadSession: boolean;
+            promptQueueing: boolean;
+            renameSession: boolean;
+            resumeSession: boolean;
+            steering: boolean;
+            unstableForkSession: boolean;
+        }>;
+        agentName: string;
+        agentVersion: string;
+    }>;
     readonly agentSettingsModelEffort: () => Readonly<{
         effortSettingId: string;
         modelSettingId: string;

package/dist/engine/acp/adapter/session-events.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-events.d.ts","sourceRoot":"","sources":["../../../../src/engine/acp/adapter/session-events.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session-events.d.ts","sourceRoot":"","sources":["../../../../src/engine/acp/adapter/session-events.ts"],"names":[],"mappings":"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"}

package/dist/engine/acp/adapter/session-events.js

@@ -3,7 +3,10 @@ import { decodeAcpSessionUpdate, } from "@moxt-ai/mobius-sdk/protocol";
 import { truncate } from "../../util/value-utils.js";
 import { AcpExecutionError } from "../acp-error.js";
 import { AgentUpdateStream } from "../connection/agent-update-stream.js";
+import { restrictAcpSessionCapabilities } from "../protocol/session-capabilities.js";
 import { sessionConfigProtocolForAgent } from "../protocol/session-config-protocol.js";
+import { initializeAgentConnection } from "./agent-initialization.js";
+import { applyConfigurationChanges, applyConfigurationMode, recordConfigurationMode, recordConfigurationOptions, } from "./configuration-changes.js";
 /** ACP subscription lifetime, ordered delivery and harness normalization belong to the adapter. */
 export class AdapterSessionConnection {
     #connection;
@@ -13,18 +16,25 @@ export class AdapterSessionConnection {
     #updates;
     #lifetime = new AbortController();
     #onClosed;
+    #agent;
+    #state = { kind: "uninitialized" };
+    #initialization = {
+        kind: "not-started",
+    };
     events;
     constructor(options, externalizer, normalizeEvent, onClosed = () => undefined) {
+        this.#agent = options.agent;
         this.#onClosed = onClosed;
         this.#onBackgroundActivity = options.onBackgroundActivity ?? (() => { });
-        const protocol = sessionConfigProtocolForAgent(options.agent.id);
         this.#updates = new AgentUpdateStream(async (notification) => {
             this.#lifetime.signal.throwIfAborted();
             if (notification.sessionId !== this.#updates.sessionId()) {
                 throw new AcpExecutionError("ACP agent referenced an unknown session", {}, "invalid_agent_session");
             }
             const signal = AbortSignal.any([this.#lifetime.signal, AbortSignal.timeout(30_000)]);
-            const externalized = await externalizer.update(options.sessionId(), notification.update, signal);
+            const externalized = options.externalizeUpdate === undefined
+                ? await externalizer.update(notification.sessionId, notification.update, signal)
+                : await options.externalizeUpdate(notification.update, signal);
             signal.throwIfAborted();
             const update = externalized.agent;
             for (const eventUpdate of externalized.events) {
@@ -52,13 +62,15 @@ export class AdapterSessionConnection {
                         };
                         break;
                     case "config_option_update":
+                        this.#applyConfigurationUpdate(update.configOptions);
                         event = {
                             kind: "configuration",
                             payload,
-                            configOptions: protocol.normalizeUpdate(options.configOptions(), update.configOptions),
+                            configOptions: this.snapshot().configOptions,
                         };
                         break;
                     case "current_mode_update":
+                        this.#applyModeUpdate(update.currentModeId);
                         event = { kind: "mode", payload, modeId: update.currentModeId };
                         break;
                     case "session_info_update": {
@@ -135,10 +147,90 @@ export class AdapterSessionConnection {
     get termination() {
         return this.#connection.termination;
     }
+    #ready = () => {
+        const state = this.#state;
+        if (state.kind !== "ready") {
+            throw new AcpExecutionError("The Agent session is not initialized or has closed", {}, "invalid_agent_session");
+        }
+        return state;
+    };
+    snapshot = () => this.#ready().snapshot;
+    beginStateChange = () => {
+        const state = this.#ready();
+        if (state.operation.kind !== "idle") {
+            throw new AcpExecutionError("Another session configuration operation is running", {}, "session_busy");
+        }
+        this.#state = { ...state, operation: { kind: "pending", changes: { kind: "unchanged" } } };
+    };
+    cancelStateChange = () => {
+        if (this.#state.kind === "ready") {
+            this.#state = { ...this.#state, operation: { kind: "idle" } };
+        }
+    };
+    commitConfiguration = (options) => {
+        const state = this.#ready();
+        if (state.operation.kind !== "pending") {
+            throw new AcpExecutionError("No session configuration operation is running", {}, "invalid_agent_session");
+        }
+        const configOptions = applyConfigurationChanges(options, state.operation.changes);
+        this.#state = { ...state, snapshot: { ...state.snapshot, configOptions }, operation: { kind: "idle" } };
+        return configOptions;
+    };
+    commitLifecycle = (response) => {
+        const state = this.#ready();
+        const capabilities = restrictAcpSessionCapabilities(state.snapshot.capabilities, response);
+        this.commitConfiguration(sessionConfigProtocolForAgent(this.#agent.id).normalizeLifecycle(response));
+        this.#state = { ...this.#ready(), snapshot: { capabilities, configOptions: this.snapshot().configOptions } };
+        return this.snapshot();
+    };
+    #applyConfigurationUpdate = (value) => {
+        const state = this.#ready();
+        const protocol = sessionConfigProtocolForAgent(this.#agent.id);
+        const configOptions = protocol.normalizeUpdate(state.snapshot.configOptions, value);
+        const operation = state.operation.kind === "pending"
+            ? {
+                kind: "pending",
+                changes: recordConfigurationOptions(state.operation.changes, protocol.normalizeUpdate([], value)),
+            }
+            : state.operation;
+        this.#state = { ...state, snapshot: { ...state.snapshot, configOptions }, operation };
+    };
+    #applyModeUpdate = (modeId) => {
+        const state = this.#ready();
+        const operation = state.operation.kind === "pending"
+            ? { kind: "pending", changes: recordConfigurationMode(state.operation.changes, modeId) }
+            : state.operation;
+        this.#state = {
+            ...state,
+            snapshot: {
+                ...state.snapshot,
+                configOptions: applyConfigurationMode(state.snapshot.configOptions, modeId),
+            },
+            operation,
+        };
+    };
     initialize = (signal) => this.#connection.initialize(signal);
+    initializeAgent = (signal) => {
+        if (this.#initialization.kind === "not-started") {
+            this.#initialization = {
+                kind: "started",
+                result: initializeAgentConnection(this, this.#agent.id, this.#agent.agentVersion, signal).then((agent) => {
+                    this.#lifetime.signal.throwIfAborted();
+                    this.#state = {
+                        kind: "ready",
+                        snapshot: { capabilities: agent.capabilities, configOptions: [] },
+                        operation: { kind: "idle" },
+                    };
+                    return agent;
+                }),
+            };
+        }
+        return this.#initialization.result;
+    };
     agentSettingsModelEffort = () => this.#connection.agentSettingsModelEffort();
     race = (operation, exitMessage, signal) => this.#connection.race(operation, exitMessage, signal);
     closeProcess = async () => {
+        this.#state = { kind: "closed" };
         this.#lifetime.abort(new DOMException("The adapter event subscription closed", "AbortError"));
         try {
             await this.#connection.closeProcess();