@nuvin/session 0.2.0-rc.7 → 0.2.0-rc.9

package/dist/controller/index.js

@@ -6,8 +6,9 @@ import {
   createMessageStateFromMessages,
   createSessionViewState,
   isToolAutoApprovedForMode,
-  reduceSessionEvent
-} from "../chunk-I5U3WU6B.js";
+  reduceSessionEvent,
+  scopedToolKey
+} from "../chunk-KQHHBUVY.js";
 
 // src/controller/agent-channel.ts
 import { EventEmitter } from "events";
@@ -32,11 +33,11 @@ var AgentChannel = class {
     }
     return this.decider(request);
   }
-  requestUserQuestion(request) {
+  requestUserQuestion(request, scope) {
     if (!this.questionHandler) {
       return Promise.reject(new Error("UI is not ready to handle user questions."));
     }
-    return Promise.resolve(this.questionHandler(request));
+    return Promise.resolve(this.questionHandler(request, scope));
   }
   // ---------- UI-side (subscribers) ----------
   onEvent(listener) {
@@ -86,6 +87,10 @@ function createSessionController(deps) {
   let seq = 0;
   let approvalMode = deps.approvalMode ?? "readOnly";
   let abortController = null;
+  let activeTurnPromise = null;
+  let closePromise = null;
+  let closing = false;
+  let detached = false;
   let activeTurnId;
   let activePolicyDenial;
   let hostBusyCount = 0;
@@ -246,7 +251,7 @@ function createSessionController(deps) {
     const descriptor = {
       agentId,
       permissionClass,
-      summary: findToolSummary(toolCall.id),
+      summary: findToolSummary(toolCall.id, parentToolCallId),
       toolCallId: toolCall.id,
       toolName: toolCall.name,
       ...dirAccess !== void 0 ? { dirAccess } : {},
@@ -257,8 +262,13 @@ function createSessionController(deps) {
       ...request.workflowBashPolicy !== void 0 ? { workflowBashPolicy: request.workflowBashPolicy } : {}
     };
     return new Promise((resolve) => {
-      approvalResolvers.set(toolCall.id, resolve);
-      privateApprovals.set(toolCall.id, {
+      const toolKey = scopedToolKey(parentToolCallId, toolCall.id);
+      approvalResolvers.set(toolKey, {
+        resolve,
+        toolCallId: toolCall.id,
+        ...parentToolCallId !== void 0 ? { parentToolCallId } : {}
+      });
+      privateApprovals.set(toolKey, {
         approvalKey,
         bashPolicy: hasBashPolicy,
         ...!dirAccess && toolCall.name === "Bash" && bashPolicy?.persistence.eligible && request.persistBashPermission !== void 0 ? { persistBashPermission: request.persistBashPermission } : {}
@@ -266,7 +276,7 @@ function createSessionController(deps) {
       emit({ type: "approval-requested", approval: descriptor });
     });
   });
-  deps.channel.setQuestionHandler((request) => {
+  deps.channel.setQuestionHandler((request, scope) => {
     if (deps.headless) {
       activePolicyDenial = "Questions are unavailable in headless mode.";
       return Promise.reject(new Error(activePolicyDenial));
@@ -275,31 +285,47 @@ function createSessionController(deps) {
     const questionId = `question-${questionCounter}`;
     return new Promise((resolve, reject) => {
       questionResolvers.set(questionId, { resolve, reject });
-      emit({ type: "question-asked", question: { questionId, request } });
+      const nickname = nicknameFor(scope?.parentToolCallId);
+      emit({
+        type: "question-asked",
+        question: {
+          questionId,
+          request,
+          ...scope?.agentId !== void 0 ? { agentId: scope.agentId } : {},
+          ...scope?.parentToolCallId !== void 0 ? { parentToolCallId: scope.parentToolCallId } : {},
+          ...nickname !== void 0 ? { nickname } : {}
+        }
+      });
     });
   });
-  function findToolSummary(toolCallId) {
-    const messageId = state.messages.toolMessageIds[toolCallId];
+  function findToolSummary(toolCallId, parentToolCallId) {
+    const messageId = state.messages.toolMessageIds[scopedToolKey(parentToolCallId, toolCallId)];
     const message = state.messages.messages.find((entry) => entry.id === messageId);
     return message?.role === "tool" ? message.summary : "";
   }
   function nicknameFor(parentToolCallId) {
     if (!parentToolCallId) return void 0;
-    const parentMessageId = state.messages.toolMessageIds[parentToolCallId];
+    const parentMessageId = state.messages.toolMessageIds[scopedToolKey(void 0, parentToolCallId)];
     const parentMessage = state.messages.messages.find((entry) => entry.id === parentMessageId);
     if (parentMessage?.role !== "tool") return void 0;
     const nickname = parentMessage.input?.nickname;
     return typeof nickname === "string" ? nickname : void 0;
   }
-  function findDescriptor(toolCallId) {
+  function findDescriptor(toolCallId, parentToolCallId) {
     return [state.approval.active, ...state.approval.pending].find(
-      (entry) => entry?.toolCallId === toolCallId
+      (entry) => entry?.toolCallId === toolCallId && entry.parentToolCallId === parentToolCallId
     );
   }
   function rejectAllPending(reason) {
-    for (const [toolCallId, resolve] of approvalResolvers) {
-      resolve({ action: "reject", reason });
-      emit({ type: "approval-settled", toolCallId, status: "rejected", by: "abort" });
+    for (const pending of approvalResolvers.values()) {
+      pending.resolve({ action: "reject", reason });
+      emit({
+        type: "approval-settled",
+        toolCallId: pending.toolCallId,
+        ...pending.parentToolCallId === void 0 ? {} : { parentToolCallId: pending.parentToolCallId },
+        status: "rejected",
+        by: "abort"
+      });
     }
     approvalResolvers.clear();
     privateApprovals.clear();
@@ -323,7 +349,7 @@ function createSessionController(deps) {
     }
   }
   function startNextQueuedSubmission() {
-    if (abortController || hostBusyCount > 0) return;
+    if (closing || abortController || hostBusyCount > 0) return;
     const next = queue.shift();
     if (!next) return;
     if (!next.opts.silent) {
@@ -336,9 +362,11 @@ function createSessionController(deps) {
         next.opts.turnId
       );
     }
-    void runTurn(next.input, {
+    void startTrackedTurn(next.input, {
       turnId: next.opts.turnId,
-      allowSteering: next.opts.turnId === void 0
+      allowSteering: next.opts.turnId === void 0,
+      submission: next.opts.submission ?? { origin: "user" },
+      ...next.opts.signal === void 0 ? {} : { signal: next.opts.signal }
     });
   }
   function finalizeTurn(controller, reason) {
@@ -350,6 +378,11 @@ function createSessionController(deps) {
   }
   async function runTurn(input, opts) {
     const controller = new AbortController();
+    const abortFromCaller = () => controller.abort(opts.signal?.reason);
+    if (opts.signal !== void 0) {
+      if (opts.signal.aborted) abortFromCaller();
+      else opts.signal.addEventListener("abort", abortFromCaller, { once: true });
+    }
     const drainSteering = async () => {
       if (abortController !== controller || controller.signal.aborted) return [];
       const barrierIndex = queue.findIndex((entry) => entry.delivery === "next-turn");
@@ -407,7 +440,12 @@ function createSessionController(deps) {
         }
         finalInput = guarded.prompt;
       }
-      const compactionSend = (text) => runTurn(text, { systemInitiated: true, allowSteering: opts.allowSteering });
+      const compactionSend = (text) => runTurn(text, {
+        systemInitiated: true,
+        allowSteering: opts.allowSteering,
+        submission: opts.submission,
+        ...opts.signal === void 0 ? {} : { signal: opts.signal }
+      });
       const compactionIo = {
         signal: controller.signal,
         send: compactionSend,
@@ -431,6 +469,7 @@ function createSessionController(deps) {
         const result = await deps.agent.send(finalInput, {
           streaming: true,
           signal: controller.signal,
+          submission: opts.submission,
           ...opts.allowSteering ? { drainSteering } : {}
         });
         if (typeof result === "object" && result !== null && "status" in result && result.status === "aborted") {
@@ -462,6 +501,7 @@ function createSessionController(deps) {
         }
       }
     } finally {
+      opts.signal?.removeEventListener("abort", abortFromCaller);
       const ownedTurn = finalizeTurn(
         controller,
         "Turn ended before pending interactions could be resolved."
@@ -486,10 +526,28 @@ function createSessionController(deps) {
       if (ownedTurn) startNextQueuedSubmission();
     }
   }
+  function startTrackedTurn(input, opts) {
+    let tracked;
+    tracked = runTurn(input, opts).finally(() => {
+      if (activeTurnPromise === tracked) activeTurnPromise = null;
+    });
+    activeTurnPromise = tracked;
+    return tracked;
+  }
+  function detachController() {
+    if (detached) return;
+    detached = true;
+    unsubscribeEvents();
+    unsubscribeLoaded();
+    deps.channel.setToolDecider(null);
+    deps.channel.setQuestionHandler(null);
+    listeners.clear();
+  }
   return {
     abort() {
       queue.length = 0;
       abortController?.abort(new Error("User aborted the current turn."));
+      rejectAllPending("User aborted the current turn.");
     },
     attachHostHooks(hooks) {
       if (hooks.compaction) compaction = hooks.compaction;
@@ -510,14 +568,21 @@ function createSessionController(deps) {
       emit({ type: "info", message });
     },
     close() {
+      if (closePromise) return closePromise;
+      closing = true;
+      const shouldEmitTurnStatus = queue.length > 0 || abortController !== null || hostBusyCount > 0;
       queue.length = 0;
       abortController?.abort(new Error("Session closed."));
       rejectAllPending("Session closed.");
-      unsubscribeEvents();
-      unsubscribeLoaded();
-      deps.channel.setToolDecider(null);
-      deps.channel.setQuestionHandler(null);
-      listeners.clear();
+      if (shouldEmitTurnStatus) emitTurnStatus();
+      const active = activeTurnPromise;
+      if (!active) {
+        detachController();
+        closePromise = Promise.resolve();
+        return closePromise;
+      }
+      closePromise = active.then(detachController, detachController);
+      return closePromise;
     },
     dequeue(queuedId) {
       const index = queue.findIndex((q) => q.id === queuedId);
@@ -526,17 +591,18 @@ function createSessionController(deps) {
       emitTurnStatus();
       return true;
     },
-    decideApproval(toolCallId, decision, comment, grantDir) {
-      if (persistenceInFlight.has(toolCallId)) {
+    decideApproval(toolCallId, decision, comment, grantDir, parentToolCallId) {
+      const toolKey = scopedToolKey(parentToolCallId, toolCallId);
+      if (persistenceInFlight.has(toolKey)) {
         return false;
       }
-      const resolve = approvalResolvers.get(toolCallId);
-      if (!resolve) return false;
-      approvalResolvers.delete(toolCallId);
-      persistenceInFlight.delete(toolCallId);
-      const descriptor = findDescriptor(toolCallId);
-      const privateApproval = privateApprovals.get(toolCallId);
-      privateApprovals.delete(toolCallId);
+      const pending = approvalResolvers.get(toolKey);
+      if (!pending) return false;
+      approvalResolvers.delete(toolKey);
+      persistenceInFlight.delete(toolKey);
+      const descriptor = findDescriptor(toolCallId, parentToolCallId);
+      const privateApproval = privateApprovals.get(toolKey);
+      privateApprovals.delete(toolKey);
       if (decision === "a" && descriptor && !descriptor.dirAccess) {
         alwaysApproved.add(
           privateApproval?.approvalKey ?? `${descriptor.agentId}:${descriptor.toolName}`
@@ -545,9 +611,12 @@ function createSessionController(deps) {
       const rejected = decision === "n";
       if (rejected) {
         const baseReason = `User rejected tool execution (${descriptor?.toolName ?? "unknown tool"})`;
-        resolve({ action: "reject", reason: comment ? `${baseReason}: ${comment}` : baseReason });
+        pending.resolve({
+          action: "reject",
+          reason: comment ? `${baseReason}: ${comment}` : baseReason
+        });
       } else if (descriptor?.dirAccess) {
-        resolve({
+        pending.resolve({
           action: "run",
           grantDir: {
             dir: resolveGrantDir(
@@ -563,30 +632,32 @@ function createSessionController(deps) {
           } : {}
         });
       } else if (descriptor?.toolName === "Bash" && privateApproval?.bashPolicy) {
-        resolve({
+        pending.resolve({
           action: "run",
           approvalDecision: decision,
           approvalSource: "user"
         });
       } else {
-        resolve({ action: "run" });
+        pending.resolve({ action: "run" });
       }
       emit({
         type: "approval-settled",
         toolCallId,
+        ...parentToolCallId !== void 0 ? { parentToolCallId } : {},
         status: rejected ? "rejected" : "approved",
         by: "client"
       });
       return true;
     },
-    async persistBashPermission(toolCallId, request) {
+    async persistBashPermission(toolCallId, request, parentToolCallId) {
+      const toolKey = scopedToolKey(parentToolCallId, toolCallId);
       const descriptor = state.approval.active;
-      const privateApproval = privateApprovals.get(toolCallId);
+      const privateApproval = privateApprovals.get(toolKey);
       const handler = privateApproval?.persistBashPermission;
-      if (descriptor?.toolCallId !== toolCallId || descriptor.toolName !== "Bash" || descriptor.dirAccess !== void 0 || descriptor.bashPolicy?.persistence.eligible !== true || handler === void 0 || !approvalResolvers.has(toolCallId)) {
+      if (descriptor?.toolCallId !== toolCallId || descriptor.parentToolCallId !== parentToolCallId || descriptor.toolName !== "Bash" || descriptor.dirAccess !== void 0 || descriptor.bashPolicy?.persistence.eligible !== true || handler === void 0 || !approvalResolvers.has(toolKey)) {
         return void 0;
       }
-      if (persistenceInFlight.has(toolCallId)) {
+      if (persistenceInFlight.has(toolKey)) {
         return {
           status: "validation-error",
           message: "A persistent Bash permission save is already in progress.",
@@ -600,7 +671,7 @@ function createSessionController(deps) {
           fieldErrors: { server: "Wait for the current operation to finish." }
         };
       }
-      persistenceInFlight.add(toolCallId);
+      persistenceInFlight.add(toolKey);
       hostBusyCount += 1;
       emitTurnStatus();
       try {
@@ -608,13 +679,13 @@ function createSessionController(deps) {
         if (outcome.status === "validation-error") {
           return outcome;
         }
-        const resolve = approvalResolvers.get(toolCallId);
-        if (resolve === void 0 || state.approval.active?.toolCallId !== toolCallId || privateApprovals.get(toolCallId) !== privateApproval) {
+        const pending = approvalResolvers.get(toolKey);
+        if (pending === void 0 || state.approval.active?.toolCallId !== toolCallId || state.approval.active.parentToolCallId !== parentToolCallId || privateApprovals.get(toolKey) !== privateApproval) {
           return void 0;
         }
-        approvalResolvers.delete(toolCallId);
-        privateApprovals.delete(toolCallId);
-        resolve({
+        approvalResolvers.delete(toolKey);
+        privateApprovals.delete(toolKey);
+        pending.resolve({
           action: "run",
           executionAuthorization: outcome.executionAuthorization,
           approvalSource: "user"
@@ -622,12 +693,13 @@ function createSessionController(deps) {
         emit({
           type: "approval-settled",
           toolCallId,
+          ...parentToolCallId !== void 0 ? { parentToolCallId } : {},
           status: "approved",
           by: "client"
         });
         return { status: "approved" };
       } finally {
-        persistenceInFlight.delete(toolCallId);
+        persistenceInFlight.delete(toolKey);
         hostBusyCount = Math.max(0, hostBusyCount - 1);
         emitTurnStatus();
       }
@@ -645,6 +717,9 @@ function createSessionController(deps) {
     isHostBusy() {
       return hostBusyCount > 0;
     },
+    isTurnActive() {
+      return abortController !== null;
+    },
     onEvent(listener) {
       listeners.add(listener);
       return () => listeners.delete(listener);
@@ -695,6 +770,8 @@ function createSessionController(deps) {
       startNextQueuedSubmission();
     },
     async submit(input, opts) {
+      if (closing) throw new Error("Session is closing.");
+      opts.signal?.throwIfAborted();
       if (abortController || hostBusyCount > 0) {
         queue.push({
           id: `q-${++queueCounter}`,
@@ -715,9 +792,11 @@ function createSessionController(deps) {
           opts.turnId
         );
       }
-      await runTurn(input, {
+      await startTrackedTurn(input, {
         turnId: opts.turnId,
-        allowSteering: opts.turnId === void 0
+        allowSteering: opts.turnId === void 0,
+        submission: opts.submission ?? { origin: "user" },
+        ...opts.signal === void 0 ? {} : { signal: opts.signal }
       });
     }
   };

package/dist/controller/session-controller.d.ts

@@ -1,5 +1,5 @@
 import type { AgentMetricsSnapshot } from "@nuvin/agent-core/agent";
-import { type AgentInput, type AskUserAnswers, type Message, type SteeringInputDrain } from "@nuvin/agent-core/shared";
+import { type AgentInput, type AgentSubmission, type AskUserAnswers, type Message, type SteeringInputDrain } from "@nuvin/agent-core/shared";
 import type { BashPolicyApprovalDiagnostics, McpAuthFlowState, McpViewState, PersistBashPermissionRequest, PersistBashPermissionResult, ServerEvent, SessionMeta, SessionSnapshot, SlashCommandDescriptor, WorkflowProgressDelta } from "../protocol/types.ts";
 import { type SessionApprovalMode } from "../state/approvals.ts";
 import type { AgentChannel } from "./agent-channel.ts";
@@ -11,6 +11,7 @@ export type AgentLike = {
         streaming: boolean;
         signal: AbortSignal;
         drainSteering?: SteeringInputDrain;
+        submission: AgentSubmission;
     }): Promise<unknown>;
 };
 export type GuardResult = {
@@ -62,6 +63,10 @@ export interface SessionControllerDeps {
 export type SubmitOptions = {
     displayText: string;
     attachmentLabels?: string[];
+    /** Immutable ownership metadata forwarded with this exact agent send. */
+    submission?: AgentSubmission;
+    /** Optional caller cancellation that remains linked for the full turn. */
+    signal?: AbortSignal;
     /**
      * When true, submit emits no `user-message` event (slash-initiated turns
      * already echoed their text). `displayText` may be `""` in that case.
@@ -84,28 +89,21 @@ export interface SessionController {
         compaction?: CompactionHooks;
         guardPrompt?: (input: AgentInput) => Promise<GuardResult>;
     }): void;
-    /**
-     * Settle a pending question by id.
-     *
-     * Single-active-question is the current protocol invariant: when parallel
-     * sub-agents ask concurrently, only the latest question is surfaced as
-     * `question.active` in state. All resolvers survive in the internal map, so
-     * answering any questionId settles the matching ask correctly.
-     */
+    /** Settle a pending question by id. */
     answerQuestion(questionId: string, answers: AskUserAnswers): boolean;
     /** Emit an error line into the replicated transcript. */
     appendError(message: string): void;
     /** Emit an info line into the replicated transcript (slash output, system notices). */
     appendInfo(message: string): void;
-    close(): void;
+    close(): Promise<void>;
     /**
      * Cancel a queued (not-yet-running) submission by its `turn-status.queued` id.
      * Returns true if an item was removed, false if the id was unknown (already
      * drained or never existed) — a race-safe no-op the host still acks ok.
      */
     dequeue(queuedId: string): boolean;
-    decideApproval(toolCallId: string, decision: "a" | "n" | "y", comment?: string, grantDir?: string): boolean;
-    persistBashPermission(toolCallId: string, request: PersistBashPermissionRequest): Promise<PersistBashPermissionResult | undefined>;
+    decideApproval(toolCallId: string, decision: "a" | "n" | "y", comment?: string, grantDir?: string, parentToolCallId?: string): boolean;
+    persistBashPermission(toolCallId: string, request: PersistBashPermissionRequest, parentToolCallId?: string): Promise<PersistBashPermissionResult | undefined>;
     /** Echo a user-style message without starting a turn (slash commands echo their invocation). */
     echoUserMessage(text: string, attachmentLabels?: string[]): void;
     /**
@@ -116,6 +114,8 @@ export interface SessionController {
     getSnapshot(): SessionSnapshot;
     /** Return whether a host-controlled server operation currently owns busy state. */
     isHostBusy(): boolean;
+    /** Return whether an agent turn is currently active, independent of host busy state. */
+    isTurnActive(): boolean;
     onEvent(listener: (event: ServerEvent) => void): () => void;
     /**
      * Replace the server-executed slash-command descriptors surfaced in the attach

package/dist/controller/session-controller.d.ts.map

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

package/dist/protocol/data-rpc.d.ts

@@ -1,5 +1,5 @@
-import type { ConfigMutationResult, HistoryPage, ProfileSummary, ProviderConfigSummary, ProviderCredentialInput, ProviderSurfaceId, SessionSnapshot, WorkspaceConfigSummary } from "./types.ts";
-export type DataRpcErrorCode = "invalid-input" | "not-found" | "conflict" | "unsupported" | "unauthorized" | "daemon-offline" | "internal";
+import type { ConfigMutationResult, HistoryPage, ListHistoryParams, ListHistoryWorkspacesParams, ListHistoryWorkspacesResult, ListWorkspaceHistoryParams, PersistenceIdentity, ProfileSummary, ProviderConfigSummary, ProviderCredentialInput, ProviderSurfaceId, SessionSnapshot, WorkspaceConfigSummary, WorkspaceHistoryPage } from "./types.ts";
+export type DataRpcErrorCode = "invalid-input" | "not-found" | "conflict" | "unsupported" | "unauthorized" | "daemon-offline" | "transcript-unavailable" | "transcript-corrupt" | "history-state-conflict" | "ambiguous-session-identity" | "invalid-history-cursor" | "internal";
 export type DataRpcError = {
     code: DataRpcErrorCode;
     message: string;
@@ -30,26 +30,25 @@ export type UpdateWorkspaceInput = ProfileScope & {
 export type DataRpcSchema = {
     "get-transcript": {
         params: {
-            historyId: string;
-            workspace?: string;
-            profile?: string;
+            identity: PersistenceIdentity;
         };
         result: SessionSnapshot;
     };
     "list-history": {
-        params: {
-            profile?: string;
-            cwd?: string;
-            limit?: number;
-            cursor?: string;
-        };
+        params: ListHistoryParams;
         result: HistoryPage;
     };
+    "list-history-workspaces": {
+        params: ListHistoryWorkspacesParams;
+        result: ListHistoryWorkspacesResult;
+    };
+    "list-workspace-history": {
+        params: ListWorkspaceHistoryParams;
+        result: WorkspaceHistoryPage;
+    };
     "delete-session": {
         params: {
-            historyId: string;
-            workspace?: string;
-            profile?: string;
+            identity: PersistenceIdentity;
         };
         result: {
             ok: true;

package/dist/protocol/data-rpc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-rpc.d.ts","sourceRoot":"","sources":["../../src/protocol/data-rpc.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"data-rpc.d.ts","sourceRoot":"","sources":["../../src/protocol/data-rpc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EACpB,WAAW,EACX,iBAAiB,EACjB,2BAA2B,EAC3B,2BAA2B,EAC3B,0BAA0B,EAC1B,mBAAmB,EACnB,cAAc,EACd,qBAAqB,EACrB,uBAAuB,EACvB,iBAAiB,EACjB,eAAe,EACf,sBAAsB,EACtB,oBAAoB,EACrB,MAAM,YAAY,CAAC;AAEpB,MAAM,MAAM,gBAAgB,GACxB,eAAe,GACf,WAAW,GACX,UAAU,GACV,aAAa,GACb,cAAc,GACd,gBAAgB,GAChB,wBAAwB,GACxB,oBAAoB,GACpB,wBAAwB,GACxB,4BAA4B,GAC5B,wBAAwB,GACxB,UAAU,CAAC;AAEf,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,gBAAgB,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEhD,MAAM,MAAM,gBAAgB,GAAG,YAAY,GAAG;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,iBAAiB,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,uBAAuB,CAAC;IACpC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,YAAY,GAAG;IAChD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,gBAAgB,EAAE;QAChB,MAAM,EAAE;YAAE,QAAQ,EAAE,mBAAmB,CAAA;SAAE,CAAC;QAC1C,MAAM,EAAE,eAAe,CAAC;KACzB,CAAC;IACF,cAAc,EAAE;QACd,MAAM,EAAE,iBAAiB,CAAC;QAC1B,MAAM,EAAE,WAAW,CAAC;KACrB,CAAC;IACF,yBAAyB,EAAE;QACzB,MAAM,EAAE,2BAA2B,CAAC;QACpC,MAAM,EAAE,2BAA2B,CAAC;KACrC,CAAC;IACF,wBAAwB,EAAE;QACxB,MAAM,EAAE,0BAA0B,CAAC;QACnC,MAAM,EAAE,oBAAoB,CAAC;KAC9B,CAAC;IACF,gBAAgB,EAAE;QAChB,MAAM,EAAE;YAAE,QAAQ,EAAE,mBAAmB,CAAA;SAAE,CAAC;QAC1C,MAAM,EAAE;YAAE,EAAE,EAAE,IAAI,CAAA;SAAE,CAAC;KACtB,CAAC;IACF,iBAAiB,EAAE;QACjB,MAAM,EAAE;YAAE,OAAO,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;QAC7B,MAAM,EAAE,sBAAsB,EAAE,CAAC;KAClC,CAAC;IACF,kBAAkB,EAAE;QAClB,MAAM,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,IAAI,CAAC,EAAE,MAAM,CAAC;YAAC,OAAO,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;QAC1D,MAAM,EAAE,sBAAsB,CAAC;KAChC,CAAC;IACF,eAAe,EAAE;QACf,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC9B,MAAM,EAAE,cAAc,EAAE,CAAC;KAC1B,CAAC;IACF,gBAAgB,EAAE;QAChB,MAAM,EAAE,YAAY,CAAC;QACrB,MAAM,EAAE,qBAAqB,EAAE,CAAC;KACjC,CAAC;IACF,cAAc,EAAE;QACd,MAAM,EAAE,gBAAgB,CAAC;QACzB,MAAM,EAAE,oBAAoB,CAAC,qBAAqB,CAAC,CAAC;KACrD,CAAC;IACF,iBAAiB,EAAE;QACjB,MAAM,EAAE;YAAE,UAAU,EAAE,MAAM,CAAC;YAAC,OAAO,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;QACjD,MAAM,EAAE,oBAAoB,CAAC,IAAI,CAAC,CAAC;KACpC,CAAC;IACF,sBAAsB,EAAE;QACtB,MAAM,EAAE;YAAE,UAAU,EAAE,MAAM,CAAC;YAAC,OAAO,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;QACjD,MAAM,EAAE,oBAAoB,CAAC,IAAI,CAAC,CAAC;KACpC,CAAC;IACF,mBAAmB,EAAE;QACnB,MAAM,EAAE;YAAE,UAAU,EAAE,MAAM,CAAC;YAAC,UAAU,EAAE,uBAAuB,CAAC;YAAC,OAAO,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;QACtF,MAAM,EAAE,oBAAoB,CAAC,IAAI,CAAC,CAAC;KACpC,CAAC;IACF,qBAAqB,EAAE;QACrB,MAAM,EAAE;YAAE,UAAU,EAAE,MAAM,CAAC;YAAC,OAAO,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;QACjD,MAAM,EAAE,oBAAoB,CAAC,IAAI,CAAC,CAAC;KACpC,CAAC;IACF,kBAAkB,EAAE;QAClB,MAAM,EAAE,oBAAoB,GAAG;YAAE,IAAI,EAAE,MAAM,CAAA;SAAE,CAAC;QAChD,MAAM,EAAE,oBAAoB,CAAC,sBAAsB,CAAC,CAAC;KACtD,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,MAAM,aAAa,CAAC;AAChD,MAAM,MAAM,aAAa,CAAC,CAAC,SAAS,aAAa,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;AAChF,MAAM,MAAM,aAAa,CAAC,CAAC,SAAS,aAAa,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC"}

package/dist/protocol/history-text.d.ts

@@ -0,0 +1,4 @@
+export declare function sanitizeHistoryDisplayText(value: string): string;
+export declare function normalizeHistoryText(value: string): string;
+export declare function escapeLikeLiteral(value: string): string;
+//# sourceMappingURL=history-text.d.ts.map

package/dist/protocol/history-text.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"history-text.d.ts","sourceRoot":"","sources":["../../src/protocol/history-text.ts"],"names":[],"mappings":"AAsEA,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAKhE;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEvD"}

package/dist/protocol/index.d.ts

@@ -1,5 +1,6 @@
 export * from "./daemon-directory.ts";
 export * from "./data-rpc.ts";
+export * from "./history-text.ts";
 export * from "./model-identity.ts";
 export * from "./types.ts";
 export * from "./version.ts";

package/dist/protocol/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/protocol/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAC9B,cAAc,qBAAqB,CAAC;AACpC,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/protocol/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC"}

package/dist/protocol/index.js

@@ -1,9 +1,13 @@
 import {
-  modelNameFromIdentity
-} from "../chunk-7HGJO7ZX.js";
+  escapeLikeLiteral,
+  modelNameFromIdentity,
+  normalizeHistoryText,
+  providerFromIdentity,
+  sanitizeHistoryDisplayText
+} from "../chunk-7LEIACBZ.js";
 import {
   PROTOCOL_VERSION
-} from "../chunk-MRVGQ4DK.js";
+} from "../chunk-O3UBTUIO.js";
 import {
   GRANT_CAPABILITIES,
   PROVIDER_SURFACE_IDS
@@ -12,5 +16,9 @@ export {
   GRANT_CAPABILITIES,
   PROTOCOL_VERSION,
   PROVIDER_SURFACE_IDS,
-  modelNameFromIdentity
+  escapeLikeLiteral,
+  modelNameFromIdentity,
+  normalizeHistoryText,
+  providerFromIdentity,
+  sanitizeHistoryDisplayText
 };

package/dist/protocol/model-identity.d.ts

@@ -4,4 +4,11 @@
  * separator — remaining colons belong to the model id (e.g. `model:variant`).
  */
 export declare function modelNameFromIdentity(modelIdentity: string): string;
+/**
+ * Project a qualified model identity (`provider:model`) up to its provider
+ * name. Returns `undefined` for provider-less identities (bare `model` and
+ * provider-less `:model:variant`). Mirrors {@link modelNameFromIdentity}: only
+ * the first colon is the separator.
+ */
+export declare function providerFromIdentity(modelIdentity: string): string | undefined;
 //# sourceMappingURL=model-identity.d.ts.map

package/dist/protocol/model-identity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-identity.d.ts","sourceRoot":"","sources":["../../src/protocol/model-identity.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAGnE"}
+{"version":3,"file":"model-identity.d.ts","sourceRoot":"","sources":["../../src/protocol/model-identity.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAGnE;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAI9E"}