newmark-agent 0.5.14 → 0.5.15

package/dist/conversation-utility-host.js

@@ -65,7 +65,7 @@ async function handle(request) {
         return { ...result, backend: 'utility', pid: process.pid };
     }
     if (request.method === 'snapshot')
-        return kernel.snapshot(checkedTarget(request.params.target));
+        return kernel.snapshot(checkedTarget(request.params.target), request.params.options);
     if (request.method === 'rewind') {
         return kernel.rewind(checkedTarget(request.params.target), request.params.messageIndex);
     }

package/dist/core/agent.d.ts

@@ -1,3 +1,5 @@
+import { type Accounting, type AccountingRequest, type UsageInput } from './providerUsageAccounting';
+import { type RequestContextEstimate } from './requestContextEstimate';
 import { ConfigManager, ModelEvaluation, ProviderProtocol } from './config';
 import { LLMProvider } from '../llm/provider';
 import { ToolExecutor } from '../tools/index';
@@ -104,6 +106,7 @@ export interface FlowSuspensionRecord {
         result: string;
     }>;
     previousMode: AgentMode;
+    queueWasPaused?: boolean;
     reason: 'question' | 'interrupted';
     message?: string;
     options?: Array<{
@@ -127,6 +130,38 @@ export interface FlowSuspensionRecord {
     };
     updatedAt: string;
 }
