@moxt-ai/mobius 0.0.176 → 0.0.177

package/dist/session-event-log-v2.d.ts

@@ -1,4 +1,4 @@
-import type { ContentBlockV2, QueuedPromptRequestEventLogV2, SessionEventPayloadV2, SessionEventV2, SessionPromptCommand } from "@moxt-ai/mobius-protocol";
+import type { ContentBlockV2, PromptExecutionContextV2, QueuedPromptRequestEventLogV2, SessionEventPayloadV2, SessionEventV2, SessionPromptCommand } from "@moxt-ai/mobius-protocol";
 import type { DaemonSessionEventPublisher } from "./relay-connection/session-event-publisher.ts";
 export interface PromptRequestRecoveryV2 {
     readonly queuedPromptRequests: readonly QueuedPromptRequestEventLogV2[];
@@ -7,18 +7,20 @@ export declare function sessionEventV2(daemonGenerationId: string, sessionId: st
 export declare class DaemonSessionEventLogV2 {
     #private;
     readonly daemonGenerationId: string;
-    constructor(publisher: DaemonSessionEventPublisher, daemonGenerationId?: string);
+    constructor(publisher: DaemonSessionEventPublisher, recordLifecycle: (sessionId: string, event: SessionEventPayloadV2) => Promise<boolean>, daemonGenerationId?: string);
     readonly requested: (command: SessionPromptCommand) => void;
     readonly started: (sessionId: string, commandId: string, attemptId: string, epoch: string) => {
         readonly attemptId: string;
         readonly content: readonly ContentBlockV2[];
         readonly epoch: string;
+        readonly context: PromptExecutionContextV2;
     };
     readonly record: (sessionId: string, event: SessionEventPayloadV2, position: number) => void;
+    readonly publishTerminal: (sessionId: string, commandId: string) => void;
     readonly event: (sessionId: string, position: number, event: SessionEventPayloadV2, recordedAt: string) => SessionEventV2;
-    readonly queueChanged: (_sessionId: string) => void;
-    readonly completed: (sessionId: string, commandId: string, _stopReason: string) => void;
-    readonly failed: (sessionId: string, commandId: string, _code: string, _message: string) => void;
+    readonly queueChanged: (sessionId: string) => Promise<void>;
+    readonly completed: (sessionId: string, commandId: string, stopReason: string) => Promise<void>;
+    readonly failed: (sessionId: string, commandId: string, code: string, message: string) => Promise<void>;
     readonly promptRequestRecovery: (sessionId: string) => PromptRequestRecoveryV2;
 }
 //# sourceMappingURL=session-event-log-v2.d.ts.map

package/dist/session-event-log-v2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-event-log-v2.d.ts","sourceRoot":"","sources":["../src/session-event-log-v2.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACR,cAAc,EACd,6BAA6B,EAC7B,qBAAqB,EACrB,cAAc,EACd,oBAAoB,EACvB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,+CAA+C,CAAC;AAQjG,MAAM,WAAW,uBAAuB;IACpC,QAAQ,CAAC,oBAAoB,EAAE,SAAS,6BAA6B,EAAE,CAAC;CAC3E;AA4BD,wBAAgB,cAAc,CAC1B,kBAAkB,EAAE,MAAM,EAC1B,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,qBAAqB,EAC5B,UAAU,EAAE,MAAM,GACnB,cAAc,CAUhB;AAED,qBAAa,uBAAuB;;IAChC,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;IAIpC,YAAY,SAAS,EAAE,2BAA2B,EAAE,kBAAkB,GAAE,MAAqB,EAG5F;IAED,QAAQ,CAAC,SAAS,YAAa,oBAAoB,KAAG,IAAI,CAMxD;IAEF,QAAQ,CAAC,OAAO,cACD,MAAM,aACN,MAAM,aACN,MAAM,SACV,MAAM,KACd;QAAE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,cAAc,EAAE,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAOpG;IAEF,QAAQ,CAAC,MAAM,cAAe,MAAM,SAAS,qBAAqB,YAAY,MAAM,KAAG,IAAI,CAEzF;IAEF,QAAQ,CAAC,KAAK,cACC,MAAM,YACP,MAAM,SACT,qBAAqB,cAChB,MAAM,KACnB,cAAc,CAAoF;IAErG,QAAQ,CAAC,YAAY,eAAgB,MAAM,KAAG,IAAI,CAAc;IAEhE,QAAQ,CAAC,SAAS,cAAe,MAAM,aAAa,MAAM,eAAe,MAAM,KAAG,IAAI,CAKpF;IAEF,QAAQ,CAAC,MAAM,cAAe,MAAM,aAAa,MAAM,SAAS,MAAM,YAAY,MAAM,KAAG,IAAI,CAK7F;IAEF,QAAQ,CAAC,qBAAqB,cAAe,MAAM,KAAG,uBAAuB,CAI1E;CACN"}
+{"version":3,"file":"session-event-log-v2.d.ts","sourceRoot":"","sources":["../src/session-event-log-v2.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACR,cAAc,EACd,wBAAwB,EACxB,6BAA6B,EAC7B,qBAAqB,EACrB,cAAc,EACd,oBAAoB,EACvB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,+CAA+C,CAAC;AAcjG,MAAM,WAAW,uBAAuB;IACpC,QAAQ,CAAC,oBAAoB,EAAE,SAAS,6BAA6B,EAAE,CAAC;CAC3E;AA4BD,wBAAgB,cAAc,CAC1B,kBAAkB,EAAE,MAAM,EAC1B,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,qBAAqB,EAC5B,UAAU,EAAE,MAAM,GACnB,cAAc,CAUhB;AAED,qBAAa,uBAAuB;;IAChC,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;IAOpC,YACI,SAAS,EAAE,2BAA2B,EACtC,eAAe,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,KAAK,OAAO,CAAC,OAAO,CAAC,EACtF,kBAAkB,GAAE,MAAqB,EAK5C;IAED,QAAQ,CAAC,SAAS,YAAa,oBAAoB,KAAG,IAAI,CAYxD;IAEF,QAAQ,CAAC,OAAO,cACD,MAAM,aACN,MAAM,aACN,MAAM,SACV,MAAM,KACd;QACC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;QAC3B,QAAQ,CAAC,OAAO,EAAE,SAAS,cAAc,EAAE,CAAC;QAC5C,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QACvB,QAAQ,CAAC,OAAO,EAAE,wBAAwB,CAAC;KAC9C,CAOC;IAEF,QAAQ,CAAC,MAAM,cAAe,MAAM,SAAS,qBAAqB,YAAY,MAAM,KAAG,IAAI,CAqBzF;IAEF,QAAQ,CAAC,eAAe,cAAe,MAAM,aAAa,MAAM,KAAG,IAAI,CAyBrE;IAEF,QAAQ,CAAC,KAAK,cACC,MAAM,YACP,MAAM,SACT,qBAAqB,cAChB,MAAM,KACnB,cAAc,CAAoF;IAErG,QAAQ,CAAC,YAAY,cAAqB,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC,CAK9D;IAEF,QAAQ,CAAC,SAAS,cAAqB,MAAM,aAAa,MAAM,cAAc,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC,CAiBlG;IAEF,QAAQ,CAAC,MAAM,cAAqB,MAAM,aAAa,MAAM,QAAQ,MAAM,WAAW,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC,CAY1G;IAEF,QAAQ,CAAC,qBAAqB,cAAe,MAAM,KAAG,uBAAuB,CAI1E;CACN"}

package/dist/session-event-log-v2.js

@@ -36,8 +36,12 @@ export function sessionEventV2(daemonGenerationId, sessionId, position, event, r
 export class DaemonSessionEventLogV2 {
     daemonGenerationId;
     #publisher;
+    #terminal = new Map();
+    #publications = new Map();
     #queued = new Map();
-    constructor(publisher, daemonGenerationId = randomUUID()) {
+    #recordLifecycle;
+    constructor(publisher, recordLifecycle, daemonGenerationId = randomUUID()) {
+        this.#recordLifecycle = recordLifecycle;
         this.#publisher = publisher;
         this.daemonGenerationId = daemonGenerationId;
     }
@@ -45,37 +49,104 @@ export class DaemonSessionEventLogV2 {
         this.#queued.set(command.commandId, {
             commandId: command.commandId,
             content: promptContent(command),
+            context: {
+                agentId: command.agentId,
+                directoryId: command.directoryId,
+                additionalDirectoryIds: command.additionalDirectoryIds,
+            },
+            phase: "queued",
             sessionId: command.sessionId,
         });
     };
     started = (sessionId, commandId, attemptId, epoch) => {
         const request = this.#queued.get(commandId);
         if (request?.sessionId === sessionId) {
-            this.#queued.delete(commandId);
-            return { attemptId, content: request.content, epoch };
+            this.#queued.set(commandId, { ...request, phase: "running" });
+            return { attemptId, content: request.content, epoch, context: request.context };
         }
         throw new Error("The executing prompt was not registered in the V2 queue");
     };
     record = (sessionId, event, position) => {
-        this.#publisher.publishV2(this.event(sessionId, position, event, new Date().toISOString()));
+        const recorded = this.event(sessionId, position, event, new Date().toISOString());
+        if (event.type === "lifecycle-metadata" &&
+            (event.payload.kind === "prompt.completed" ||
+                event.payload.kind === "prompt.failed" ||
+                event.payload.kind === "prompt.failed-before-start")) {
+            // Publish termination after prompt admission and execution state are settled.
+            this.#terminal.set(event.payload.commandId, recorded);
+            const pending = this.#publications.get(sessionId) ?? [];
+            pending.push(recorded);
+            this.#publications.set(sessionId, pending);
+            return;
+        }
+        const pending = this.#publications.get(sessionId);
+        if (pending !== undefined) {
+            pending.push(recorded);
+        }
+        else {
+            this.#publisher.publishV2(recorded);
+        }
+    };
+    publishTerminal = (sessionId, commandId) => {
+        const event = this.#terminal.get(commandId);
+        if (event?.sessionId === sessionId) {
+            this.#terminal.delete(commandId);
+            const pending = this.#publications.get(sessionId) ?? [];
+            while (pending.length > 0) {
+                const next = pending[0];
+                if (next === undefined) {
+                    break;
+                }
+                if (next.type === "lifecycle-metadata" &&
+                    "commandId" in next.payload &&
+                    this.#terminal.has(next.payload.commandId)) {
+                    break;
+                }
+                pending.shift();
+                this.#publisher.publishV2(next);
+            }
+            if (pending.length === 0) {
+                this.#publications.delete(sessionId);
+            }
+        }
+        this.#queued.delete(commandId);
     };
     event = (sessionId, position, event, recordedAt) => sessionEventV2(this.daemonGenerationId, sessionId, position, event, recordedAt);
-    queueChanged = (_sessionId) => undefined;
-    completed = (sessionId, commandId, _stopReason) => {
+    queueChanged = async (sessionId) => {
+        await this.#recordLifecycle(sessionId, {
+            type: "lifecycle-metadata",
+            payload: { kind: "session.queue.changed" },
+        });
+    };
+    completed = async (sessionId, commandId, stopReason) => {
         const request = this.#queued.get(commandId);
-        if (request?.sessionId === sessionId) {
-            this.#queued.delete(commandId);
+        if (request?.sessionId !== sessionId || this.#terminal.has(commandId)) {
+            return;
+        }
+        const recorded = await this.#recordLifecycle(sessionId, {
+            type: "lifecycle-metadata",
+            payload: { kind: "prompt.completed", commandId, stopReason },
+        });
+        if (!recorded) {
+            this.#publisher.publishOperationFailure(sessionId, commandId, "cancelled", "The prompt was cancelled before execution");
         }
     };
-    failed = (sessionId, commandId, _code, _message) => {
+    failed = async (sessionId, commandId, code, message) => {
         const request = this.#queued.get(commandId);
-        if (request?.sessionId === sessionId) {
-            this.#queued.delete(commandId);
+        if (request?.sessionId !== sessionId || this.#terminal.has(commandId)) {
+            return;
+        }
+        const recorded = await this.#recordLifecycle(sessionId, {
+            type: "lifecycle-metadata",
+            payload: { kind: "prompt.failed-before-start", commandId, code, message },
+        });
+        if (!recorded) {
+            this.#publisher.publishOperationFailure(sessionId, commandId, code, message);
         }
     };
     promptRequestRecovery = (sessionId) => ({
         queuedPromptRequests: [...this.#queued.values()]
-            .filter((request) => request.sessionId === sessionId)
+            .filter((request) => request.sessionId === sessionId && request.phase === "queued")
             .map(({ commandId, content }) => ({ commandId, content })),
     });
 }

package/dist/session-event-log-v2.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@moxt-ai/mobius",
-    "version": "0.0.176",
+    "version": "0.0.177",
     "description": "Mobius CLI for pairing and running local AI agent services.",
     "type": "module",
     "bin": {

package/dist/relay-connection/coalescing-agent-event-publisher.d.ts

@@ -1,32 +0,0 @@
-import type { AcpActivity, AcpActivityNarration } from "../acp/activity.ts";
-import type { DaemonTimer } from "./timer.ts";
-export declare const AGENT_EVENT_COALESCING_MILLISECONDS = 100;
-export declare const AGENT_EVENT_TEXT_MAXIMUM_LENGTH = 100000;
-export type BufferedAgentEvent = {
-    readonly kind: "activity";
-    readonly activity: AcpActivity;
-} | {
-    readonly kind: "narration";
-    readonly increment: AcpActivityNarration;
-} | {
-    readonly kind: "text";
-    readonly messageId: string;
-    readonly text: string;
-};
-/**
- * Coalesces the Agent callback stream without splitting it into independently
- * timed channels. Entries stay in callback order, and only compatible adjacent
- * entries are combined. Activity updates therefore cannot let later text pass
- * an earlier tool boundary, while repeated updates still avoid saturating the
- * Relay connection.
- */
-export declare class CoalescingAgentEventPublisher {
-    #private;
-    constructor(timer: DaemonTimer, publish: (event: BufferedAgentEvent) => void);
-    readonly flush: () => void;
-    readonly recordActivity: (activity: AcpActivity) => Promise<void>;
-    readonly recordNarration: (increment: AcpActivityNarration) => Promise<void>;
-    readonly recordText: (text: string, messageId: string) => Promise<void>;
-    private schedule;
-}
-//# sourceMappingURL=coalescing-agent-event-publisher.d.ts.map

package/dist/relay-connection/coalescing-agent-event-publisher.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"coalescing-agent-event-publisher.d.ts","sourceRoot":"","sources":["../../src/relay-connection/coalescing-agent-event-publisher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC5E,OAAO,KAAK,EAAuB,WAAW,EAAE,MAAM,YAAY,CAAC;AAEnE,eAAO,MAAM,mCAAmC,MAAM,CAAC;AACvD,eAAO,MAAM,+BAA+B,SAAU,CAAC;AAEvD,MAAM,MAAM,kBAAkB,GACxB;IAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAA;CAAE,GAC7D;IAAE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,oBAAoB,CAAA;CAAE,GACxE;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnF;;;;;;GAMG;AACH,qBAAa,6BAA6B;;IAOtC,YAAY,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,EAG3E;IAED,QAAQ,CAAC,KAAK,QAAO,IAAI,CAQvB;IAEF,QAAQ,CAAC,cAAc,aAAc,WAAW,KAAG,OAAO,CAAC,IAAI,CAAC,CAe9D;IAEF,QAAQ,CAAC,eAAe,cAAe,oBAAoB,KAAG,OAAO,CAAC,IAAI,CAAC,CAmCzE;IAEF,QAAQ,CAAC,UAAU,SAAU,MAAM,aAAa,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC,CA8BpE;IAEF,OAAO,CAAC,QAAQ;CAGnB"}

package/dist/relay-connection/coalescing-agent-event-publisher.js

@@ -1,116 +0,0 @@
-export const AGENT_EVENT_COALESCING_MILLISECONDS = 100;
-export const AGENT_EVENT_TEXT_MAXIMUM_LENGTH = 100_000;
-/**
- * Coalesces the Agent callback stream without splitting it into independently
- * timed channels. Entries stay in callback order, and only compatible adjacent
- * entries are combined. Activity updates therefore cannot let later text pass
- * an earlier tool boundary, while repeated updates still avoid saturating the
- * Relay connection.
- */
-export class CoalescingAgentEventPublisher {
-    #entries = [];
-    #publish;
-    #publishedActivityIds = new Set();
-    #scheduled = null;
-    #timer;
-    constructor(timer, publish) {
-        this.#publish = publish;
-        this.#timer = timer;
-    }
-    flush = () => {
-        this.#scheduled?.cancel();
-        this.#scheduled = null;
-        const entries = this.#entries;
-        this.#entries = [];
-        for (const entry of entries) {
-            this.#publish(entry);
-        }
-    };
-    recordActivity = (activity) => {
-        const latest = this.#entries.at(-1);
-        this.#entries =
-            latest?.kind === "activity" && latest.activity.activityId === activity.activityId
-                ? [...this.#entries.slice(0, -1), { activity, kind: "activity" }]
-                : [...this.#entries, { activity, kind: "activity" }];
-        const first = !this.#publishedActivityIds.has(activity.activityId);
-        this.#publishedActivityIds.add(activity.activityId);
-        if (first || (activity.status !== "pending" && activity.status !== "running")) {
-            this.flush();
-        }
-        else {
-            this.schedule();
-        }
-        return Promise.resolve();
-    };
-    recordNarration = (increment) => {
-        if (increment.text.length === 0) {
-            return Promise.resolve();
-        }
-        let remaining = increment.text;
-        while (remaining.length > 0) {
-            const latest = this.#entries.at(-1);
-            if (latest?.kind === "narration" && latest.increment.activityId === increment.activityId) {
-                const available = AGENT_EVENT_TEXT_MAXIMUM_LENGTH - latest.increment.text.length;
-                if (available > 0) {
-                    this.#entries = [
-                        ...this.#entries.slice(0, -1),
-                        {
-                            increment: {
-                                ...increment,
-                                text: `${latest.increment.text}${remaining.slice(0, available)}`,
-                            },
-                            kind: "narration",
-                        },
-                    ];
-                    remaining = remaining.slice(available);
-                    continue;
-                }
-            }
-            this.#entries = [
-                ...this.#entries,
-                {
-                    increment: { ...increment, text: remaining.slice(0, AGENT_EVENT_TEXT_MAXIMUM_LENGTH) },
-                    kind: "narration",
-                },
-            ];
-            remaining = remaining.slice(AGENT_EVENT_TEXT_MAXIMUM_LENGTH);
-        }
-        this.schedule();
-        return Promise.resolve();
-    };
-    recordText = (text, messageId) => {
-        if (text.length === 0) {
-            return Promise.resolve();
-        }
-        let remaining = text;
-        while (remaining.length > 0) {
-            const latest = this.#entries.at(-1);
-            if (latest?.kind === "text" && latest.messageId === messageId) {
-                const available = AGENT_EVENT_TEXT_MAXIMUM_LENGTH - latest.text.length;
-                if (available > 0) {
-                    this.#entries = [
-                        ...this.#entries.slice(0, -1),
-                        { ...latest, text: `${latest.text}${remaining.slice(0, available)}` },
-                    ];
-                    remaining = remaining.slice(available);
-                    continue;
-                }
-            }
-            this.#entries = [
-                ...this.#entries,
-                {
-                    kind: "text",
-                    messageId,
-                    text: remaining.slice(0, AGENT_EVENT_TEXT_MAXIMUM_LENGTH),
-                },
-            ];
-            remaining = remaining.slice(AGENT_EVENT_TEXT_MAXIMUM_LENGTH);
-        }
-        this.schedule();
-        return Promise.resolve();
-    };
-    schedule() {
-        this.#scheduled ??= this.#timer.schedule(this.flush, AGENT_EVENT_COALESCING_MILLISECONDS);
-    }
-}
-//# sourceMappingURL=coalescing-agent-event-publisher.js.map

package/dist/relay-connection/coalescing-agent-event-publisher.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"coalescing-agent-event-publisher.js","sourceRoot":"","sources":["../../src/relay-connection/coalescing-agent-event-publisher.ts"],"names":[],"mappings":"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"}