funolio-agent 0.17.9 → 1.0.3

package/dist/workflow-engine.js

@@ -646,6 +646,46 @@ class WorkflowEngine extends events_1.EventEmitter {
             reasonLine,
         ].join('\n');
     }
+    buildOrchestratedTodoWorkerSystemPrompt(step, profile) {
+        const role = this.inferRoleForStep(step);
+        const roleLine = role === 'research'
+            ? 'Your role is researcher. Produce the requested plan or analysis, then complete the TODO through the worker tool.'
+            : role === 'qa'
+                ? 'Your role is QA. Verify the delivered work, then complete the TODO through the worker tool or create the next fix handoff.'
+                : 'Your role is implementer. Do the assigned work, then complete the TODO through the worker tool.';
+        return [
+            `You are ${profile?.name || 'a Funolio workflow worker'}.`,
+            'You are executing one orchestrated TODO task inside Funolio.',
+            roleLine,
+            'Follow the assignment in the user message exactly.',
+            'Use available tools when needed.',
+            'Do not return a plain-text final answer until you have called complete_worker_task or block_worker_task.',
+            'Do not add workflow planning, orchestration narration, or TODO-management commentary outside those tools.',
+            'If blocked after checking available context, call block_worker_task with blocker_summary, checked_context, and user_question.',
+            'If the task is complete, call complete_worker_task with output_summary and any needed handoff prompt or inserted next task.',
+        ].join('\n');
+    }
+    buildOrchestratedTodoHandledResult(taskId) {
+        if (!taskId)
+            return 'TODO handled.';
+        const completed = data.getTodoTask(taskId, 'completed');
+        if (completed) {
+            return completed.output_summary?.trim()
+                || completed.handoff_prompt?.trim()
+                || `Completed TODO #${taskId}.`;
+        }
+        const blocked = data.getTodoTask(taskId, 'active');
+        if (blocked?.blocker_summary) {
+            return blocked.blocker_summary.trim();
+        }
+        return `Handled TODO #${taskId}.`;
+    }
+    orchestratedTodoHandled(taskId) {
+        if (!taskId)
+            return false;
+        return Boolean(data.getTodoTask(taskId, 'completed')
+            || data.getTodoTask(taskId, 'active')?.blocker_summary);
+    }
     buildWorkflowStepPrompt(step, pinnedContext, handoffArtifacts) {
         const sections = [step.prompt.trim()];
         if (pinnedContext.length > 0) {
@@ -1250,12 +1290,17 @@ class WorkflowEngine extends events_1.EventEmitter {
             ...(activeRuntime.apiStyle ? { apiStyle: activeRuntime.apiStyle } : {}),
             ...(activeRuntime.authMode ? { authMode: activeRuntime.authMode } : {}),
             ...(activeRuntime.extraHeaders ? { extraHeaders: activeRuntime.extraHeaders } : {}),
+            ...(opts?.isOrchestrated ? { preserveMcpBridge: true } : {}),
+            ...(opts?.isOrchestrated ? { toolActorId: step.agentName } : {}),
+            ...(opts?.isOrchestrated ? { toolProjectId: opts?.projectId ?? null } : {}),
+            ...(opts?.isOrchestrated ? { currentTodoTaskId: opts?.taskId } : {}),
         });
         const toolDefs = (0, index_2.getAllToolDefinitions)();
         const workspacePath = opts?.workspacePath?.trim();
         const effectiveProjectDir = workspacePath || this.projectDir;
         const toolCtx = (0, index_2.createToolContext)(effectiveProjectDir, {
             projectId: opts?.projectId ?? null,
+            currentTodoTaskId: opts?.taskId,
             actorType: 'llm',
             actorId: step.agentName || step.agentId,
         });
@@ -1266,6 +1311,9 @@ class WorkflowEngine extends events_1.EventEmitter {
         if (opts?.systemPromptOverride?.trim()) {
             systemPrompt = opts.systemPromptOverride.trim();
         }
+        else if (opts?.isOrchestrated) {
+            systemPrompt = this.buildOrchestratedTodoWorkerSystemPrompt(step, profile);
+        }
         else if (isWorkflowWorker) {
             systemPrompt = this.buildWorkflowWorkerSystemPrompt(step, profile);
         }
@@ -1288,8 +1336,11 @@ class WorkflowEngine extends events_1.EventEmitter {
             });
             systemPrompt = built.systemPrompt;
         }