+interface ProviderUsageCounters {
+    input: number;
+    output: number;
+    cacheRead: number;
+    cacheWrite: number;
+}
+/** Caller-owned, single-Build reuse; never retained on Agent or shared globally. */
+export interface BuildProviderCache {
+    key?: string;
+    provider?: LLMProvider;
+}
+export interface PeerRequestCache {
+    version: 1;
+    identity: string;
+    taskFocus: string;
+    initialTools: string[];
+    provisionedTools: string[];
+}
+interface ConversationProviderUsage {
+    version: 1;
+    totals: ProviderUsageCounters;
+    last: ProviderUsageCounters;
+    accounting?: Accounting;
+    requestContext?: RequestContextEstimate | null;
+}
+export interface ConversationUsageRequest {
+    id: string;
+    conversationId: string;
+    workspace: WorkspaceInfo | null;
+    stateKey: string | null;
+    accounting: AccountingRequest;
+}
 export interface StoredGoalState {
     objective: string;
     changes: Array<{
@@ -268,6 +303,9 @@ export interface ConversationContinuation {
     }>;
     attachments?: ConversationImageAttachment[];
     hiddenUserInput?: boolean;
+    visibleUserInput?: string;
+    visibleMode?: string;
+    goalObjective?: string;
     createdAt: string;
 }
 export declare class Agent {
@@ -326,6 +364,8 @@ export declare class Agent {
         cacheRead: number;
         cacheWrite: number;
     };
+    private providerUsageAccounting;
+    private lastRequestContext;
     private compressionCache;
     private pendingHistoryRemovals;
     private branchMailbox;
@@ -365,15 +405,23 @@ export declare class Agent {
     private activeAgentKernelRuntime;
     private modelSwitchCompressionPromise;
     private activePeerAgents;
+    private peerProviderCaches;
     private awaitingAgentKernelRuntime;
     private pendingAgentKernelQueue;
     private linkedPlanAccess;
     private subagentContextPersist?;
+    private subagentPersistedHistory;
+    private subagentPersistedCompression;
     private agentKernelUserMessageStartSubscribers;
     private rootInboxWakeSubscribers;
+    private readonly directRootInboxQueuedIds;
+    private directRootWakePending;
+    private rootInboxRetiredSubscribers;
     private activeWorkRunId;
     private loadedWorkspaceConversationKey;
     private managedWorkRunIds;
+    /** Public deltas since the last completed response, retained only until its boundary. */
+    private pendingPublicWorkText;
     private finalizingWorkRunId;
     private agentRunService;
     private agentRunByWorkRunId;
@@ -399,6 +447,7 @@ export declare class Agent {
     private modelValidationPromise;
     private modelValidationProgress;
     private readonly rootInboxListener;
+    private boundSubagentManagerKey;
     readonly agentOnly: boolean;
     readonly runtimeActorId: string;
     readonly runtimeLifecycleRole: RuntimeLifecycleRole;
@@ -421,6 +470,8 @@ export declare class Agent {
     get toolchain(): ToolchainCore | null;
     constructor(rootPath: string, options?: AgentRuntimeOptions);
     setMode(m: AgentMode): void;
+    /** Selecting the composer mode does not start a Goal or reset a running Flow. */
+    selectConversationMode(mode: AgentMode): void;
     private currentConversationFlowSelection;
     private restoreConversationFlowSelection;
     setConversationFlow(name: string): ConversationFlowSelection;
@@ -567,6 +618,7 @@ export declare class Agent {
     setConversationWorkRunExpanded(runId: string, expanded: boolean): boolean;
     finishConversationWorkRun(runId: string, status: Exclude<ConversationWorkRunStatus, 'running'>, endedAt?: string, errorMessage?: string): boolean;
     private ensureCompletedWorkRunFinalResult;
+    private persistInterruptedPublicWorkText;
     emitWorkEvent(input: Omit<AgentWorkEvent, 'id' | 'conversationId' | 'mode' | 'model' | 'timestamp'> & Partial<Pick<AgentWorkEvent, 'conversationId' | 'mode' | 'model' | 'timestamp'>>): AgentWorkEvent;
     appendWorkflowMessage(content: string, toolName?: string, toolArgs?: string, persist?: boolean): void;
     recordToolResult(toolName: string, _result: string): void;
@@ -579,9 +631,14 @@ export declare class Agent {
             message: unknown;
             queueMode: 'steer' | 'followUp';
         }>;
+        removeQueuedMessages?(predicate: (message: unknown, queueMode: 'steer' | 'followUp') => boolean): number;
     } | null): void;
     subscribeAgentKernelUserMessageStart(fn: (content: string, clientMessageId?: string) => void): () => void;
-    subscribeRootInboxWake(fn: (message: string) => boolean | void): () => void;
+    subscribeRootInboxWake(fn: (message: string, options?: {
+        wakeup: boolean;
+    }) => boolean | void, retired?: (ids: string[]) => void): () => void;
+    /** Called only after receipt-bearing tool history has been saved, or on cold replay. */
+    acknowledgeSubagentSettlementReceipts(): string[];
     notifyAgentKernelUserMessageStart(content: string, clientMessageId?: string): void;
     queueActiveKernelMessage(content: string, queueMode: 'steer' | 'followUp', clientMessageId?: string, runId?: string, images?: Array<{
         dataUrl: string;
@@ -624,9 +681,9 @@ export declare class Agent {
     private writeStoredConversationState;
     private scheduleStoredConversationState;
     flushWorkspaceConversationState(): void;
-    getStoredFlowSuspension(conversationId?: string): FlowSuspensionRecord | null;
-    saveStoredFlowSuspension(suspension: FlowSuspensionRecord | null, conversationId?: string): void;
-    clearStoredFlowSuspension(conversationId?: string): void;
+    getStoredFlowSuspension(conversationId?: string, ws?: WorkspaceInfo | null): FlowSuspensionRecord | null;
+    saveStoredFlowSuspension(suspension: FlowSuspensionRecord | null, conversationId?: string, ws?: WorkspaceInfo | null): void;
+    clearStoredFlowSuspension(conversationId?: string, ws?: WorkspaceInfo | null): void;
     getStoredConversationDraft(conversationId?: string): string | undefined;
     saveStoredConversationDraft(draft: string | null, conversationId?: string): void;
     private writeStoredConversationStateNow;
@@ -671,9 +728,14 @@ export declare class Agent {
     private normalizeLinkedPlan;
     private subagentManagerKey;
     private bindConversationSubagents;
+    /** Release an idle facade; shared peer state remains available to its next owner. */
+    releaseConversationRuntimeBindings(): void;
+    private assertPeerOwnerCanSwitch;
     private persistSubagentState;
     private deliverActivePeerMailbox;
     private deliverRootInboxMessage;
+    /** A normal activation consumes queued mail without changing its static request prefix. */
+    flushDirectRootInbox(): void;
     private deliverPeerSettlement;
     private recordsForState;
     private conversationContentSignature;
@@ -683,7 +745,10 @@ export declare class Agent {
         workspace?: WorkspaceInfo | null;
     }): ConversationSnapshot;
     inspectConversationBranch(conversationId: string, branchId: string, branchGroupId?: string): ConversationSnapshot;
-    ensureConversationSnapshot(conversationId?: string): ConversationSnapshot;
+    ensureConversationSnapshot(conversationId?: string, options?: {
+        window?: number;
+        before?: number;
+    }): ConversationSnapshot;
     rewindConversation(conversationId: string, messageIndex: number): ConversationSnapshot;
     branchConversation(conversationId: string, messageIndex: number, editedText: string, locator?: ConversationBranchLocator): ConversationSnapshot;
     setBranchCommunication(enabled: boolean): boolean;
@@ -721,6 +786,8 @@ export declare class Agent {
      * tool schema. An empty result keeps the formal response hard-blocked.
      */
     private deriveConversationTitleFromProvider;
+    private conversationTitleFailureCause;
+    private waitForConversationTitleRetry;
     /** Legacy completion hook retained as a no-op; naming is pre-response only. */
     private maybeAutoRenameConversationFromRun;
     private startFirstInputConversationTitle;
@@ -760,6 +827,7 @@ export declare class Agent {
     setInputMode(mode: string): InputMode;
     private defaultInputMode;
     abortActiveKernelRun(reason?: string): boolean;
+    hasRunningSubagents(): boolean;
     activeProcessSignal(): AbortSignal | undefined;
     recordWorkRunPrimaryPrompt(content: string): void;
     conversationBuildHistory(limit?: number): Array<{
@@ -854,7 +922,7 @@ export declare class Agent {
     handleContextHistoryManage(args: string): NewmarkToolResult;
     recordContextCompressionStep(): void;
     compressionContinuationPrompt(): string;
-    mirrorConversationStateFrom(id: string, source: Pick<Agent, 'chatMessages' | 'history' | 'conversationPlan'> & Partial<Pick<Agent, 'linkedPlan' | 'subagents' | 'workRuns' | 'continuations' | 'getConversationTitleGateState'>> & {
+    mirrorConversationStateFrom(id: string, source: Pick<Agent, 'chatMessages' | 'history' | 'conversationPlan'> & Partial<Pick<Agent, 'linkedPlan' | 'subagents' | 'workRuns' | 'continuations' | 'getConversationTitleGateState' | 'providerUsageTotals' | 'lastProviderUsage' | 'conversationProviderUsage'>> & {
         modelSelection?: ConversationModelSelection;
         inputMode?: InputMode;
         mode?: AgentMode;
@@ -892,12 +960,15 @@ export declare class Agent {
     modelLabel(): string;
     estimateContextTokens(messages?: Array<Record<string, unknown>>): number;
     private estimateContextTokenComponents;
-    recordProviderUsage(input: {
-        input: number;
-        output: number;
-        cacheRead: number;
-        cacheWrite: number;
-    }): void;
+    private normalizeProviderUsageCounters;
+    conversationProviderUsage(): ConversationProviderUsage;
+    private normalizedConversationUsage;
+    private restoreProviderUsage;
+    private mutateRequestUsage;
+    beginProviderUsageRequest(): ConversationUsageRequest;
+    recordRequestContext(request: ConversationUsageRequest, messages: Array<Record<string, unknown>>, system: string, tools: unknown[], model: string): void;
+    recordProviderUsage(input: UsageInput, request?: ConversationUsageRequest): void;
+    private chatWithConversationUsage;
     contextWindow(modelName?: string): {
         estimatedTokens: number;
         maxTokens: number;
@@ -919,7 +990,20 @@ export declare class Agent {
         providerOutputTokens?: number;
         providerCacheReadTokens?: number;
         providerCacheWriteTokens?: number;
-        providerCacheReadRatio?: number;
+        providerCacheReadRatio?: number | null;
+        providerKnownCacheReadRatio?: number | null;
+        providerCacheEligibleInputTokens?: number;
+        providerUsageRequests?: number;
+        providerUsageInputReportedRequests?: number;
+        providerUsageOutputReportedRequests?: number;
+        providerUsageCacheReportedRequests?: number;
+        providerUsageHasLegacyTotals?: boolean;
+        providerLastInputTokens?: number | null;
+        requestContext?: RequestContextEstimate | null;
+        contextEstimateSource?: 'active_request' | 'history';
+        contextEstimateHasImages?: boolean;
+        systemPromptTokens?: number;
+        toolSchemaTokens?: number;
     };
     private resolveWindowModel;
     private contextMaxTokens;
@@ -1029,7 +1113,8 @@ export declare class Agent {
      * has been exhausted; the original image is never sent again.
      */
     finalVisualFallback(errorText: string, signal?: AbortSignal): Promise<string | null>;
-    engineModel(): LLMProvider | null;
+    engineModel(cache?: BuildProviderCache): LLMProvider | null;
+    private modelProvider;
     /**
      * dev-0.4.3 模型原生思考强度档位映射表（模型名 → thinking_tier_map）。
      * 未配置映射的模型返回 undefined，provider 侧维持默认透传（不变动映射）。
@@ -1145,6 +1230,12 @@ export declare class Agent {
      * empty here; linked-plan content is tool-retrieved on demand.
      */
     assembleContextV2(toolSurfaceNotice: string): AssembledContext;
+    private subagentSettlementReceipt;
+    /** Peer jobs share a durable request prefix; credentials only enter its hash. */
+    peerRequestCacheIdentity(systemPrompt: string, catalog: unknown[]): string | undefined;
+    readPeerRequestCache(identity: string | undefined): PeerRequestCache | undefined;
+    persistPeerRequestCache(cache: PeerRequestCache): void;
+    checkpointPeerInput(): void;
     cachedToolDefinitions(): unknown[];
     private buildFeatureDisclosurePrompt;
     private buildVisibleOutputContract;