@pentoshi/clai 3.17.0 → 3.18.1

package/dist/agent/runner.js

@@ -70,14 +70,14 @@ import { stripSentinelTokens, parseToolCall, recognizeBareToolJson, looksLikeTru
 import { createSessionPolicy, isPreApprovalAllowedTool, isPlanModeAllowedShellCommand, isPlanModeAllowedTool, isPlanApprovedByStatus, planHasOpenWork, isAbortError, shouldEnableImageOcr, } from "./session-policy.js";
 import { saveToolOutput, summarizeOutput, formatToolContext, } from "./tool-output-formatting.js";
 import { codingSessionFromContext, isProtocolPlaceholderOutput, progressPauseMode, } from "./progress-pause-policy.js";
-import { renderPlanForTerminal, planContextMessage, upsertPlanContextMessage, handlePlanTool, resolvePlanTaskId, } from "./plan-tool.js";
+import { renderPlanForTerminal, planContextMessage, removePlanContextMessage, upsertPlanContextMessage, handlePlanTool, resolvePlanTaskId, } from "./plan-tool.js";
 import { readDeclaredParentTaskId, resolveResponderParent, isExplicitResponderDelegation, delegationTaskTitle, } from "./responder-parent.js";
 import { readTaskUpdateArgs, distinctAdvancingTaskIds, isSimultaneousTaskAdvance, batchUpdateSignature, buildMultiUpdateReminder, buildMultiOpenRejection, multiUpdateToast, multiOpenToast, openingTaskIds, } from "./task-sync.js";
 import { absorbLooseWorkIntoLedger, applyDestinationCwd, canMarkTaskDone, hasLocalRuntimeProof, hasRemoteWorkProof, isDevServerCall, isEvidenceWorkTool, isFeatureImplementationCall, isPackageInstallCommand, isPlanPreflightTool, isPortListeningOutput, isReadOnlyReconTool, isRemoteActiveTestCall, isRemoteReconToolCall, isScaffoldCreateCommand, isServerReadyOutput, ledgerFromTaskEvidence, pickPendingTaskForToolCall, recordTaskWorkSuccess, resolveUserDestinationHint, taskEvidenceFromLedger, TOOL_ABORT_GRACE_MS, toolHardBudgetMs, toolStallBudgetMs, userAskedForFeatureApp, } from "./task-evidence.js";
 import { buildSessionStateBlock, inferNextHint, upsertSessionStateMessage, } from "./session-state.js";
 import { buildContinueOrientation, looksLikeContinueOrResumePrompt, } from "./continue-orient.js";
 import { detectPackageManager } from "./workspace-orient.js";
-import { budgetRemaining, consumeBudget, createRecoveryBudgets, } from "./must-continue.js";
+import { consumeBudget, createRecoveryBudgets, } from "./must-continue.js";
 import { chooseFinalizeRecovery } from "./finalize-gate.js";
 import { outOfScopeToolMessage, scopeContextMessage } from "./scope-context.js";
 import { EngagementPolicyEngine, actionFromUrl, engagementActionsForToolCall, evaluateEngagementAction, } from "../safety/engagement-policy.js";
@@ -1040,11 +1040,13 @@ export async function runAgentTurn(prompt, options = {}) {
             if (idleOrSocialPrompt || informationalQuery)
                 return;
             const runningJobs = jobManager.getRunningJobs(session.sessionId);
-            const p = plan ?? activePlan;
+            const p = plan === null ? undefined : plan ?? activePlan;
             if (!buildLikeTurn &&
                 !pentestLikeTurn &&
                 !p &&
                 runningJobs.length === 0) {
+                if (plan === null)
+                    removePlanContextMessage(messages);
                 return;
             }
             const root = getActiveProjectRoot() ?? p?.meta?.projectRoot;
@@ -1090,6 +1092,9 @@ export async function runAgentTurn(prompt, options = {}) {
             if (p) {
                 upsertPlanContextMessage(messages, planContextMessage(p, session.planApproved.value));
             }
+            else {
+                removePlanContextMessage(messages);
+            }
             upsertSessionStateMessage(messages, buildSessionStateBlock(snap));
         };
         refreshSessionState(activePlan);
@@ -1373,12 +1378,7 @@ export async function runAgentTurn(prompt, options = {}) {
                 loopGuard.recordAttempt(step, call.name, call.args, true, 0, output);
                 return { ok: true, call, result, contextOutput: output };
             }
-            if (call.name === "plan.create" ||
-                call.name === "task.add" ||
-                call.name === "task.move" ||
-                call.name === "job.read" ||
-                call.name === "task.read" ||
-                call.name === "task.update") {
+            if (RUNNER_META_TOOL_NAMES.has(call.name)) {
                 if (call.name === "job.read" || call.name === "task.read") {
                     const requestedNotificationId = typeof call.args.notificationId === "string"
                         ? call.args.notificationId.trim()
@@ -1589,6 +1589,13 @@ export async function runAgentTurn(prompt, options = {}) {
                         if (root)
                             setActiveProjectRootIfValid(root);
                     }
+                    if (planResult.ok && planResult.cleared) {
+                        pendingSessionStatePlan = null;
+                        removePlanContextMessage(messages);
+                        emit({ type: "plan-cleared", sessionId: session.sessionId });
+                        if (writesDirectly)
+                            process.stdout.write(planResult.display);
+                    }
                     const result = { ok: planResult.ok, output: planResult.modelNote };
                     emitToolResult(toolEventId, result, planResult.modelNote);
                     const statusIcon = result.ok ? chalk.green("  ✓") : chalk.red("  ✗");
@@ -4107,8 +4114,7 @@ export async function runAgentTurn(prompt, options = {}) {
                             "If analysis is incomplete, call only the bounded evidence tool needed now. If each result has been analyzed and is satisfactory, you MUST call job.read with its jobId or exact notificationId before giving a final response. job.read does not require an active plan; do not create or update a plan merely to acknowledge a result."));
                         continue;
                     }
-                    const deferResponderReport = session.planApproved.value &&
-                        budgetRemaining(recovery, "prematureComplete")
+                    const deferResponderReport = session.planApproved.value
                         ? shouldYieldForDeclaredResponderDependency(livePlanAtCompletion, jobManager.getRunningJobs(session.sessionId), jobManager.getPendingNotifications(session.sessionId), responderWakeNotificationId)
                         : false;
                     const finalizeRecovery = chooseFinalizeRecovery({
@@ -4414,13 +4420,32 @@ export async function runAgentTurn(prompt, options = {}) {
                 if (allCalls.length > 1) {
                     writeNotice("info", `${allCalls.length} tool calls in this message — read-only in parallel, writes in order (failures do not cancel siblings)`, chalk.dim(`  ℹ ${allCalls.length} tool calls — parallel reads, ordered writes; failures continue\n`));
                 }
-                for (const deferred of activeDeferredToolCalls.slice(0, allCalls.length)) {
+                // Cards streamed from partial text can predate their arguments. The
+                // executed call is authoritative, so refresh a stale card in place
+                // (same event id → the reducer updates the queued row, no new card).
+                const flushableDeferred = activeDeferredToolCalls.slice(0, allCalls.length);
+                for (let i = 0; i < flushableDeferred.length; i += 1) {
+                    const deferred = flushableDeferred[i];
                     if (!deferred.call.name || deferred.call.name === "…")
                         continue;
+                    const finalCall = allCalls[i];
+                    const stale = finalCall !== undefined &&
+                        (finalCall.name !== deferred.call.name ||
+                            formatToolArgs(finalCall) !== formatToolArgs(deferred.call));
+                    if (stale) {
+                        deferred.call = finalCall;
+                        const refreshedLine = chalk.cyan(`  ▶ ${finalCall.name}`) +
+                            chalk.gray(` ${formatToolArgs(finalCall)}`);
+                        deferred.rendered =
+                            styleToolChatter(finalCall, refreshedLine) + "\n";
+                    }
                     if (!deferred.shown) {
                         writeToolCall(deferred.eventId, deferred.call, deferred.rendered);
                         deferred.shown = true;
                     }
+                    else if (stale) {
+                        writeToolCall(deferred.eventId, deferred.call, "");
+                    }
                 }
                 if (historyNativeCalls.length) {
                     appendAssistantWithTools(messages, beforeTool ?? "", historyNativeCalls, completion.reasoningBlock ??
@@ -4579,7 +4604,6 @@ export async function runAgentTurn(prompt, options = {}) {
                         sawSuccessfulMutation = false;
                     }
                     if (res.ok && isEvidenceWorkTool(res.call.name)) {
-                        recovery.prematureComplete = 0;
                         recovery.actionIntent = 0;
                         recovery.errorFix = 0;
                     }