-        const messages = [{ role: 'user', content: prompt }];
-        const promptChars = prompt.length;
+        const effectivePrompt = opts?.isOrchestrated && opts?.taskId
+            ? `CURRENT TODO ID: ${opts.taskId}\nUse this TODO id when calling complete_worker_task or block_worker_task.\n\n${prompt}`
+            : prompt;
+        const messages = [{ role: 'user', content: effectivePrompt }];
+        const promptChars = effectivePrompt.length;
         const systemChars = systemPrompt.length;
         console.info(`[workflow-engine] step runtime: agent=${step.agentName} provider=${activeRuntime.providerName} model=${activeRuntime.model} runtime=${activeRuntime.runtimeLabel || 'unknown'} promptChars=${promptChars} systemChars=${systemChars} tools=${opts?.disableTools ? 0 : toolDefs.length}`);
         // Agentic loop
@@ -1303,11 +1354,14 @@ class WorkflowEngine extends events_1.EventEmitter {
             let emittedChunkHeartbeat = false;
             let chunkBuffer = '';
             let lastChunkForwardAt = 0;
-            const toolChoice = !opts?.disableTools
-                && !messages.some((message) => message.role === 'tool')
-                && this.stepRequiresConcreteArtifact(step, prompt)
-                ? 'required'
-                : 'auto';
+            const toolChoice = opts?.disableTools
+                ? 'auto'
+                : opts?.isOrchestrated
+                    ? 'required'
+                    : !messages.some((message) => message.role === 'tool')
+                        && this.stepRequiresConcreteArtifact(step, prompt)
+                        ? 'required'
+                        : 'auto';
             let response;
             try {
                 response = await llm.chat({
@@ -1380,6 +1434,10 @@ class WorkflowEngine extends events_1.EventEmitter {
                         ...(activeRuntime.apiStyle ? { apiStyle: activeRuntime.apiStyle } : {}),
                         ...(activeRuntime.authMode ? { authMode: activeRuntime.authMode } : {}),
                         ...(activeRuntime.extraHeaders ? { extraHeaders: activeRuntime.extraHeaders } : {}),
+                        ...(opts?.isOrchestrated ? { preserveMcpBridge: true } : {}),
+                        ...(opts?.isOrchestrated ? { toolActorId: step.agentName } : {}),
+                        ...(opts?.isOrchestrated ? { toolProjectId: opts?.projectId ?? null } : {}),
+                        ...(opts?.isOrchestrated ? { currentTodoTaskId: opts?.taskId } : {}),
                     });
                     console.warn(`[workflow-engine] ${step.agentName} runtime failed, retrying with ${activeRuntime.providerName}`);
                     iteration--;
@@ -1432,12 +1490,39 @@ class WorkflowEngine extends events_1.EventEmitter {
                         });
                     }
                 }
+                if (opts?.isOrchestrated && this.orchestratedTodoHandled(opts.taskId)) {
+                    return this.buildOrchestratedTodoHandledResult(opts.taskId);
+                }
                 continue;
             }
             // No tool calls — final response
             const content = response.content || streamedContent || '';
             const usedToolsThisStep = messages.some((message) => message.role === 'tool');
             const usedMutatingToolsThisStep = messages.some((message) => message.role === 'tool' && this.isMutatingToolName(message.toolName));
