@plusplusoneplusplus/coc 1.0.4 → 1.0.6

package/dist/server/executors/executor-registry.js

@@ -0,0 +1,98 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExecutorRegistry = void 0;
+const task_types_1 = require("../task-types");
+const task_strategies_1 = require("../task-strategies");
+const replicate_template_strategy_1 = require("../task-strategies/replicate-template-strategy");
+const shell_executor_1 = require("./shell-executor");
+const workflow_executor_1 = require("./workflow-executor");
+const follow_up_executor_1 = require("./follow-up-executor");
+const chat_executor_1 = require("./chat-executor");
+const plan_executor_1 = require("./plan-executor");
+const autopilot_executor_1 = require("./autopilot-executor");
+const task_generation_executor_1 = require("./task-generation-executor");
+const resolve_comments_executor_1 = require("./resolve-comments-executor");
+const memory_aggregate_executor_1 = require("../memory/memory-aggregate-executor");
+const process_lifecycle_runner_1 = require("./process-lifecycle-runner");
+const wrapped_task_executor_1 = require("./wrapped-task-executor");
+/**
+ * Central registry that owns all executor instances and provides
+ * task dispatch logic. Replaces the 9-way constructor fan-out
+ * previously in CLITaskExecutor.
+ */
+class ExecutorRegistry {
+    constructor(store, options) {
+        this.store = store;
+        this.approvePermissions = options.approvePermissions;
+        this.defaultWorkingDirectory = options.defaultWorkingDirectory;
+        this.dataDir = options.dataDir;
+        const chatOpts = {
+            workingDirectory: options.defaultWorkingDirectory,
+            approvePermissions: options.approvePermissions,
+            aiService: options.aiService,
+            defaultTimeoutMs: options.defaultTimeoutMs,
+            followUpSuggestions: options.followUpSuggestions,
+            toolCallCacheStore: options.toolCallCacheStore,
+            resolveSkillConfig: options.resolveSkillConfig,
+            resolveWorkspaceIdForPath: options.resolveWorkspaceIdForPath,
+        };
+        this.strategyRegistry = new task_strategies_1.TaskStrategyRegistry();
+        this.strategyRegistry.register('replicate-template', new replicate_template_strategy_1.ReplicateTemplateStrategy());
+        this.workflowExecutor = new workflow_executor_1.WorkflowExecutor(store, { approvePermissions: options.approvePermissions, workingDirectory: options.defaultWorkingDirectory }, options.dataDir);
+        this.followUpExecutor = new follow_up_executor_1.FollowUpExecutor(store, { workingDirectory: options.defaultWorkingDirectory, approvePermissions: options.approvePermissions, aiService: options.aiService, followUpSuggestions: options.followUpSuggestions, resolveWorkspaceIdForPath: options.resolveWorkspaceIdForPath, resolveSkillConfig: options.resolveSkillConfig, onTitleNeeded: options.onTitleNeeded }, options.dataDir);
+        this.chatExecutor = new chat_executor_1.ChatExecutor(store, chatOpts, options.dataDir);
+        this.planExecutor = new plan_executor_1.PlanExecutor(store, chatOpts, options.dataDir);
+        this.autopilotExecutor = new autopilot_executor_1.AutopilotExecutor(store, chatOpts, options.dataDir);
+        this.taskGenerationExecutor = new task_generation_executor_1.TaskGenerationExecutor(store, chatOpts, options.dataDir);
+        this.resolveCommentsExecutor = new resolve_comments_executor_1.ResolveCommentsExecutor(store, chatOpts, options.getWsServer, options.dataDir);
+        this.memoryAggregateExecutor = new memory_aggregate_executor_1.MemoryAggregateExecutor(store, options.dataDir ?? '');
+        this.runner = new process_lifecycle_runner_1.ProcessLifecycleRunner(store, options.dataDir, options.onTitleNeeded);
+    }
+    /** Dispatch a task to the appropriate executor based on its type and payload. */
+    async dispatch(task, prompt) {
+        if ((0, task_types_1.isRunWorkflowPayload)(task.payload))
+            return this.workflowExecutor.execute(task);
+        if ((0, task_types_1.isRunScriptPayload)(task.payload))
+            return new shell_executor_1.ShellExecutor(this.store, this.dataDir, this.defaultWorkingDirectory).execute(task);
+        if ((0, task_types_1.isChatPayload)(task.payload) && !(0, task_types_1.isChatFollowUp)(task.payload)) {
+            const payload = task.payload;
+            const executor = this.resolveChatExecutor(task, payload);
+            if (payload.beforeScript || payload.afterScript) {
+                return new wrapped_task_executor_1.WrappedTaskExecutor(executor, this.store).execute(task, prompt);
+            }
+            return executor.execute(task, prompt);
+        }
+        return { status: 'completed', message: `Task type '${task.type}' executed (no-op in CLI mode)` };
+    }
+    /** Resolve the working directory for a task. */
+    getWorkingDirectory(task) {
+        if ((0, task_types_1.isRunWorkflowPayload)(task.payload))
+            return task.payload.workingDirectory || this.defaultWorkingDirectory;
+        if ((0, task_types_1.isRunScriptPayload)(task.payload))
+            return task.payload.workingDirectory || this.defaultWorkingDirectory;
+        if ((0, task_types_1.isChatPayload)(task.payload))
+            return task.payload.workingDirectory || task.payload.folderPath || this.defaultWorkingDirectory;
+        return this.defaultWorkingDirectory;
+    }
+    /** Build execution context for strategy-based execution. */
+    buildExecutionContext(task) {
+        return { processId: `queue_${task.id}`, store: this.store, approvePermissions: this.approvePermissions, workingDirectory: this.getWorkingDirectory(task) };
+    }
+    /** Resolve the chat-mode executor based on payload context and mode. */
+    resolveChatExecutor(task, payload) {
+        if ((0, task_types_1.hasTaskGenerationContext)(task.payload))
+            return this.taskGenerationExecutor;
+        if ((0, task_types_1.hasReplicationContext)(task.payload))
+            return { execute: (t) => this.strategyRegistry.get('replicate-template').execute(t, this.buildExecutionContext(t)) };
+        if ((0, task_types_1.hasResolveCommentsContext)(task.payload) || (0, task_types_1.hasResolveDiffCommentsContext)(task.payload) || payload.tools?.includes('resolve-comments'))
+            return { execute: (t) => this.resolveCommentsExecutor.executeTask(t) };
+        const mode = payload.mode;
+        if (mode === 'plan')
+            return this.planExecutor;
+        if (mode === 'autopilot')
+            return this.autopilotExecutor;
+        return this.chatExecutor;
+    }
+}
+exports.ExecutorRegistry = ExecutorRegistry;
+//# sourceMappingURL=executor-registry.js.map

