antechamber 0.1.1 → 0.2.1

package/dist/session-tree.js

@@ -1,5 +1,6 @@
 import { RPC_COMMAND_TIMEOUT_MS } from "./pi-rpc.js";
 import { readFileSync } from "node:fs";
+import { contextMessageID, nativePromptInput } from "./prompt-parts.js";
 export class SessionTreeError extends Error {
 }
 export function durableShellTree(tree) {
@@ -59,19 +60,19 @@ export function branchEntries(tree, leafId = tree.leafId) {
     }
     return branch.reverse();
 }
-/** Live ids belong to the UI; restored ids belong to JSONL offsets. Save both. */
-export function bindMessageEntries(s, tree) {
+function selectedLeafId(s, tree) {
     let leafId = tree.leafId;
     if (!s.tree.revert && s.tree.leafId !== undefined && s.tree.leafId !== null) {
         const selected = branchEntries(tree, s.tree.leafId);
         // A stale snapshot cannot discard a selection or its identity candidates.
         if (selected.length === 0)
-            return;
+            return undefined;
         if (tree.leafId === null || selected.some((entry) => entry.id === tree.leafId))
             leafId = s.tree.leafId;
     }
-    const branch = branchEntries(tree, s.tree.revert ? s.tree.revert.previousLeafId : leafId);
-    const positions = new Map(branch.map((entry, index) => [entry.id, index]));
+    return leafId;
+}
+function pruneStaleShellTurns(s, positions) {
     s.tree.localShellTurns = (s.tree.localShellTurns ?? []).filter((turn) => {
         if (turn.afterEntryId === null || positions.has(turn.afterEntryId))
             return true;
@@ -83,13 +84,58 @@ export function bindMessageEntries(s, tree) {
             delete s.tree.shellDispatch[turn.messages[1].info.id];
         return false;
     });
+}
+function bindOrdinaryEntry(s, entry, messages, cursor) {
+    const content = entry.message?.content;
+    // pi allows plain-string message content (extensions, append_user_message).
+    const text = typeof content === "string"
+        ? content
+        : content
+            ?.filter((part) => part.type === "text")
+            .map((part) => part.text ?? "")
+            .join("");
+    const index = messages.findIndex((message, position) => position >= cursor &&
+        !s.localMessageIds?.has(message.info.id) &&
+        s.tree.messageEntries[message.info.id] === undefined &&
+        message.info.role === entry.message?.role &&
+        (message.info.role !== "user" ||
+            (s.tree.promptParts?.[message.info.id]
+                ? nativePromptInput(message.parts
+                    .filter((part) => part.type === "text")
+                    .map((part) => part.text)
+                    .join("\n"), s.tree.promptParts[message.info.id] ?? []).message
+                : message.parts
+                    .filter((part) => part.type === "text")
+                    .map((part) => part.text)
+                    .join("")) === text));
+    const message = messages[index];
+    if (message === undefined)
+        return cursor;
+    s.tree.messageEntries[message.info.id] = entry.id;
+    return index + 1;
+}
+/** Live ids belong to the UI; restored ids belong to JSONL offsets. Save both. */
+export function bindMessageEntries(s, tree) {
+    const leafId = selectedLeafId(s, tree);
+    if (leafId === undefined)
+        return;
+    const branch = branchEntries(tree, s.tree.revert ? s.tree.revert.previousLeafId : leafId);
+    const positions = new Map(branch.map((entry, index) => [entry.id, index]));
+    pruneStaleShellTurns(s, positions);
+    // Admitted context carries its OpenChamber id in the native custom message.
+    for (const entry of branch) {
+        const messageID = contextMessageID(entry);
+        if (messageID !== undefined && s.messages?.some((message) => message.info.id === messageID))
+            s.tree.messageEntries[messageID] = entry.id;
+    }
     const entries = branch.filter((entry) => entry.type === "message" &&
         (entry.message?.role === "user" ||
             entry.message?.role === "assistant" ||
             entry.message?.role === "bashExecution"));
+    const localShellTurns = s.tree.localShellTurns ?? [];
     const visible = s.messages ?? [];
     const visibleIds = new Set(visible.map((message) => message.info.id));
-    const candidates = s.tree.localShellTurns
+    const candidates = localShellTurns
         .flatMap((turn) => turn.messages)
         .filter((message) => !visibleIds.has(message.info.id));
     for (const message of candidates)
@@ -167,32 +213,15 @@ export function bindMessageEntries(s, tree) {
             }
             continue;
         }
-        const text = entry.message?.content
-            ?.filter((part) => part.type === "text")
-            .map((part) => part.text ?? "")
-            .join("");
-        const index = messages.findIndex((message, i) => i >= cursor &&
-            !s.localMessageIds?.has(message.info.id) &&
-            s.tree.messageEntries[message.info.id] === undefined &&
-            message.info.role === entry.message?.role &&
-            (message.info.role !== "user" ||
-                message.parts
-                    .filter((part) => part.type === "text")
-                    .map((part) => part.text)
-                    .join("") === text));
-        const message = messages[index];
-        if (message) {
-            s.tree.messageEntries[message.info.id] = entry.id;
-            cursor = index + 1;
-        }
+        cursor = bindOrdinaryEntry(s, entry, messages, cursor);
     }
     // Syncs/agent events preserve an active revert's navigation pin. Only
     // revert/unrevert select it explicitly; prompt clears the pin before branching.
     if (!s.tree.revert)
         s.tree.leafId = leafId;
-    s.tree.localShellTurns = s.tree.localShellTurns.filter((turn) => s.tree.messageEntries[turn.messages[1].info.id] === undefined);
+    s.tree.localShellTurns = localShellTurns.filter((turn) => s.tree.messageEntries[turn.messages[1].info.id] === undefined);
 }