+            if (opts?.isOrchestrated && !this.orchestratedTodoHandled(opts.taskId)) {
+                const correction = [
+                    'You did not finish the orchestrated TODO correctly.',
+                    'Do not answer with plain text alone.',
+                    'You must call complete_worker_task when the task is done, or block_worker_task if you cannot proceed.',
+                    'If you already finished the work, call complete_worker_task now with output_summary and any needed handoff.',
+                    'If you are blocked, call block_worker_task now with blocker_summary, checked_context, and user_question.',
+                ].join(' ');
+                const preview = content.replace(/\s+/g, ' ').trim().slice(0, 240);
+                console.warn(`[workflow-engine] orchestrated TODO not completed through worker tool: agent=${step.agentName} iteration=${iteration} preview=${preview}`);
+                if (incompleteExecutionRecoveries < 1) {
+                    incompleteExecutionRecoveries++;
+                    if (content.trim()) {
+                        messages.push({ role: 'assistant', content });
+                    }
+                    messages.push({ role: 'user', content: correction });
+                    const activeSteps = workflowContext?.workflowId
+                        ? this.getActiveWorkflows().find((w) => w.id === workflowContext.workflowId)?.steps || [step]
+                        : [step];
+                    this.emitProgress(workflowContext?.workflowId || 'workflow', step, activeSteps, 'step-progress', opts?.onProgress, `${step.agentName} must finish the TODO using complete_worker_task or block_worker_task.`);
+                    continue;
+                }
+                throw new Error('INCOMPLETE_EXECUTION: The worker returned text without completing the TODO via complete_worker_task or block_worker_task.');
+            }
             // Parse structured footer for workflow steps
             const footer = (0, status_parser_1.parseStructuredFooter)(content);
             const artifactTargetsSatisfied = this.requiredArtifactTargetsSatisfied(step, prompt, effectiveProjectDir);
@@ -1478,6 +1563,10 @@ class WorkflowEngine extends events_1.EventEmitter {
                         ...(activeRuntime.apiStyle ? { apiStyle: activeRuntime.apiStyle } : {}),
                         ...(activeRuntime.authMode ? { authMode: activeRuntime.authMode } : {}),
                         ...(activeRuntime.extraHeaders ? { extraHeaders: activeRuntime.extraHeaders } : {}),
+                        ...(opts?.isOrchestrated ? { preserveMcpBridge: true } : {}),
+                        ...(opts?.isOrchestrated ? { toolActorId: step.agentName } : {}),
+                        ...(opts?.isOrchestrated ? { toolProjectId: opts?.projectId ?? null } : {}),
+                        ...(opts?.isOrchestrated ? { currentTodoTaskId: opts?.taskId } : {}),
                     });
                     incompleteExecutionRecoveries = 0;
                     iteration--;
