newmark-agent 0.6.2 → 0.6.4

package/dist/core/conversationKernel.d.ts

@@ -5,6 +5,8 @@ import { ConversationRuntimeTarget, NormalizedConversationTarget } from './conve
 export type ConversationQueueMode = 'steer' | 'followUp';
 export interface ConversationQueueItemSnapshot {
     id: string;
+    /** Authoritative continuation-v1 build id (null for legacy/in-memory rows). */
+    buildId?: string;
     text: string;
     queueMode: ConversationQueueMode;
     requestedMode?: string;
@@ -12,8 +14,17 @@ export interface ConversationQueueItemSnapshot {
     runId?: string;
     createdAt: string;
     images?: AgentPromptMessage['images'];
+    branchNodeId?: string;
+    branchPath?: string[];
+    /** Exact workspace ledger branch id used when this row was admitted. */
+    ledgerBranchId?: string;
+    modelSelection?: string;
+    /** Ledger reason shown when a queued row cannot run (for example DEPENDENCY_FAILED). */
+    waitingReason?: string;
+    /** True when the ledger currently blocks this row from being claimed. */
+    blocked?: boolean;
 }
-export type ConversationQueueAction = 'enqueue' | 'update' | 'delete' | 'reorder' | 'toggle_pause' | 'set_pause' | 'guide';
+export type ConversationQueueAction = 'enqueue' | 'update' | 'delete' | 'reorder' | 'toggle_pause' | 'set_pause' | 'repair_blocked' | 'guide';
 export interface ConversationQueueActionInput {
     id?: string;
     text?: string;
@@ -21,11 +32,22 @@ export interface ConversationQueueActionInput {
     goalObjective?: string;
     createdAt?: string;
     images?: AgentPromptMessage['images'];
+    /** Runtime branch node that owns this queued user turn. */
+    branchNodeId?: string;
+    /** Full runtime branch path captured when the item was enqueued. */
+    branchPath?: string[];
+    /** Exact conversation runtime identity captured at enqueue time. */
+    targetRuntimeKey?: string;
+    workspaceKey?: string;
+    /** Provider-qualified model selected when the user enqueued this turn. */
+    modelSelection?: string;
     orderedIds?: string[];
     paused?: boolean;
 }
 export interface AgentPromptMessage {
     text: string;
+    /** Authoritative continuation-v1 build id for a queued user turn. */
+    buildId?: string;
     /** Public transcript text when the execution prompt contains hidden orchestration instructions. */
     visibleUserInput?: string;
     /** Public semantic mode label; execution policy still follows the runner mode. */
@@ -45,6 +67,13 @@ export interface AgentPromptMessage {
     createdAt?: string;
     guideId?: string;
     runId?: string;
+    /** Stable conversation/branch ownership for queued user turns. */
+    branchNodeId?: string;
+    branchPath?: string[];
+    ledgerBranchId?: string;
+    targetRuntimeKey?: string;
+    workspaceKey?: string;
+    modelSelection?: string;
     /**
      * dev-0.4.3: 同一 Build block 内连续到达的多个 Guide 会被 conversation
      * kernel 合并为一次 provider 续接，而不是每来一个 Guide 就响应一次。
@@ -200,7 +229,31 @@ export declare class ConversationKernel {
     /** Detach idle owners before config replacement or workspace removal. */
     disposeIdle(workspaceKey?: string): string[];
     /** A Flow and its queue share one Agent; no second history writer is created. */
-    beginExternalRun(targetInput: ConversationTargetInput, options: ConversationKernelRunOptions, createOwner: () => Agent, previousQueuePaused?: boolean): Agent;
+    beginExternalRun(targetInput: ConversationTargetInput, options: ConversationKernelRunOptions, createOwner: () => Agent, previousQueuePaused?: boolean, buildInput?: {
+        commandId?: string;
+        text: string;
+        requestedMode?: string;
+        goalObjective?: string;
+        modelSelection?: string;
+        branchNodeId?: string;
+        branchPath?: string[];
+        resume?: boolean;
+        existingBuildId?: string;
+    }): Agent;
+    /**
+     * Admit a Flow build at command-acceptance time. The Flow may wait behind a
+     * running Build, but its queue position (and therefore the parent of every
+     * later Next item) is fixed now, not when the Flow finally starts.
+     */
+    admitExternalBuild(targetInput: ConversationTargetInput, buildInput: {
+        commandId: string;
+        text: string;
+        requestedMode?: string;
+        goalObjective?: string;
+        modelSelection?: string;
+        branchNodeId?: string;
+        branchPath?: string[];
+    }): string | null;
     settleExternalRun(target: ConversationTargetInput, completed: boolean): void;
     releaseExternalRun(target: ConversationTargetInput, paused: boolean): void;
     prepareForArchive(target: ConversationTargetInput): Promise<Agent | null>;
@@ -225,6 +278,19 @@ export declare class ConversationKernel {
      */
     private drainQueuedFollowUpMessage;
     queueItems(target: ConversationTargetInput): ConversationQueueItemSnapshot[];
+    /**
+     * Capture the exact runtime branch that owns a queued user turn. A queued
+     * Next is a new user turn, but it must still land on the branch the user was
+     * viewing when they enqueued it, not on whatever branch happens to be active
+     * when the previous Build settles.
+     */
+    private runtimeBranchIdentity;
+    /**
+     * Map the current conversation/branch model onto the continuation-v1
+     * Root/Branch identity. The ledger is workspace-scoped and shared by the
+     * PC GUI, hosted mobile API and isolated runtimes.
+     */
+    private continuationStore;
     enqueueNext(target: ConversationTargetInput, input: {
         id: string;
         text: string;
@@ -232,11 +298,23 @@ export declare class ConversationKernel {
         goalObjective?: string;
         createdAt?: string;
         images?: AgentPromptMessage['images'];
+        branchNodeId?: string;
+        branchPath?: string[];
+        modelSelection?: string;
+        targetRuntimeKey?: string;
     }): ConversationQueueItemSnapshot;
     updateQueueItem(target: ConversationTargetInput, idInput: string, textInput: string, input?: ConversationQueueActionInput): ConversationQueueItemSnapshot;
     deleteQueueItem(target: ConversationTargetInput, idInput: string): boolean;
     reorderQueueItems(target: ConversationTargetInput, orderedIdsInput: string[]): ConversationQueueItemSnapshot[];
     setQueuePaused(target: ConversationTargetInput, paused: boolean): boolean;
+    /**
+     * dev-0.6.4 hotfix: 显式修复被失败前置阻断的排队行。
+     *
+     * 0.6.3 的合约是「失败/取消阻断后继，且不静默跳过」，所以这里不挂在恢复动作上
+     * 自动执行；它必须由用户的显式动作触发（界面上的“修复受阻队列”按钮）。每一次
+     * 改挂都写入 `BuildQueueRepaired` 事件并发布可见状态，触发者与原因可审计。
+     */
+    private repairBlockedQueueNow;
     queueAction(target: ConversationTargetInput, action: ConversationQueueAction, input?: ConversationQueueActionInput): {
         ok: boolean;
         queueItems: ConversationQueueItemSnapshot[];
@@ -325,6 +403,12 @@ export declare class ConversationKernel {
     private runtime;
     private scheduleGoalContinuation;
     private schedulePendingRuntimeContinuation;
+    /**
+     * Restore the runtime branch captured by a queued user turn. If the branch
+     * disappeared (manual deletion/rewind), fail the queued item into the
+     * existing pause/retry path instead of appending it to a different branch.
+     */
+    private bindQueuedTurnBranch;
     private runPendingQueueItem;
     private startGoalDrivenBuild;
     private createRunner;
@@ -345,6 +429,13 @@ export declare class ConversationKernel {
     private emitQueueUpdate;
     private clearQueued;
     private queueState;
+    /**
+     * Merge queue continuations persisted by another owner/kernel into this
+     * runtime's in-memory projection. Flow takeover, cold restore and a pool
+     * hand-off must not lose an already-admitted Next row. Deduplication is by
+     * the stable clientMessageId, never by text.
+     */
+    private reconcilePendingContinuations;
     private normalizeTarget;
     private workspaceForId;
     private findRuntime;