package/dist/server/executors/executor-registry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"executor-registry.js","sourceRoot":"","sources":["../../../src/server/executors/executor-registry.ts"],"names":[],"mappings":"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"}

package/dist/server/executors/executor-types.d.ts

@@ -0,0 +1,6 @@
+import type { QueuedTask } from '@plusplusoneplusplus/forge';
+/** Normalized executor interface for all task execution strategies. */
+export interface ITaskExecutor {
+    execute(task: QueuedTask, prompt: string): Promise<unknown>;
+}
+//# sourceMappingURL=executor-types.d.ts.map

package/dist/server/executors/executor-types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"executor-types.d.ts","sourceRoot":"","sources":["../../../src/server/executors/executor-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAE7D,uEAAuE;AACvE,MAAM,WAAW,aAAa;IAC1B,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC/D"}

package/{node_modules/@plusplusoneplusplus/forge/dist/ado/types.js → dist/server/executors/executor-types.js}

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=types.js.map
+//# sourceMappingURL=executor-types.js.map

package/dist/server/executors/executor-types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"executor-types.js","sourceRoot":"","sources":["../../../src/server/executors/executor-types.ts"],"names":[],"mappings":""}

package/dist/server/executors/follow-up-executor.d.ts

@@ -53,6 +53,6 @@ export declare class FollowUpExecutor extends BaseExecutor {
      * 4. On completion, append assistant turn to conversationTurns
      * 5. Update process status back to 'completed'
      */
-    executeFollowUp(processId: string, message: string, attachments?: Attachment[], mode?: ChatMode, deliveryMode?: string): Promise<void>;
+    executeFollowUp(processId: string, message: string, attachments?: Attachment[], mode?: ChatMode, deliveryMode?: string, images?: string[]): Promise<void>;
 }
 //# sourceMappingURL=follow-up-executor.d.ts.map