@@ -1591,8 +1680,6 @@ class WorkflowEngine extends events_1.EventEmitter {
         const providerConnection = data.findProviderConnection(provider);
         if (providerConnection?.api_key_enc)
             return providerConnection.api_key_enc;
-        if (providerConnection?.oauth_token)
-            return providerConnection.oauth_token;
         switch (provider) {
             case 'anthropic': return process.env.ANTHROPIC_API_KEY;
             case 'openai': return process.env.OPENAI_API_KEY;
@@ -1612,7 +1699,6 @@ class WorkflowEngine extends events_1.EventEmitter {
             : undefined;
         const resolvedKey = profile?.api_key_enc
             || profileConnection?.api_key_enc
-            || profileConnection?.oauth_token
             || apiKey
             || this.resolveApiKey(step.provider);
         if (!resolvedKey) {
@@ -1626,9 +1712,6 @@ class WorkflowEngine extends events_1.EventEmitter {
         };
     }
     async resolveClaudeWorkflowRuntime(step, profile) {
-        const profileConnection = profile?.provider_connection_id
-            ? data.getProviderConnection(profile.provider_connection_id)
-            : undefined;
         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
@@ -1646,63 +1729,28 @@ class WorkflowEngine extends events_1.EventEmitter {
             runtimeLabel: 'Subscription CLI',
             ...(apiFallbackConfig ? { fallback: apiFallbackConfig } : {}),
         };
-        try {
-            const runtime = await (0, subscription_runtime_1.resolveClaudeSubscriptionRuntime)({
-                preferredModel,
-                inputToken: profileConnection?.access_mode === 'openclaw' ? (profileConnection.api_key_enc || null) : null,
-                inputAccessMode: profileConnection?.access_mode || null,
-            });
-            if (!runtime)
-                return cliFallbackConfig;
-            return {
-                providerName: runtime.providerName,
-                apiKey: runtime.apiKey,
-                model: runtime.model,
-                runtimeLabel: (0, subscription_runtime_1.claudeSubscriptionRuntimeLabel)(runtime.source),
-                requestShape: (0, subscription_runtime_1.resolveClaudeSubscriptionRequestShape)(runtime.source),
-                baseUrl: runtime.baseUrl,
-                apiQuery: runtime.apiQuery,
-                authMode: runtime.authMode,
-                extraHeaders: runtime.extraHeaders,
-                fallback: cliFallbackConfig,
-            };
-        }
-        catch (err) {
-            console.warn(`[workflow-engine] Claude subscription auth failed: ${err?.message || err}`);
-            return cliFallbackConfig;
-        }
+        return cliFallbackConfig;
     }
     async resolveCodexWorkflowRuntime(step, profile) {
         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';
-        try {
-            const runtime = await (0, subscription_runtime_1.resolveCodexSubscriptionRuntime)({ preferredModel });
-            if (runtime) {
-                return {
-                    providerName: runtime.providerName,
-                    apiKey: runtime.apiKey,
-                    model: runtime.model,
-                    runtimeLabel: 'Subscription API',
-                    baseUrl: runtime.baseUrl,
-                    apiStyle: runtime.apiStyle,
-                    fallback: {
-                        providerName: 'codex-cli',
-                        apiKey: 'cli-auth',
-                        model: (step.model || profile?.model || 'default').trim() || 'default',
-                        runtimeLabel: 'Subscription CLI',
-                    },
-                };
-            }
-        }
-        catch (err) {
-            console.warn(`[workflow-engine] Codex subscription auth failed: ${err?.message || err}`);
-        }
+        const apiKeyFallback = data.findProviderConnection('openai')?.api_key_enc || process.env.OPENAI_API_KEY;
         return {
             providerName: 'codex-cli',
             apiKey: 'cli-auth',
             model: (step.model || profile?.model || 'default').trim() || 'default',
             runtimeLabel: 'Subscription CLI',
+            ...(apiKeyFallback
+                ? {
+                    fallback: {
+                        providerName: 'openai',
+                        apiKey: apiKeyFallback,
+                        model: preferredModel,
+                        runtimeLabel: 'API Key',
+                    },
+                }
+                : {}),
         };
     }
     async preflightWorkflowReadiness(steps) {
@@ -1717,28 +1765,9 @@ class WorkflowEngine extends events_1.EventEmitter {
                 failures.push({ step, reason: `Bot profile ${step.agentId} is missing.` });
                 continue;
             }
-            if (profile.provider === 'claude-cli') {
-                const runtime = await (0, subscription_runtime_1.resolveClaudeSubscriptionRuntime)({
-                    preferredModel: profile.model,
-                }).catch(() => null);
-                if (runtime?.apiKey)
-                    continue;
-                failures.push({
-                    step,
-                    reason: `${profile.name} is not authenticated for Claude subscription access. Reconnect Claude login before running this workflow.`,
-                });
-                continue;
-            }
-            if (profile.provider === 'codex-cli') {
-                const runtime = await (0, subscription_runtime_1.resolveCodexSubscriptionRuntime)({
-                    preferredModel: profile.model,
-                }).catch(() => null);
-                if (runtime?.apiKey)
-                    continue;
-                failures.push({
-                    step,
-                    reason: `${profile.name} is not authenticated for Codex subscription access. Reconnect OpenAI/Codex login before running this workflow.`,
-                });
+            // CLI providers handle their own auth — skip subscription checks
+            // (subscription API has been removed; CLI binary manages credentials directly)
+            if (profile.provider === 'claude-cli' || profile.provider === 'codex-cli') {
                 continue;
             }
             const apiKey = profile.api_key_enc || this.resolveApiKey(profile.provider);