funolio-agent 1.0.7 → 1.0.47

package/dist/workflow-engine.js

@@ -100,10 +100,12 @@ class WorkflowEngine extends events_1.EventEmitter {
         }
         else {
             // Single agent, single step
+            const stepDescription = opts?.stepDescription?.trim()
+                || prompt.slice(0, 100);
             steps = [{
                     id: `${workflowId}-0`,
                     index: 0,
-                    description: prompt.slice(0, 100),
+                    description: stepDescription,
                     prompt,
                     agentId: profile.id,
                     agentName: profile.name,
@@ -902,6 +904,53 @@ class WorkflowEngine extends events_1.EventEmitter {
                         loopCount: step.loopCount,
                     };
                     const result = await this.executeStep(step, fullPrompt, conversationId, opts, opts?.apiKey, wfContext);
+                    if (opts?.isOrchestrated && opts.taskId) {
+                        const completedTodo = data.getTodoTask(opts.taskId, 'completed');
+                        if (completedTodo) {
+                            step.status = 'completed';
+                            step.result = completedTodo.output_summary || completedTodo.handoff_prompt || result;
+                            step.completedAt = Date.now();
+                            completed.add(step.index);
+                            this.emitProgress(workflowId, step, steps, 'step-completed', opts?.onProgress, undefined, opts?.onWorkerChunk);
+                            try {
+                                const execId = step._execId;
+                                if (execId) {
+                                    data.updateStepExecution(execId, {
+                                        status: 'completed',
+                                        attempts: step.attempts,
+                                        resultSummary: step.result.length > 200 ? step.result.slice(0, 200) + '...' : step.result,
+                                        completedAt: new Date().toISOString().replace('T', ' ').replace('Z', ''),
+                                    });
+                                    data.updateWorkflowExecution(workflowId, { completedSteps: completed.size });
+                                }
+                            }
+                            catch { /* best effort */ }
+                            return;
+                        }
+                        const blockedTodo = data.getTodoTask(opts.taskId, 'active');
+                        if (blockedTodo?.blocker_summary) {
+                            step.status = 'failed';
+                            step.result = blockedTodo.blocker_summary;
+                            step.error = blockedTodo.blocker_summary;
+                            step.completedAt = Date.now();
+                            failed.add(step.index);
+                            this.emitProgress(workflowId, step, steps, 'step-failed', opts?.onProgress, undefined, opts?.onWorkerChunk);
+                            try {
+                                const execId = step._execId;
+                                if (execId) {
+                                    data.updateStepExecution(execId, {
+                                        status: 'failed',
+                                        attempts: step.attempts,
+                                        error: step.error,
+                                        resultSummary: blockedTodo.blocker_summary.slice(0, 200),
+                                        completedAt: new Date().toISOString().replace('T', ' ').replace('Z', ''),
+                                    });
+                                }
+                            }
+                            catch { /* best effort */ }
+                            return;
+                        }
+                    }
                     const footer = (0, status_parser_1.parseStructuredFooter)(result);
                     const stepRole = this.inferRoleForStep(step);
                     if (stepRole !== 'qa' && (footer.status === 'PASS' || footer.status === 'FAIL')) {
@@ -1279,7 +1328,7 @@ class WorkflowEngine extends events_1.EventEmitter {
      */
     async executeStep(step, prompt, conversationId, opts, apiKey, workflowContext) {
         const profile = data.getAgentProfile(step.agentId);
-        const runtime = await this.resolveStepRuntime(step, profile, apiKey);
+        const runtime = await this.resolveStepRuntime(step, profile, apiKey, opts);
         let activeRuntime = runtime;
         let llm = (0, index_1.createProvider)(activeRuntime.providerName, {
             apiKey: activeRuntime.apiKey,
@@ -1298,11 +1347,13 @@ class WorkflowEngine extends events_1.EventEmitter {
         const toolDefs = (0, index_2.getAllToolDefinitions)();
         const workspacePath = opts?.workspacePath?.trim();
         const effectiveProjectDir = workspacePath || this.projectDir;
+        const unrestrictedCliProvider = index_1.CLI_PROVIDERS.has(step.provider);
         const toolCtx = (0, index_2.createToolContext)(effectiveProjectDir, {
             projectId: opts?.projectId ?? null,
             currentTodoTaskId: opts?.taskId,
             actorType: 'llm',
             actorId: step.agentName || step.agentId,
+            restrictFileAccessToProject: unrestrictedCliProvider ? false : undefined,
         });
         const isWorkflowWorker = opts?.workerMode !== false;
         let systemPrompt = profile?.soul_md
@@ -1348,6 +1399,9 @@ class WorkflowEngine extends events_1.EventEmitter {
         const MAX_ITERATIONS = safeguards_1.SAFEGUARDS.MAX_WORKFLOW_ITERATIONS;
         let incompleteExecutionRecoveries = 0;
         while (iteration < MAX_ITERATIONS) {
+            if (opts?.isOrchestrated && this.orchestratedTodoHandled(opts.taskId)) {
+                return this.buildOrchestratedTodoHandledResult(opts.taskId);
+            }
             iteration++;
             let streamedContent = '';
             let lastChunkProgressAt = 0;
@@ -1377,7 +1431,7 @@ class WorkflowEngine extends events_1.EventEmitter {
                             const now2 = Date.now();
                             if (chunkBuffer.length >= 80 || now2 - lastChunkForwardAt >= 150) {
                                 opts.onWorkerChunk({
-                                    type: 'chunk',
+                                    type: opts?.isOrchestrated ? 'worker_chunk' : 'chunk',
                                     stepId: step.id,
                                     agentName: step.agentName,
                                     description: step.description,
@@ -1410,7 +1464,7 @@ class WorkflowEngine extends events_1.EventEmitter {
                 // Flush remaining chunk buffer
                 if (opts?.onWorkerChunk && chunkBuffer) {
                     opts.onWorkerChunk({
-                        type: 'chunk',
+                        type: opts?.isOrchestrated ? 'worker_chunk' : 'chunk',
                         stepId: step.id,
                         agentName: step.agentName,
                         description: step.description,
@@ -1452,7 +1506,9 @@ class WorkflowEngine extends events_1.EventEmitter {
                     toolCalls: response.toolCalls,
                 });
                 for (const tc of response.toolCalls) {
-                    const permMode = (profile?.permission_mode || 'autopilot');
+                    const permMode = unrestrictedCliProvider
+                        ? 'autopilot'
+                        : (profile?.permission_mode || 'autopilot');
                     const approval = (0, approval_1.checkPermission)(tc.name, permMode);
                     if (!approval.approved) {
                         throw new Error(`APPROVAL_REQUIRED: ${approval.reason}`);
@@ -1460,7 +1516,7 @@ class WorkflowEngine extends events_1.EventEmitter {
                     // Emit tool_call event so UI can show what's happening
                     if (opts?.onWorkerChunk) {
                         opts.onWorkerChunk({
-                            type: 'tool_call',
+                            type: opts?.isOrchestrated ? 'worker_tool_call' : 'tool_call',
                             stepId: step.id,
                             agentName: step.agentName,
                             description: step.description,
@@ -1477,7 +1533,7 @@ class WorkflowEngine extends events_1.EventEmitter {
                     // Emit tool_result event
                     if (opts?.onWorkerChunk) {
                         opts.onWorkerChunk({
-                            type: 'tool_result',
+                            type: opts?.isOrchestrated ? 'worker_tool_result' : 'tool_result',
                             stepId: step.id,
                             agentName: step.agentName,
                             description: step.description,
@@ -1489,6 +1545,9 @@ class WorkflowEngine extends events_1.EventEmitter {
                             toolIsError: !result.success,
                         });
                     }
+                    if (opts?.isOrchestrated && this.orchestratedTodoHandled(opts.taskId)) {
+                        return this.buildOrchestratedTodoHandledResult(opts.taskId);
+                    }
                 }
                 if (opts?.isOrchestrated && this.orchestratedTodoHandled(opts.taskId)) {
                     return this.buildOrchestratedTodoHandledResult(opts.taskId);
@@ -1687,12 +1746,12 @@ class WorkflowEngine extends events_1.EventEmitter {
             default: return undefined;
         }
     }
-    async resolveStepRuntime(step, profile, apiKey) {
+    async resolveStepRuntime(step, profile, apiKey, opts) {
         if (step.provider === 'claude-cli') {
-            return this.resolveClaudeWorkflowRuntime(step, profile);
+            return this.resolveClaudeWorkflowRuntime(step, profile, opts?.disallowCliRuntime === true);
         }
         if (step.provider === 'codex-cli') {
-            return this.resolveCodexWorkflowRuntime(step, profile);
+            return this.resolveCodexWorkflowRuntime(step, profile, opts?.disallowCliRuntime === true);
         }
         const profileConnection = profile?.provider_connection_id
             ? data.getProviderConnection(profile.provider_connection_id)
@@ -1701,6 +1760,22 @@ class WorkflowEngine extends events_1.EventEmitter {
             || profileConnection?.api_key_enc
             || apiKey
             || this.resolveApiKey(step.provider);
+        if (!resolvedKey && step.provider === 'openai') {
+            const preferredModel = (0, subscription_runtime_1.resolveSubscriptionApiModel)(step.model || profile?.model, data.findProviderConnection('openai')?.default_model || undefined) || (step.model || profile?.model || 'default').trim() || 'default';
+            const subscriptionRuntime = await (0, subscription_runtime_1.resolveCodexSubscriptionRuntime)({
+                preferredModel,
+            });
+            if (subscriptionRuntime) {
+                return {
+                    providerName: subscriptionRuntime.providerName,
+                    apiKey: subscriptionRuntime.apiKey,
+                    model: subscriptionRuntime.model,
+                    runtimeLabel: 'Subscription API (Token)',
+                    ...(subscriptionRuntime.baseUrl ? { baseUrl: subscriptionRuntime.baseUrl } : {}),
+                    ...(subscriptionRuntime.apiStyle ? { apiStyle: subscriptionRuntime.apiStyle } : {}),
+                };
+            }
+        }
         if (!resolvedKey) {
             throw new Error(`No API key for provider ${step.provider}`);
         }
@@ -1711,7 +1786,7 @@ class WorkflowEngine extends events_1.EventEmitter {
             runtimeLabel: 'API Key',
         };
     }
-    async resolveClaudeWorkflowRuntime(step, profile) {
+    async resolveClaudeWorkflowRuntime(step, profile, disallowCliRuntime = false) {
         const preferredModel = (0, subscription_runtime_1.resolveSubscriptionApiModel)(step.model || profile?.model, data.findProviderConnection('anthropic')?.default_model || data.findProviderConnection('claude-cli')?.default_model || undefined) || (step.model || profile?.model || 'default').trim() || 'default';
         const apiKeyFallback = data.findProviderConnection('anthropic')?.api_key_enc || process.env.ANTHROPIC_API_KEY;
         const apiFallbackConfig = apiKeyFallback
@@ -1722,6 +1797,26 @@ class WorkflowEngine extends events_1.EventEmitter {
                 runtimeLabel: 'API Key',
             }
             : undefined;
+        if (disallowCliRuntime) {
+            const subscriptionRuntime = await (0, subscription_runtime_1.resolveClaudeSubscriptionRuntime)({
+                preferredModel,
+            });
+            if (subscriptionRuntime) {
+                return {
+                    providerName: subscriptionRuntime.providerName,
+                    apiKey: subscriptionRuntime.apiKey,
+                    model: subscriptionRuntime.model,
+                    runtimeLabel: 'Subscription API (Token)',
+                    ...(subscriptionRuntime.authMode ? { authMode: subscriptionRuntime.authMode } : {}),
+                    ...(subscriptionRuntime.baseUrl ? { baseUrl: subscriptionRuntime.baseUrl } : {}),
+                    ...(subscriptionRuntime.apiQuery ? { apiQuery: subscriptionRuntime.apiQuery } : {}),
+                    ...(subscriptionRuntime.extraHeaders ? { extraHeaders: subscriptionRuntime.extraHeaders } : {}),
+                };
+            }
+            if (apiFallbackConfig)
+                return apiFallbackConfig;
+            throw new Error('No non-CLI Anthropic runtime is available for this workflow step.');
+        }
         const cliFallbackConfig = {
             providerName: 'claude-cli',
             apiKey: 'cli-auth',
@@ -1731,11 +1826,35 @@ class WorkflowEngine extends events_1.EventEmitter {
         };
         return cliFallbackConfig;
     }
-    async resolveCodexWorkflowRuntime(step, profile) {
+    async resolveCodexWorkflowRuntime(step, profile, disallowCliRuntime = false) {
         const preferredModel = (0, subscription_runtime_1.resolveSubscriptionApiModel)(step.model || profile?.model, data.findProviderConnection('openai')?.default_model || data.findProviderConnection('codex-cli')?.default_model || undefined)
             || (step.model || profile?.model || 'default').trim()
             || 'default';
+        const subscriptionRuntime = await (0, subscription_runtime_1.resolveCodexSubscriptionRuntime)({
+            preferredModel,
+        });
+        if (subscriptionRuntime) {
+            return {
+                providerName: subscriptionRuntime.providerName,
+                apiKey: subscriptionRuntime.apiKey,
+                model: subscriptionRuntime.model,
+                runtimeLabel: 'Subscription API (Token)',
+                ...(subscriptionRuntime.baseUrl ? { baseUrl: subscriptionRuntime.baseUrl } : {}),
+                ...(subscriptionRuntime.apiStyle ? { apiStyle: subscriptionRuntime.apiStyle } : {}),
+            };
+        }
         const apiKeyFallback = data.findProviderConnection('openai')?.api_key_enc || process.env.OPENAI_API_KEY;
+        if (disallowCliRuntime) {
+            if (apiKeyFallback) {
+                return {
+                    providerName: 'openai',
+                    apiKey: apiKeyFallback,
+                    model: preferredModel,
+                    runtimeLabel: 'API Key',
+                };
+            }
+            throw new Error('No non-CLI OpenAI runtime is available for this workflow step.');
+        }
         return {
             providerName: 'codex-cli',
             apiKey: 'cli-auth',