package/dist/server/executors/follow-up-executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"follow-up-executor.d.ts","sourceRoot":"","sources":["../../../src/server/executors/follow-up-executor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAKH,OAAO,KAAK,EAER,UAAU,EAEV,gBAAgB,EAChB,iBAAiB,EAEjB,YAAY,EAEf,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAe9C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAiB/C,MAAM,WAAW,WAAW;IACxB,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC7B;AAED,MAAM,WAAW,uBAAuB;IACpC,gDAAgD;IAChD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,qEAAqE;IACrE,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,0DAA0D;IAC1D,SAAS,EAAE,iBAAiB,CAAC;IAC7B,0CAA0C;IAC1C,mBAAmB,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACzD,2CAA2C;IAC3C,yBAAyB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACjE,kDAAkD;IAClD,kBAAkB,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;IACzF,2DAA2D;IAC3D,aAAa,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,KAAK,IAAI,CAAC;CAC1E;AAMD,qBAAa,gBAAiB,SAAQ,YAAY;IAC9C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAU;IAC7C,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAS;IAClD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAoB;IAC9C,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAsC;IAC1E,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAAwC;IACnF,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAuE;IAC3G,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAyD;gBAE5E,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,uBAAuB,EAAE,OAAO,CAAC,EAAE,MAAM;IAWnF;;;;;;;;;OASG;IACG,eAAe,CACjB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,WAAW,CAAC,EAAE,UAAU,EAAE,EAC1B,IAAI,CAAC,EAAE,QAAQ,EACf,YAAY,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,IAAI,CAAC;CAgRnB"}
+{"version":3,"file":"follow-up-executor.d.ts","sourceRoot":"","sources":["../../../src/server/executors/follow-up-executor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAKH,OAAO,KAAK,EAER,UAAU,EAEV,gBAAgB,EAChB,iBAAiB,EAEjB,YAAY,EAEf,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAe9C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAiB/C,MAAM,WAAW,WAAW;IACxB,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC7B;AAED,MAAM,WAAW,uBAAuB;IACpC,gDAAgD;IAChD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,qEAAqE;IACrE,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,0DAA0D;IAC1D,SAAS,EAAE,iBAAiB,CAAC;IAC7B,0CAA0C;IAC1C,mBAAmB,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACzD,2CAA2C;IAC3C,yBAAyB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACjE,kDAAkD;IAClD,kBAAkB,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;IACzF,2DAA2D;IAC3D,aAAa,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,KAAK,IAAI,CAAC;CAC1E;AAMD,qBAAa,gBAAiB,SAAQ,YAAY;IAC9C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAU;IAC7C,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAS;IAClD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAoB;IAC9C,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAsC;IAC1E,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAAwC;IACnF,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAuE;IAC3G,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAyD;gBAE5E,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,uBAAuB,EAAE,OAAO,CAAC,EAAE,MAAM;IAWnF;;;;;;;;;OASG;IACG,eAAe,CACjB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,WAAW,CAAC,EAAE,UAAU,EAAE,EAC1B,IAAI,CAAC,EAAE,QAAQ,EACf,YAAY,CAAC,EAAE,MAAM,EACrB,MAAM,CAAC,EAAE,MAAM,EAAE,GAClB,OAAO,CAAC,IAAI,CAAC;CA8NnB"}

package/dist/server/executors/follow-up-executor.js

@@ -88,7 +88,7 @@ class FollowUpExecutor extends base_executor_1.BaseExecutor {
      * 4. On completion, append assistant turn to conversationTurns
      * 5. Update process status back to 'completed'
      */
-    async executeFollowUp(processId, message, attachments, mode, deliveryMode) {
+    async executeFollowUp(processId, message, attachments, mode, deliveryMode, images) {
         const logger = (0, forge_1.getLogger)();
         const startTime = Date.now();
         logger.debug(forge_1.LogCategory.AI, `[FollowUp] Starting follow-up for process ${processId}`);
@@ -126,8 +126,17 @@ class FollowUpExecutor extends base_executor_1.BaseExecutor {
         this.getOrCreateSession(processId).outputBuffer = '';
         this.store.registerFlushHandler?.(processId, () => this.flushConversationTurn(processId, true));
         try {
-            const isFirstTurn = !(process.conversationTurns?.some(t => t.role === 'assistant'));
-            const { tools: suggestTools, suffix: followUpSuffix } = (0, prompt_builder_1.buildFollowUpSuggestionsAddon)(this.followUpSuggestions.enabled && isFirstTurn, this.followUpSuggestions.count);
+            // Save user turn before the AI call so it is always serialized
+            // ahead of the assistant turn in the write-queue.
+            await this.store.appendConversationTurn(processId, (turnIndex) => ({
+                role: 'user',
+                content: message,
+                timestamp: new Date(),
+                turnIndex,
+                timeline: [],
+                images,
+            }), { additionalUpdates: { status: 'running' } });
+            const { tools: suggestTools, suffix: followUpSuffix } = (0, prompt_builder_1.buildFollowUpSuggestionsAddon)(this.followUpSuggestions.enabled, this.followUpSuggestions.count);
             const followUpMessage = followUpSuffix ? `${message}${followUpSuffix}` : message;
             const agentMode = toAgentMode(currentMode);
             const historySystemMessage = historyContext
@@ -176,92 +185,47 @@ class FollowUpExecutor extends base_executor_1.BaseExecutor {
             const pendingSuggestions = this.sessions.get(processId)?.pendingSuggestions;
             let assistantTurn;
             let allTurns;
-            if (this.store.appendConversationTurn) {
-                const appendResult = await this.store.appendConversationTurn(processId, (turnIndex) => ({
-                    role: 'assistant',
-                    content: result.response || '(No text response)',
-                    timestamp: new Date(),
-                    turnIndex,
-                    toolCalls: result.toolCalls || undefined,
-                    timeline: followUpTimeline,
-                    suggestions: pendingSuggestions,
-                    tokenUsage: result.tokenUsage,
-                }), {
-                    filterStreaming: true,
-                    additionalUpdates: (current) => {
-                        const tokenLimit = result.tokenUsage?.tokenLimit ?? current.tokenLimit;
-                        const currentTokens = result.tokenUsage?.currentTokens ?? current.currentTokens;
-                        const prevCumulative = current.cumulativeTokenUsage;
-                        const cumulativeTokenUsage = result.tokenUsage ? {
-                            inputTokens: (prevCumulative?.inputTokens ?? 0) + result.tokenUsage.inputTokens,
-                            outputTokens: (prevCumulative?.outputTokens ?? 0) + result.tokenUsage.outputTokens,
-                            cacheReadTokens: (prevCumulative?.cacheReadTokens ?? 0) + result.tokenUsage.cacheReadTokens,
-                            cacheWriteTokens: (prevCumulative?.cacheWriteTokens ?? 0) + result.tokenUsage.cacheWriteTokens,
-                            totalTokens: (prevCumulative?.totalTokens ?? 0) + result.tokenUsage.totalTokens,
-                            turnCount: (prevCumulative?.turnCount ?? 0) + result.tokenUsage.turnCount,
-                            cost: result.tokenUsage.cost !== undefined
-                                ? (prevCumulative?.cost ?? 0) + result.tokenUsage.cost
-                                : prevCumulative?.cost,
-                            duration: result.tokenUsage.duration !== undefined
-                                ? (prevCumulative?.duration ?? 0) + result.tokenUsage.duration
-                                : prevCumulative?.duration,
-                        } : prevCumulative;
-                        return {
-                            status: 'completed',
-                            endTime: new Date(),
-                            result: result.response || undefined,
-                            ...(tokenLimit !== undefined ? { tokenLimit } : {}),
-                            ...(currentTokens !== undefined ? { currentTokens } : {}),
-                            ...(cumulativeTokenUsage ? { cumulativeTokenUsage } : {}),
-                        };
-                    },
-                });
-                assistantTurn = appendResult.turn;
-                allTurns = appendResult.allTurns;
-            }
-            else {
-                // Fallback: non-atomic read-modify-write for stores without appendConversationTurn
-                const refreshed = await this.store.getProcess(processId, process.metadata?.workspaceId);
-                const turns = refreshed?.conversationTurns || [];
-                const cleanTurns = turns.filter(t => !(t.role === 'assistant' && t.streaming));
-                assistantTurn = {
-                    role: 'assistant',
-                    content: result.response || '(No text response)',
-                    timestamp: new Date(),
-                    turnIndex: cleanTurns.length,
-                    toolCalls: result.toolCalls || undefined,
-                    timeline: followUpTimeline,
-                    suggestions: pendingSuggestions,
-                    tokenUsage: result.tokenUsage,
-                };
-                const tokenLimit = result.tokenUsage?.tokenLimit ?? refreshed?.tokenLimit;
-                const currentTokens = result.tokenUsage?.currentTokens ?? refreshed?.currentTokens;
-                const prevCumulative = refreshed?.cumulativeTokenUsage;
-                const cumulativeTokenUsage = result.tokenUsage ? {
-                    inputTokens: (prevCumulative?.inputTokens ?? 0) + result.tokenUsage.inputTokens,
-                    outputTokens: (prevCumulative?.outputTokens ?? 0) + result.tokenUsage.outputTokens,
-                    cacheReadTokens: (prevCumulative?.cacheReadTokens ?? 0) + result.tokenUsage.cacheReadTokens,
-                    cacheWriteTokens: (prevCumulative?.cacheWriteTokens ?? 0) + result.tokenUsage.cacheWriteTokens,
-                    totalTokens: (prevCumulative?.totalTokens ?? 0) + result.tokenUsage.totalTokens,
-                    turnCount: (prevCumulative?.turnCount ?? 0) + result.tokenUsage.turnCount,
-                    cost: result.tokenUsage.cost !== undefined
-                        ? (prevCumulative?.cost ?? 0) + result.tokenUsage.cost
-                        : prevCumulative?.cost,
-                    duration: result.tokenUsage.duration !== undefined
-                        ? (prevCumulative?.duration ?? 0) + result.tokenUsage.duration
-                        : prevCumulative?.duration,
-                } : prevCumulative;
-                allTurns = [...cleanTurns, assistantTurn];
-                await this.store.updateProcess(processId, {
-                    conversationTurns: allTurns,
-                    status: 'completed',
-                    endTime: new Date(),
-                    result: result.response || undefined,
-                    ...(tokenLimit !== undefined ? { tokenLimit } : {}),
-                    ...(currentTokens !== undefined ? { currentTokens } : {}),
-                    ...(cumulativeTokenUsage ? { cumulativeTokenUsage } : {}),
-                });
-            }
+            const appendResult = await this.store.appendConversationTurn(processId, (turnIndex) => ({
+                role: 'assistant',
+                content: result.response || '(No text response)',
+                timestamp: new Date(),
+                turnIndex,
+                toolCalls: result.toolCalls || undefined,
+                timeline: followUpTimeline,
+                suggestions: pendingSuggestions,
+                tokenUsage: result.tokenUsage,
+            }), {
+                filterStreaming: true,
+                additionalUpdates: (current) => {
+                    const tokenLimit = result.tokenUsage?.tokenLimit ?? current.tokenLimit;
+                    const currentTokens = result.tokenUsage?.currentTokens ?? current.currentTokens;
+                    const prevCumulative = current.cumulativeTokenUsage;
+                    const cumulativeTokenUsage = result.tokenUsage ? {
+                        inputTokens: (prevCumulative?.inputTokens ?? 0) + result.tokenUsage.inputTokens,
+                        outputTokens: (prevCumulative?.outputTokens ?? 0) + result.tokenUsage.outputTokens,
+                        cacheReadTokens: (prevCumulative?.cacheReadTokens ?? 0) + result.tokenUsage.cacheReadTokens,
+                        cacheWriteTokens: (prevCumulative?.cacheWriteTokens ?? 0) + result.tokenUsage.cacheWriteTokens,
+                        totalTokens: (prevCumulative?.totalTokens ?? 0) + result.tokenUsage.totalTokens,
+                        turnCount: (prevCumulative?.turnCount ?? 0) + result.tokenUsage.turnCount,
+                        cost: result.tokenUsage.cost !== undefined
+                            ? (prevCumulative?.cost ?? 0) + result.tokenUsage.cost
+                            : prevCumulative?.cost,
+                        duration: result.tokenUsage.duration !== undefined
+                            ? (prevCumulative?.duration ?? 0) + result.tokenUsage.duration
+                            : prevCumulative?.duration,
+                    } : prevCumulative;
+                    return {
+                        status: 'completed',
+                        endTime: new Date(),
+                        result: result.response || undefined,
+                        ...(tokenLimit !== undefined ? { tokenLimit } : {}),
+                        ...(currentTokens !== undefined ? { currentTokens } : {}),
+                        ...(cumulativeTokenUsage ? { cumulativeTokenUsage } : {}),
+                    };
+                },
+            });
+            assistantTurn = appendResult.turn;
+            allTurns = appendResult.allTurns;
             if (result.tokenUsage) {
                 try {
                     this.store.emitProcessEvent(processId, {
@@ -283,41 +247,20 @@ class FollowUpExecutor extends base_executor_1.BaseExecutor {
             const errorMsg = error instanceof Error ? error.message : String(error);
             const duration = Date.now() - startTime;
             logger.debug(forge_1.LogCategory.AI, `[FollowUp] Failed for ${processId} in ${duration}ms: ${errorMsg}`);
-            if (this.store.appendConversationTurn) {
-                await this.store.appendConversationTurn(processId, (turnIndex) => ({
-                    role: 'assistant',
-                    content: `Error: ${errorMsg}`,
-                    timestamp: new Date(),
-                    turnIndex,
-                    timeline: [],
-                }), {
-                    filterStreaming: true,
-                    additionalUpdates: {
-                        status: 'failed',
-                        endTime: new Date(),
-                        error: errorMsg,
-                    },
-                });
-            }
-            else {
-                // Fallback for stores without appendConversationTurn
-                const refreshed = await this.store.getProcess(processId, process.metadata?.workspaceId);
-                const turns = refreshed?.conversationTurns || [];
-                const cleanTurns = turns.filter(t => !(t.role === 'assistant' && t.streaming));
-                const errorTurn = {
-                    role: 'assistant',
-                    content: `Error: ${errorMsg}`,
-                    timestamp: new Date(),
-                    turnIndex: cleanTurns.length,
-                    timeline: [],
-                };
-                await this.store.updateProcess(processId, {
-                    conversationTurns: [...cleanTurns, errorTurn],
+            await this.store.appendConversationTurn(processId, (turnIndex) => ({
+                role: 'assistant',
+                content: `Error: ${errorMsg}`,
+                timestamp: new Date(),
+                turnIndex,
+                timeline: [],
+            }), {
+                filterStreaming: true,
+                additionalUpdates: {
                     status: 'failed',
                     endTime: new Date(),
                     error: errorMsg,
-                });
-            }
+                },
+            });
             this.store.emitProcessComplete(processId, 'failed', `${duration}ms`);
         }
         finally {

package/dist/server/executors/follow-up-executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"follow-up-executor.js","sourceRoot":"","sources":["../../../src/server/executors/follow-up-executor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"follow-up-executor.js","sourceRoot":"","sources":["../../../src/server/executors/follow-up-executor.ts"],"names":[],"mappings":"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"}

package/dist/server/executors/process-lifecycle-runner.d.ts

@@ -28,7 +28,7 @@ export interface LifecycleRunnerOptions {
     /** Set of task IDs that have been cancelled (shared with the bridge). */
     cancelledTasks: Set<string>;
     /** Delegate follow-up execution to the FollowUpExecutor. */
-    executeFollowUpFn: (processId: string, message: string, attachments?: Attachment[], mode?: string, deliveryMode?: string) => Promise<void>;
+    executeFollowUpFn: (processId: string, message: string, attachments?: Attachment[], mode?: string, deliveryMode?: string, images?: string[]) => Promise<void>;
     /** Dispatch execution by task type (chat/workflow/script). */
     executeByTypeFn: (task: QueuedTask, prompt: string) => Promise<unknown>;
     /** Resolve the working directory for a given task. */

package/dist/server/executors/process-lifecycle-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"process-lifecycle-runner.d.ts","sourceRoot":"","sources":["../../../src/server/executors/process-lifecycle-runner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAGH,OAAO,KAAK,EAER,UAAU,EACV,gBAAgB,EAChB,YAAY,EACZ,UAAU,EACV,mBAAmB,EACtB,MAAM,4BAA4B,CAAC;AAkBpC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAM/C,2EAA2E;AAC3E,QAAA,MAAM,iBAAiB,aAAgD,CAAC;AAExE,OAAO,EAAE,iBAAiB,EAAE,CAAC;AAM7B,MAAM,WAAW,sBAAsB;IACnC,yEAAyE;IACzE,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC5B,4DAA4D;IAC5D,iBAAiB,EAAE,CACf,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,WAAW,CAAC,EAAE,UAAU,EAAE,EAC1B,IAAI,CAAC,EAAE,MAAM,EACb,YAAY,CAAC,EAAE,MAAM,KACpB,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,8DAA8D;IAC9D,eAAe,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACxE,sDAAsD;IACtD,qBAAqB,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,MAAM,GAAG,SAAS,CAAC;CACnE;AAMD,qBAAa,sBAAuB,SAAQ,YAAY;IACpD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAyD;gBAGrF,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,eAAe,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,KAAK,IAAI;IAM3E;;;;;;OAMG;IACG,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,sBAAsB,GAAG,OAAO,CAAC,mBAAmB,CAAC;CA+N1F"}
+{"version":3,"file":"process-lifecycle-runner.d.ts","sourceRoot":"","sources":["../../../src/server/executors/process-lifecycle-runner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAGH,OAAO,KAAK,EAER,UAAU,EACV,gBAAgB,EAChB,YAAY,EACZ,UAAU,EACV,mBAAmB,EACtB,MAAM,4BAA4B,CAAC;AAmBpC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAM/C,2EAA2E;AAC3E,QAAA,MAAM,iBAAiB,aAAgD,CAAC;AAExE,OAAO,EAAE,iBAAiB,EAAE,CAAC;AAM7B,MAAM,WAAW,sBAAsB;IACnC,yEAAyE;IACzE,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC5B,4DAA4D;IAC5D,iBAAiB,EAAE,CACf,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,WAAW,CAAC,EAAE,UAAU,EAAE,EAC1B,IAAI,CAAC,EAAE,MAAM,EACb,YAAY,CAAC,EAAE,MAAM,EACrB,MAAM,CAAC,EAAE,MAAM,EAAE,KAChB,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,8DAA8D;IAC9D,eAAe,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACxE,sDAAsD;IACtD,qBAAqB,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,MAAM,GAAG,SAAS,CAAC;CACnE;AAMD,qBAAa,sBAAuB,SAAQ,YAAY;IACpD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAyD;gBAGrF,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,eAAe,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,KAAK,IAAI;IAM3E;;;;;;OAMG;IACG,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,sBAAsB,GAAG,OAAO,CAAC,mBAAmB,CAAC;CAmP1F"}

package/dist/server/executors/process-lifecycle-runner.js

@@ -60,6 +60,7 @@ const forge_1 = require("@plusplusoneplusplus/forge");
 const prompt_builder_1 = require("./prompt-builder");
 const image_store_1 = require("./image-store");
 const task_types_1 = require("../task-types");
+const conversation_recorder_1 = require("../memory/conversation-recorder");
 const base_executor_1 = require("./base-executor");
 // ============================================================================
 // Constants
@@ -112,7 +113,7 @@ class ProcessLifecycleRunner extends base_executor_1.BaseExecutor {
             const imageTempDir = followUpPayload.imageTempDir;
             await (0, image_store_1.rehydrateImagesIfNeeded)(task.payload);
             try {
-                await opts.executeFollowUpFn(followUpPayload.processId, followUpPayload.prompt, followUpPayload.attachments, followUpPayload.mode, followUpPayload.deliveryMode);
+                await opts.executeFollowUpFn(followUpPayload.processId, followUpPayload.prompt, followUpPayload.attachments, followUpPayload.mode, followUpPayload.deliveryMode, followUpPayload.images);
                 const duration = Date.now() - startTime;
                 logger.debug(forge_1.LogCategory.AI, `[QueueExecutor] Follow-up task ${task.id} completed in ${duration}ms`);
                 return { success: true, durationMs: duration };
@@ -172,7 +173,46 @@ class ProcessLifecycleRunner extends base_executor_1.BaseExecutor {
                 images: payloadImages?.length > 0 ? payloadImages : undefined,
             },
         ];
-        process.conversationTurns = initialTurns;
+        // Cold resume: prepend historical turns before creating the process
+        const resumedFrom = task.payload?.resumedFrom;
+        if (resumedFrom && typeof resumedFrom === 'string') {
+            try {
+                const oldProcess = await this.store.getProcess(resumedFrom, task.payload?.workspaceId);
+                if (oldProcess?.conversationTurns?.length) {
+                    const historicalTurns = oldProcess.conversationTurns.map((t, i) => ({
+                        ...t,
+                        historical: true,
+                        turnIndex: i,
+                    }));
+                    const offset = historicalTurns.length;
+                    process.conversationTurns = [
+                        ...historicalTurns,
+                        ...initialTurns.map((t, i) => ({ ...t, turnIndex: offset + i })),
+                    ];
+                }
+                else {
+                    process.conversationTurns = initialTurns;
+                }
+            }
+            catch {
+                // Non-fatal: old process may be gone
+                process.conversationTurns = initialTurns;
+            }
+        }
+        else {
+            process.conversationTurns = initialTurns;
+        }
+        // Record initial prompt to memory (skip scheduled/template-generated runs)
+        const isScheduledRun = (0, task_types_1.isChatPayload)(task.payload) && !!task.payload.context?.scheduleId;
+        if (this.dataDir && task.type === 'chat' && !isScheduledRun) {
+            const wsId = process.metadata?.workspaceId ?? '';
+            if (wsId) {
+                try {
+                    (0, conversation_recorder_1.recordUserMessage)(this.dataDir, wsId, prompt);
+                }
+                catch { /* never block */ }
+            }
+        }
         try {
             await this.store.addProcess(process);
         }
@@ -188,64 +228,48 @@ class ProcessLifecycleRunner extends base_executor_1.BaseExecutor {
             const responseText = result?.response ?? '';
             const finalTimeline = result?.timeline
                 ?? (0, forge_1.mergeConsecutiveContentItems)(this.sessions.get(processId)?.timelineBuffer || []);
-            const currentProcess = await this.store.getProcess(processId, task.payload?.workspaceId);
-            const existingTurns = currentProcess?.conversationTurns?.length
-                ? currentProcess.conversationTurns
-                : initialTurns;
-            const finalTurns = [
-                existingTurns[0],
-                {
+            try {
+                const appendResult = await this.store.appendConversationTurn(processId, (turnIndex) => ({
                     role: 'assistant',
                     content: responseText,
                     timestamp: new Date(),
-                    turnIndex: 1,
+                    turnIndex,
                     toolCalls: result?.toolCalls || undefined,
                     timeline: finalTimeline,
                     suggestions: result?.pendingSuggestions ?? this.sessions.get(processId)?.pendingSuggestions,
-                },
-            ];
-            // Cold resume: prepend historical turns from the original session
-            const resumedFrom = task.payload?.resumedFrom;
-            let combinedTurns = finalTurns;
-            if (resumedFrom && typeof resumedFrom === 'string') {
-                try {
-                    const oldProcess = await this.store.getProcess(resumedFrom, task.payload?.workspaceId);
-                    if (oldProcess?.conversationTurns?.length) {
-                        const historicalTurns = oldProcess.conversationTurns.map((t, i) => ({
-                            ...t,
-                            historical: true,
-                            turnIndex: i,
-                        }));
-                        const offset = historicalTurns.length;
-                        combinedTurns = [
-                            ...historicalTurns,
-                            ...finalTurns.map((t, i) => ({ ...t, turnIndex: offset + i })),
-                        ];
-                    }
-                }
-                catch {
-                    // Non-fatal: old process may be gone
-                }
-            }
-            try {
+                }), {
+                    filterStreaming: true,
+                    additionalUpdates: (current) => {
+                        if (TERMINAL_STATUSES.has(current.status))
+                            return {};
+                        // If cancellation was requested while executing, finalize as cancelled
+                        if (current.status === 'cancelling') {
+                            return {
+                                status: 'cancelled',
+                                endTime: new Date(),
+                                result: typeof result === 'string' ? result : JSON.stringify(result),
+                                ...(sessionId ? { sdkSessionId: sessionId } : {}),
+                            };
+                        }
+                        return {
+                            status: 'completed',
+                            endTime: new Date(),
+                            result: typeof result === 'string' ? result : JSON.stringify(result),
+                            ...(sessionId ? { sdkSessionId: sessionId } : {}),
+                        };
+                    },
+                });
+                const combinedTurns = appendResult?.allTurns ?? process.conversationTurns ?? initialTurns;
                 const currentProc = await this.store.getProcess(processId, task.payload?.workspaceId);
+                const finalStatus = currentProc?.status === 'cancelled' ? 'cancelled' : 'completed';
                 if (!TERMINAL_STATUSES.has(currentProc?.status ?? '')) {
-                    await this.store.updateProcess(processId, {
-                        status: 'completed',
-                        endTime: new Date(),
-                        result: typeof result === 'string' ? result : JSON.stringify(result),
-                        ...(sessionId ? { sdkSessionId: sessionId } : {}),
-                        conversationTurns: combinedTurns,
-                    });
-                    this.store.emitProcessComplete(processId, 'completed', `${duration}ms`);
+                    this.store.emitProcessComplete(processId, finalStatus, `${duration}ms`);
                 }
+                setTimeout(() => this.onGenerateTitle(processId, combinedTurns), 0);
             }
             catch {
                 // Non-fatal
             }
-            // Schedule title generation as a macrotask so it runs AFTER the queue
-            // executor fires taskCompleted and after the caller's synchronous code.
-            setTimeout(() => this.onGenerateTitle(processId, combinedTurns), 0);
             return { success: true, result, durationMs: Date.now() - startTime };
         }
         catch (error) {
@@ -254,15 +278,15 @@ class ProcessLifecycleRunner extends base_executor_1.BaseExecutor {
             logger.debug(forge_1.LogCategory.AI, `[QueueExecutor] Task ${task.id} failed in ${duration}ms: ${errorMsg}`);
             try {
                 const currentProcess = await this.store.getProcess(processId, task.payload?.workspaceId);
-                const existingTurns = currentProcess?.conversationTurns || initialTurns;
                 if (!TERMINAL_STATUSES.has(currentProcess?.status ?? '')) {
+                    const wasCancelled = opts.cancelledTasks.has(task.id) || currentProcess?.status === 'cancelling';
+                    const finalStatus = wasCancelled ? 'cancelled' : 'failed';
                     await this.store.updateProcess(processId, {
-                        status: 'failed',
+                        status: finalStatus,
                         endTime: new Date(),
-                        error: errorMsg,
-                        conversationTurns: existingTurns,
+                        ...(wasCancelled ? {} : { error: errorMsg }),
                     });
-                    this.store.emitProcessComplete(processId, 'failed', `${duration}ms`);
+                    this.store.emitProcessComplete(processId, finalStatus, `${duration}ms`);
                 }
             }
             catch {