chainlesschain 0.166.138 → 0.166.140

package/src/lib/tool-result-preview.js

@@ -33,7 +33,7 @@ const PREVIEW_HINT =
   "Tool output truncated. Narrow the request: filter/count locally, select fields, search_files, or read_file with offset/limit. Omitted text is not full-output evidence.";
 
 /** Check only host-created excerpts; original uncut tool text still reaches ingress. */
-function completeExcerpt(text, tool) {
+export function canProjectHostToolExcerpt(text, tool) {
   const scan = createEvidenceJsonTextBoundary((message) => new Error(message), {
     ...EVIDENCE_JSON_POLICY,
     sourceLiteralPolicy: "explicit-source-containers-v1",
@@ -239,7 +239,8 @@ export function safeHostToolResultForModel(tool, result) {
   let safe = result;
   for (const field of fields) {
     const text = result[field];
-    if (typeof text !== "string" || completeExcerpt(text, tool)) continue;
+    if (typeof text !== "string" || canProjectHostToolExcerpt(text, tool))
+      continue;
     if (safe === result) safe = { ...result };
     safe[field] =
       tool === "read_file"
@@ -268,7 +269,10 @@ export function boundedCommandOutput(output, max, tool = "run_code") {
       output,
       Math.max(1, Math.floor(max / 2)),
     );
-    if (JSON.stringify(preview).length <= max && completeExcerpt(preview, tool))
+    if (
+      JSON.stringify(preview).length <= max &&
+      canProjectHostToolExcerpt(preview, tool)
+    )
       return preview;
   } else if (!/[{}\[\]"']/u.test(output)) {
     let low = 0;

package/src/runtime/agent-core.js

@@ -64,6 +64,11 @@ import {
 import { ReadFileLoopGuard } from "../lib/read-file-loop-guard.js";
 const READ_FILE_REQUEST_CONTEXT = Symbol("read-file-request-context");
 import { gitToolInputError } from "../lib/git-tool-input.js";
+import {
+  parseToolArguments,
+  projectRejectedToolArguments,
+  TOOL_ARGUMENTS_INVALID_CODE,
+} from "./tool-argument-recovery.js";
 import { shellOutputPage, shellOutputPreview } from "../lib/shell-output.js";
 import {
   boundedToolResultText,
@@ -77,7 +82,12 @@ import {
   CODING_TASK_QUALITY_GUIDANCE,
   CODING_CHANGE_REVIEW_PROMPT,
 } from "../lib/coding-task-guidance.js";
-import { CodingChangeReviewContext } from "../lib/coding-change-review-context.js";
+import {
+  CodingChangeReviewContext,
+  changeReviewBudgetNotice,
+  changeReviewBudgetInsufficientError,
+  canReserveChangeReview,
+} from "../lib/coding-change-review-context.js";
 import { RemoteReadLoopGuard } from "../lib/remote-read-loop-guard.js";
 import {
   isPrActionRequest,
@@ -12257,6 +12267,7 @@ function _openAIProviderRequestReceipt(response, data, clientRequestId) {
  * @returns {Promise<object>} response with .message
  */
 export async function chatWithTools(rawMessages, options) {
+  rawMessages = projectRejectedToolArguments(rawMessages);
   if (options.serviceTier != null) {
     resolveModelServiceTier(
       resolveModelCapabilityProfile(options),
@@ -15608,6 +15619,37 @@ export async function* agentLoop(messages, options) {
   toolContext.readFileLoopGuard = readFileLoopGuard;
   let lastTaskProgressIntervention = null;
 
+  // Both an author completion and the reserved review window enter the same
+  // phase. Neither path manufactures an author response or adds request budget.
+  const beginChangeReview = (draft = null) => {
+    throwIfAborted(signal);
+    if (budget.remaining() < 2)
+      throw changeReviewBudgetInsufficientError(budget.remaining());
+    if (independentReviewSetupError) throw independentReviewSetupError;
+    changeReviewState.requested = true;
+    const reviewPrompt = markRuntimeOnlySessionMessage({
+      role: "user",
+      content: CODING_CHANGE_REVIEW_PROMPT,
+    });
+    if (draft)
+      appendMessages(
+        markRuntimeOnlySessionMessage({
+          role: "assistant",
+          content: draft.content || "",
+        }),
+      );
+    appendMessages(reviewPrompt);
+    if (independentReviewContext) {
+      independentReviewContext.activate(reviewPrompt);
+      changeReviewState.independentReviewPending = true;
+      readFileLoopGuard = new ReadFileLoopGuard();
+      remoteReadLoopGuard = new RemoteReadLoopGuard();
+      taskProgressTracker = new TaskProgressTracker();
+      toolContext.readFileLoopGuard = readFileLoopGuard;
+      lastTaskProgressIntervention = null;
+    }
+  };
+
   while (budget.hasRemaining()) {
     if (loopMcpCatalog) {
       currentMcpSnapshot = readMcpToolCatalog(loopMcpCatalog);
@@ -15654,6 +15696,24 @@ export async function* agentLoop(messages, options) {
       return;
     }
     readFileLoopGuard.finishBatch();
+    if (
+      canReserveChangeReview({
+        enabled: options.reviewChanges,
+        changed: hasFileContentChanges,
+        requested: changeReviewState.requested,
+        usageKnown: changeReviewState.usageKnown,
+        pendingMutations: pendingSubtreeMutations.size,
+        pendingChildren: backgroundSubAgents.size,
+        remaining: budget.remaining(),
+        limit: budget.limit,
+      })
+    ) {
+      beginChangeReview();
+      yield {
+        type: "iteration-warning",
+        message: "Reviewing changed files against the task before finishing.",
+      };
+    }
     if (remoteReadLoopGuard.stalled && !remoteReadLoopGuard.synthesisRequired) {
       await _awaitBackgroundUsageSettlement(
         backgroundSubAgents,
@@ -16585,7 +16645,10 @@ export async function* agentLoop(messages, options) {
             `Execution budget: this request plus ${furtherRequests} further model requests. ` +
             "For requested changes, reserve requests for implementation, focused validation, and repair or an accurate unfinished-work report. " +
             "Reading or an existing passing baseline does not deliver requested changes. " +
-            "For research or monitoring, use the remaining requests for evidence and the requested answer; do not create files just to show activity.",
+            "For research or monitoring, use the remaining requests for evidence and the requested answer; do not create files just to show activity." +
+            (options.reviewChanges === true
+              ? changeReviewBudgetNotice(budget, changeReviewState.requested)
+              : ""),
         },
       ];
       contextMemoryTrustedSystemIndexes.push(callMessages.length - 1);
@@ -16988,7 +17051,7 @@ export async function* agentLoop(messages, options) {
     }
     throwIfAborted(signal);
     if (
-      independentReviewContext?.active &&
+      options.reviewChanges === true &&
       changeReviewState.usageKnown === false
     ) {
       const error = new Error(
@@ -17247,42 +17310,14 @@ export async function* agentLoop(messages, options) {
         };
         return;
       }
-      // Opt-in review uses the same loop, tools, usage settlement and budget.
-      // Never emit a provisional completion or turn this self-check into an
-      // acceptance verdict. Failed/deferred writes do not arm the review.
+      // Author completion is provisional until the independent review phase.
       if (
         options.reviewChanges === true &&
         hasFileContentChanges &&
         !changeReviewState.requested &&
-        changeReviewState.usageKnown !== false &&
-        budget.hasRemaining()
+        changeReviewState.usageKnown !== false
       ) {
-        throwIfAborted(signal);
-        if (independentReviewSetupError) throw independentReviewSetupError;
-        changeReviewState.requested = true;
-        const reviewPrompt = markRuntimeOnlySessionMessage({
-          role: "user",
-          content: CODING_CHANGE_REVIEW_PROMPT,
-        });
-        appendMessages(
-          markRuntimeOnlySessionMessage({
-            role: "assistant",
-            content: msg.content || "",
-          }),
-          reviewPrompt,
-        );
-        if (independentReviewContext) {
-          independentReviewContext.activate(reviewPrompt);
-          changeReviewState.independentReviewPending = true;
-          // These are phase-local discovery hints, not permission or spend
-          // authorities. Fresh inspection must not inherit author assertions,
-          // old visible file pages, or a pause caused by author exploration.
-          readFileLoopGuard = new ReadFileLoopGuard();
-          remoteReadLoopGuard = new RemoteReadLoopGuard();
-          taskProgressTracker = new TaskProgressTracker();
-          toolContext.readFileLoopGuard = readFileLoopGuard;
-          lastTaskProgressIntervention = null;
-        }
+        beginChangeReview(msg);
         yield {
           type: "iteration-warning",
           message: "Reviewing changed files against the task before finishing.",
@@ -17448,6 +17483,7 @@ export async function* agentLoop(messages, options) {
       toolCalls.every(
         (c) =>
           typeof c?.function?.name === "string" &&
+          parseToolArguments(c.function.arguments) !== null &&
           !pausedTools.has(c.function.name) &&
           _CHECKPOINT_READ_ONLY.has(c.function.name),
       );
@@ -17456,15 +17492,7 @@ export async function* agentLoop(messages, options) {
       const turnId = `${runId}:t${budget.consumed}`;
       const toolBatchRecords = [];
       const prepared = toolCalls.map((call) => {
-        let toolArgs;
-        try {
-          toolArgs =
-            typeof call.function.arguments === "string"
-              ? JSON.parse(call.function.arguments)
-              : call.function.arguments;
-        } catch {
-          toolArgs = {};
-        }
+        const toolArgs = parseToolArguments(call.function.arguments);
         const workflowBinding = _workflowToolEffectBinding(
           workflowEffectId,
           workflowEffectId ? (workflowChildEffectSequence += 1) : 0,
@@ -17669,15 +17697,39 @@ export async function* agentLoop(messages, options) {
         });
         continue;
       }
-      let toolArgs;
-
-      try {
-        toolArgs =
-          typeof fn.arguments === "string"
-            ? JSON.parse(fn.arguments)
-            : fn.arguments;
-      } catch {
-        toolArgs = {};
+      const toolArgs = parseToolArguments(fn.arguments);
+      if (toolArgs === null) {
+        const result = {
+          code: TOOL_ARGUMENTS_INVALID_CODE,
+          execution_started: false,
+          error:
+            "Tool arguments must be a valid JSON object. No tool was executed. " +
+            "Issue a new call with valid arguments if still appropriate.",
+        };
+        yield {
+          type: "tool-pre-execution-denied",
+          tool: toolName,
+          tool_use_id: call.id,
+          turn_id: turnId,
+          preExecutionDenied: true,
+          execution_started: false,
+        };
+        yield {
+          type: "tool-result",
+          tool: toolName,
+          result,
+          error: result.error,
+          tool_use_id: call.id,
+          turn_id: turnId,
+          preExecutionDenied: true,
+          execution_started: false,
+        };
+        appendMessages({
+          role: "tool",
+          content: JSON.stringify(result),
+          tool_call_id: call.id,
+        });
+        continue;
       }
 
       // Capability and exact-path authority must settle before any checkpoint,

package/src/runtime/tool-argument-recovery.js

@@ -0,0 +1,111 @@
+export const TOOL_ARGUMENTS_INVALID_CODE = "CC_TOOL_ARGUMENTS_INVALID";
+
+// Never infer executable arguments from a partial provider response. In
+// particular, a parse failure must not become an executable empty object.
+export function parseToolArguments(value) {
+  try {
+    const args = typeof value === "string" ? JSON.parse(value) : value;
+    if (!args || typeof args !== "object" || Array.isArray(args)) return null;
+    const prototype = Object.getPrototypeOf(args);
+    return prototype === Object.prototype || prototype === null ? args : null;
+  } catch {
+    return null;
+  }
+}
+
+function isUnexecutedArgumentRejection(result) {
+  return (
+    (result?.code === TOOL_ARGUMENTS_INVALID_CODE &&
+      result.execution_started === false) ||
+    (result?.policy?.code === "CC_RUN_CODE_EXECUTION_SNAPSHOT_INVALID" &&
+      result.policy.via === "run-code-execution-snapshot" &&
+      result.policy.decision === "blocked")
+  );
+}
+
+// Old sessions can contain a malformed provider call paired with a dispatch
+// rejection. Keep the durable transcript intact; derive a model-only copy so
+// that strict JSON projection and strict providers can admit the next turn.
+// This grants no execution authority and never repairs or forwards the bad text.
+export function projectRejectedToolArguments(messages) {
+  const callCounts = new Map();
+  const resultCounts = new Map();
+  for (const message of messages) {
+    if (message.role === "assistant" && Array.isArray(message.tool_calls)) {
+      for (const call of message.tool_calls) {
+        callCounts.set(call?.id, (callCounts.get(call?.id) || 0) + 1);
+      }
+    }
+    if (message.role === "tool") {
+      const id = message.tool_call_id;
+      resultCounts.set(id, (resultCounts.get(id) || 0) + 1);
+    }
+  }
+  let output = messages;
+  for (let index = 0; index < messages.length; index++) {
+    const message = messages[index];
+    if (message.role !== "assistant" || !Array.isArray(message.tool_calls))
+      continue;
+    for (
+      let callIndex = 0;
+      callIndex < message.tool_calls.length;
+      callIndex++
+    ) {
+      const call = message.tool_calls[callIndex];
+      if (
+        typeof call?.id !== "string" ||
+        !call.id ||
+        callCounts.get(call.id) !== 1 ||
+        resultCounts.get(call.id) !== 1 ||
+        !call.function ||
+        (call.function.arguments !== null &&
+          typeof call.function.arguments === "object" &&
+          !Array.isArray(call.function.arguments)) ||
+        ["function", "symbol", "bigint"].includes(
+          typeof call.function.arguments,
+        ) ||
+        parseToolArguments(call.function.arguments) !== null
+      )
+        continue;
+      let resultIndex = index + 1;
+      while (
+        resultIndex < messages.length &&
+        messages[resultIndex].role === "tool" &&
+        messages[resultIndex].tool_call_id !== call.id
+      )
+        resultIndex++;
+      const result = messages[resultIndex];
+      if (result?.role !== "tool" || result.tool_call_id !== call.id) continue;
+      let content;
+      try {
+        content = JSON.parse(result.content);
+      } catch {
+        continue;
+      }
+      if (!isUnexecutedArgumentRejection(content)) continue;
+      // The legacy dispatch code belongs only to run_code.
+      if (
+        content.code !== TOOL_ARGUMENTS_INVALID_CODE &&
+        call.function.name !== "run_code"
+      )
+        continue;
+      if (output === messages) output = [...messages];
+      const calls = [...output[index].tool_calls];
+      calls[callIndex] = {
+        ...call,
+        function: { ...call.function, arguments: "{}" },
+      };
+      output[index] = { ...output[index], tool_calls: calls };
+      output[resultIndex] = {
+        ...result,
+        content: JSON.stringify({
+          ...content,
+          argumentRecovery:
+            "Malformed original arguments were omitted from this model request. " +
+            "The call was rejected before execution. Issue a new call with a valid JSON object if still appropriate.",
+        }),
+      };
+    }
+  }
+  return output;
+}

package/src/assets/web-panel/assets/index-DoVoNjtJ.js

@@ -1 +0,0 @@
-import{A as o}from"./Row-h7ovueJc.js";import{$ as t}from"./index-3RqDry-K.js";import"./responsiveObserve-CHw_f2d3.js";import"./vendor-BXcBOG8b.js";import"./useFlexGapSupport-_tbIIFMu.js";import"./styleChecker-DMybAFsA.js";import"./index-CjHA_Q7s.js";import"./icons-DlxlFL4g.js";const l=t(o);export{l as default};

package/src/assets/web-panel/assets/index-xlS8pDS2.js

@@ -1 +0,0 @@
-import{C as o}from"./Col-IO1NEUYL.js";import{$ as t}from"./index-3RqDry-K.js";import"./index-CjHA_Q7s.js";import"./vendor-BXcBOG8b.js";import"./icons-DlxlFL4g.js";const s=t(o);export{s as default};