-export function entryForMessage(s, tree, messageID) {
+function entryForMessage(s, tree, messageID) {
     const entryId = s.tree.messageEntries[messageID];
     const entry = tree.entries.find((candidate) => candidate.id === entryId);
     if (!entry || !s.messages?.some((message) => message.info.id === messageID)) {

package/dist/sessions.d.ts

@@ -10,7 +10,7 @@ import type { TodoBridge, Todo, TodoUpdated } from "./todo-bridge.js";
 import { type SessionTreeState } from "./session-tree.js";
 import { SubagentBridge } from "./subagents.js";
 import { SessionStore, type TitleSource } from "./session-store.js";
-import type { OCAssistantMessage, OCEvent, OCMessageWithParts, OCModelRef, OCPart, OCSession, OCSessionStatus, OCToolPart } from "./types.js";
+import type { OCAssistantMessage, OCEvent, OCMessageWithParts, OCModelRef, OCPart, OCPromptPart, OCSession, OCSessionStatus, OCToolPart } from "./types.js";
 export { ADAPTER_VERSION } from "./version.js";
 interface StreamingState {
     message: OCAssistantMessage;
@@ -18,6 +18,7 @@ interface StreamingState {
     parts: Map<number, OCPart>;
 }
 export interface ManagedSession extends ThinkingState {
+    interruptRequested?: boolean;
     titleSource?: TitleSource;
     activeUserMessageID?: string;
     inputs?: Map<string, {
@@ -42,6 +43,7 @@ export interface ManagedSession extends ThinkingState {
     streaming: StreamingState | undefined;
     /** A manual compaction started while idle; its end returns the session to idle. */
     compactingFromIdle?: boolean;
+    compactionID?: string;
     /** Cancels the adapter-owned user bash waiter and its OmO execution. */
     cancelShell?: (interrupted?: boolean) => void;
     /**
@@ -85,8 +87,14 @@ export declare class SessionManager {
     /** freshness of the all-directories scan (see listAll). */
     private scanAllCache;
     constructor(emit: EventSink, store?: SessionStore, defaultDirectory?: string | undefined, lifecycleOptions?: LifecycleOptions);
-    create(directory: string, title?: string, parentID?: string): Promise<OCSession>;
+    create(directory: string, title?: string, parentID?: string, options?: {
+        id?: string;
+        agent?: string;
+        model?: ModelSelection;
+        metadata?: Record<string, unknown>;
+    }): Promise<OCSession>;
     private createLive;
+    private rollbackCreate;
     private applyNativeTitle;
     private refreshNativeTitles;
     private wirePi;
@@ -111,11 +119,15 @@ export declare class SessionManager {
     update(sessionId: string, patch: {
         title?: string | undefined;
         archived?: number | undefined;
-    }): OCSession | undefined;
+        metadata?: Record<string, unknown> | undefined;
+        agent?: string | undefined;
+    }): Promise<OCSession | undefined>;
     messages(sessionId: string): OCMessageWithParts[] | undefined;
     /** Append to canonical history, before the hidden redo branch while reverted. */
     appendMessage(sessionId: string, message: OCMessageWithParts): void;
     private operation;
+    /** Cancellation releases only the caller; the native action keeps its queue lease. */
+    private waitForOperation;
     private syncTree;
     private treeSession;
     fork(sessionId: string, messageID?: string): Promise<OCSession>;
@@ -126,7 +138,13 @@ export declare class SessionManager {
     private reloadMessagesLive;
     statuses(): Record<string, OCSessionStatus>;
     todos(sessionId: string): Todo[] | undefined;
-    diff(sessionId: string): Promise<import("./session-diff.js").SessionFileDiff[]>;
+    commitRevert(sessionId: string): Promise<void>;
+    private commitRevertLive;
+    diff(sessionId: string, options?: {
+        from?: string | undefined;
+        to?: string | undefined;
+        context?: number | undefined;
+    }): Promise<import("./session-diff.js").SessionFileDiff[]>;
     private emitDiff;
     abort(sessionId: string): Promise<boolean>;
     permissions(sessionId?: string): PendingPermission[];
@@ -149,8 +167,17 @@ export declare class SessionManager {
      * the next cold start, and tell the UI. Returns whether anything changed.
      */
     private applyPiModel;
-    prompt(sessionId: string, text: string, model?: ModelSelection, noReply?: boolean, messageID?: string, delivery?: "steer" | "queue"): Promise<void>;
+    prompt(sessionId: string, text: string, model?: ModelSelection, noReply?: boolean, messageID?: string, delivery?: "steer" | "queue", parts?: readonly OCPromptPart[], metadata?: Record<string, unknown>): Promise<void>;
+    private preparePrompt;
+    private publishPrompt;
     private promptLive;
+    /**
+     * No-reply context (v2 synthetic, v1 noReply) joins the native conversation without a turn:
+     * OmO appends it now when idle, or after the running turn, so the next prompt carries it.
+     */
+    private admitContext;
+    private dispatchPrompt;
+    private bindPromptState;
     disposeAll(): Promise<void>;
     /** Spawn pi against the session's JSONL file and adopt it as live. */
     private revive;