@pentoshi/clai 4.19.0 → 5.1.0

package/dist/agent/turn/loop/stream-session.js

@@ -1,11 +1,12 @@
 import { createThinkingStreamParser } from "../../../ui/thinking.js";
 import { parseAllToolCalls } from "../../tool-call-parser.js";
 import { canonicalizeTurnCall } from "./canonicalize-turn-call.js";
-import { fromWireName } from "../../../llm/tool-protocol.js";
 import { isProviderFailureStatus, providerWaitLabel } from "../../../llm/key-rotation.js";
+import { createPendingToolCalls } from "./pending-tool-calls.js";
 const HEARTBEAT_MS = 10_000;
-const LARGE_ARGS_BYTES = 4096;
 const streamPhase = (state) => {
+    if (state.toolStatus)
+        return state.toolStatus;
     if (state.generatedTokens > 0 && !state.inThinking)
         return "responding";
     if (state.sawReasoning)
@@ -44,6 +45,7 @@ const applyThinkingTransitions = (ports, state, token) => {
 };
 const applyReasoningDelta = (ports, state, text) => {
     state.waitingForProvider = false;
+    state.toolStatus = undefined;
     state.streamedReasoningText += text;
     state.typedReasoningOpen = true;
     state.sawReasoning = true;
@@ -55,9 +57,6 @@ const applyReasoningDelta = (ports, state, text) => {
     }
     ports.emitThinkingDelta(text);
 };
-const toolCallDeltaStatus = (name, argumentsBytes) => argumentsBytes && argumentsBytes >= LARGE_ARGS_BYTES
-    ? `${name} (${Math.round(argumentsBytes / 1024)}KB args)`
-    : name;
 const routeProviderStatus = (ports, state, status) => {
     const full = status.replace(/\s+/g, " ").trim();
     if (!full)
@@ -80,21 +79,43 @@ const createSessionDeltaParser = (ports, state) => createThinkingStreamParser(po
     }
     ports.emitThinkingDelta(text);
 });
+const initialStreamState = () => ({
+    waitingForProvider: false,
+    sawReasoning: false,
+    inThinking: false,
+    emittedThinkingStatus: false,
+    generatedTokens: 0,
+    accumulatedText: "",
+    streamedReasoningText: "",
+    typedReasoningOpen: false,
+    streamedCallsCount: 0,
+});
+function applyToolCallDelta(ports, state, cards, delta) {
+    const observed = cards.observe(delta);
+    if (!observed)
+        return;
+    state.waitingForProvider = false;
+    state.inThinking = false;
+    state.typedReasoningOpen = false;
+    state.toolStatus = observed.status;
+    if (observed.changed)
+        ports.emitStatus(observed.status);
+}
+function routeStreamEvent(ports, state, onToolCallDelta, event) {
+    if (event.type === "reasoning_delta") {
+        applyReasoningDelta(ports, state, event.text);
+        return;
+    }
+    if (event.type === "tool_call_started" || event.type === "tool_call_completed" || event.type === "tool_arguments_delta") {
+        onToolCallDelta(event);
+    }
+}
 export const createStreamSession = (ports) => {
-    const state = {
-        waitingForProvider: false,
-        sawReasoning: false,
-        inThinking: false,
-        emittedThinkingStatus: false,
-        generatedTokens: 0,
-        accumulatedText: "",
-        streamedReasoningText: "",
-        typedReasoningOpen: false,
-        streamedCallsCount: 0,
-    };
+    const state = initialStreamState();
     const deferredToolCalls = [];
-    const streamedNativeCallNames = new Map();
     const callIds = [];
+    const cards = createPendingToolCalls(ports, callIds);
+    const onToolCallDelta = (delta) => applyToolCallDelta(ports, state, cards, delta);
     const deltaParser = createSessionDeltaParser(ports, state);
     const heartbeat = setInterval(() => {
         if (!state.waitingForProvider)
@@ -106,12 +127,13 @@ export const createStreamSession = (ports) => {
         streamedReasoningText: () => state.streamedReasoningText,
         sawReasoning: () => state.sawReasoning,
         deferredToolCalls,
-        streamedNativeCallNames,
+        streamedNativeCallNames: cards.names,
         callIds,
         onToken: (token) => {
             if (!token)
                 return;
             state.waitingForProvider = false;
+            state.toolStatus = undefined;
             deltaParser.push(token);
             state.generatedTokens += 1;
             state.accumulatedText += token;
@@ -121,19 +143,9 @@ export const createStreamSession = (ports) => {
             applyThinkingTransitions(ports, state, token);
         },
         onStatus: (status) => routeProviderStatus(ports, state, status),
-        onStreamEvent: (event) => {
-            if (event.type !== "reasoning_delta")
-                return;
-            applyReasoningDelta(ports, state, event.text);
-        },
-        onToolCallDelta: (delta) => {
-            if (!delta.name)
-                return;
-            state.waitingForProvider = false;
-            const name = fromWireName(delta.name) ?? delta.name;
-            streamedNativeCallNames.set(delta.index, name);
-            ports.emitStatus(toolCallDeltaStatus(name, delta.argumentsBytes));
-        },
+        onStreamEvent: (event) => routeStreamEvent(ports, state, onToolCallDelta, event),
+        onToolCallDelta,
+        finishToolCalls: cards.finish,
         onSuccessfulRequest: ports.onSuccessfulRequest,
         finishDeltaParser: () => deltaParser.finish(),
         stopHeartbeat: () => clearInterval(heartbeat),

package/dist/agent/turn/loop/stream-session.js.map

@@ -1 +1 @@
-{"version":3,"file":"stream-session.js","sourceRoot":"","sources":["../../../../src/agent/turn/loop/stream-session.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAA8B,MAAM,6BAA6B,CAAC;AAC/F,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAE1F,MAAM,YAAY,GAAG,MAAM,CAAC;AAC5B,MAAM,gBAAgB,GAAG,IAAI,CAAC;AAsD9B,MAAM,WAAW,GAAG,CAAC,KAAkB,EAAU,EAAE;IACjD,IAAI,KAAK,CAAC,eAAe,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU;QAAE,OAAO,YAAY,CAAC;IACxE,IAAI,KAAK,CAAC,YAAY;QAAE,OAAO,UAAU,CAAC;IAC1C,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAC5B,KAAyB,EACzB,KAAkB,EAClB,OAGC,EACK,EAAE;IACR,MAAM,WAAW,GAAG,iBAAiB,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAC7D,OAAO,KAAK,CAAC,kBAAkB,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC;QACrD,MAAM,IAAI,GAAG,oBAAoB,CAC/B,WAAW,CAAC,KAAK,CAAC,kBAAkB,CAAE,EACtC,KAAK,CAAC,UAAU,CACjB,CAAC;QACF,MAAM,OAAO,GAAG,KAAK,CAAC,eAAe,EAAE,CAAC;QACxC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,GAAG,OAAO,CAAC;QACpD,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC3B,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/D,KAAK,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACnC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5B,KAAK,CAAC,kBAAkB,IAAI,CAAC,CAAC;IAChC,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,wBAAwB,GAAG,CAC/B,KAAyB,EACzB,KAAkB,EAClB,KAAa,EACP,EAAE;IACR,IAAI,KAAK,CAAC,kBAAkB,EAAE,CAAC;QAC7B,KAAK,CAAC,kBAAkB,GAAG,KAAK,CAAC;QACjC,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC;QACzB,KAAK,CAAC,eAAe,GAAG,CAAC,CAAC;IAC5B,CAAC;IACD,IACE,CAAC,KAAK,CAAC,YAAY;QACnB,uBAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,EACnD,CAAC;QACD,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC;QAC1B,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC;QACxB,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IAC/B,CAAC;IACD,IAAI,KAAK,CAAC,UAAU,IAAI,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACzD,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC;QACzB,KAAK,CAAC,eAAe,GAAG,CAAC,CAAC;IAC5B,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAC1B,KAAyB,EACzB,KAAkB,EAClB,IAAY,EACN,EAAE;IACR,KAAK,CAAC,kBAAkB,GAAG,KAAK,CAAC;IACjC,KAAK,CAAC,qBAAqB,IAAI,IAAI,CAAC;IACpC,KAAK,CAAC,kBAAkB,GAAG,IAAI,CAAC;IAChC,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC;IAC1B,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC;IACxB,KAAK,CAAC,eAAe,IAAI,CAAC,CAAC;IAC3B,IAAI,CAAC,KAAK,CAAC,qBAAqB,EAAE,CAAC;QACjC,KAAK,CAAC,qBAAqB,GAAG,IAAI,CAAC;QACnC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IAC/B,CAAC;IACD,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAC1B,IAAY,EACZ,cAAkC,EAC1B,EAAE,CACV,cAAc,IAAI,cAAc,IAAI,gBAAgB;IAClD,CAAC,CAAC,GAAG,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,cAAc,GAAG,IAAI,CAAC,UAAU;IACzD,CAAC,CAAC,IAAI,CAAC;AAEX,MAAM,mBAAmB,GAAG,CAC1B,KAAyB,EACzB,KAAkB,EAClB,MAAc,EACR,EAAE;IACR,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IAChD,IAAI,CAAC,IAAI;QAAE,OAAO;IAClB,MAAM,OAAO,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACxC,IAAI,OAAO,EAAE,CAAC;QACZ,KAAK,CAAC,kBAAkB,GAAG,IAAI,CAAC;QAChC,KAAK,CAAC,qBAAqB,GAAG,KAAK,CAAC;QACpC,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC3B,OAAO;IACT,CAAC;IACD,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;QACnC,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,iCAAiC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAClF,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AAChD,CAAC,CAAC;AAEF,MAAM,wBAAwB,GAAG,CAAC,KAAyB,EAAE,KAAkB,EAAE,EAAE,CACjF,0BAA0B,CACxB,KAAK,CAAC,kBAAkB,EACxB,CAAC,IAAI,EAAE,EAAE;IACP,IAAI,CAAC,KAAK,CAAC,qBAAqB,EAAE,CAAC;QACjC,KAAK,CAAC,qBAAqB,GAAG,IAAI,CAAC;QACnC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IAC/B,CAAC;IACD,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC,CACF,CAAC;AAEJ,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,KAAyB,EACV,EAAE;IACjB,MAAM,KAAK,GAAgB;QACzB,kBAAkB,EAAE,KAAK;QACzB,YAAY,EAAE,KAAK;QACnB,UAAU,EAAE,KAAK;QACjB,qBAAqB,EAAE,KAAK;QAC5B,eAAe,EAAE,CAAC;QAClB,eAAe,EAAE,EAAE;QACnB,qBAAqB,EAAE,EAAE;QACzB,kBAAkB,EAAE,KAAK;QACzB,kBAAkB,EAAE,CAAC;KACtB,CAAC;IACF,MAAM,iBAAiB,GAA6B,EAAE,CAAC;IACvD,MAAM,uBAAuB,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC1D,MAAM,OAAO,GAAa,EAAE,CAAC;IAE7B,MAAM,WAAW,GAAG,wBAAwB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC3D,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE;QACjC,IAAI,CAAC,KAAK,CAAC,kBAAkB;YAAE,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IACtE,CAAC,EAAE,YAAY,CAAC,CAAC;IACjB,SAAS,CAAC,KAAK,EAAE,EAAE,CAAC;IAEpB,OAAO;QACL,eAAe,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,eAAe;QAC5C,qBAAqB,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,qBAAqB;QACxD,YAAY,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,YAAY;QACtC,iBAAiB;QACjB,uBAAuB;QACvB,OAAO;QACP,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YACjB,IAAI,CAAC,KAAK;gBAAE,OAAO;YACnB,KAAK,CAAC,kBAAkB,GAAG,KAAK,CAAC;YACjC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACxB,KAAK,CAAC,eAAe,IAAI,CAAC,CAAC;YAC3B,KAAK,CAAC,eAAe,IAAI,KAAK,CAAC;YAC/B,IAAI,CAAC,KAAK,CAAC,mBAAmB,EAAE,EAAE,CAAC;gBACjC,qBAAqB,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,iBAAiB,EAAE,OAAO,EAAE,CAAC,CAAC;YACtE,CAAC;YACD,wBAAwB,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAChD,CAAC;QACD,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,mBAAmB,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC;QAC/D,aAAa,EAAE,CAAC,KAAK,EAAE,EAAE;YACvB,IAAI,KAAK,CAAC,IAAI,KAAK,iBAAiB;gBAAE,OAAO;YAC7C,mBAAmB,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAChD,CAAC;QACD,eAAe,EAAE,CAAC,KAAK,EAAE,EAAE;YACzB,IAAI,CAAC,KAAK,CAAC,IAAI;gBAAE,OAAO;YACxB,KAAK,CAAC,kBAAkB,GAAG,KAAK,CAAC;YACjC,MAAM,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC;YACpD,uBAAuB,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YAC/C,KAAK,CAAC,UAAU,CAAC,mBAAmB,CAAC,IAAI,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC;QACpE,CAAC;QACD,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;QAC9C,iBAAiB,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,MAAM,EAAE;QAC7C,aAAa,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC,SAAS,CAAC;KAC9C,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"stream-session.js","sourceRoot":"","sources":["../../../../src/agent/turn/loop/stream-session.ts"],"names":[],"mappings":"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"}

package/dist/agent/turn/loop/tool-call-recovery.d.ts

@@ -8,6 +8,7 @@ export interface ToolCallRecoveryState {
     bareToolJsonRetries: number;
     truncatedToolRetries: number;
     malformedFenceRetries: number;
+    sentinelToolRetries: number;
 }
 export interface ToolCallRecoveryPorts {
     readonly messages: ChatMessage[];
@@ -21,5 +22,6 @@ export interface ToolCallRecoveryPorts {
 export type ToolCallRecoveryDecision = "retry" | "proceed";
 export declare const recoverMissingToolCall: (ports: ToolCallRecoveryPorts, state: ToolCallRecoveryState, input: {
     readonly visible: string;
+    readonly thinking?: string | undefined;
     readonly bareArgsOnly: boolean;
 }) => Promise<ToolCallRecoveryDecision>;

package/dist/agent/turn/loop/tool-call-recovery.js

@@ -1,7 +1,11 @@
 import { countToolFences, looksLikeTruncatedToolCall, salvageTruncatedWrite, } from "../../tool-call-parser.js";
 import { stripThinking } from "../../../ui/thinking.js";
 import { toolNudge } from "../../../prompts/index.js";
-const SENTINEL_TOOL_CALL = /<\|tool_call(?:s_section)?_begin\|>|<\|tool_call_argument_begin\|>|<[|｜]+DSML[|｜]+(?:tool_calls|invoke|parameter)\b|<[|｜]+tool[_▁](?:calls?[_▁]begin|sep)[|｜]+>/i;
+import { DSML_ANY_RE } from "../../parser/dsml.js";
+import { stripToolCallSurfaces } from "../../../ui-core/rendering/strip-tool-surfaces.js";
+const SENTINEL_TOOL_CALL = /<\|tool_call(?:s_section)?_begin\|>|<\|tool_call_argument_begin\|>|<\s*[|｜]+\s*tool[_▁\s](?:calls?[_▁\s]begin|sep)\s*[|｜]+\s*>/i;
+const MAX_SENTINEL_RETRIES = 3;
+const hasSentinelMarkup = (text) => SENTINEL_TOOL_CALL.test(text) || DSML_ANY_RE.test(text);
 const FENCED_CALL_SHAPE = /```tool\s*\n[\s\S]*?"(?:name|args)"\s*:/i;
 const bareArgsNudge = (ports) => {
     if (ports.planModeWithoutPlan) {
@@ -22,14 +26,16 @@ const bareArgsNudge = (ports) => {
             '```tool\n{"name":"pdf.read","args":{"path":"/abs/file.pdf"}}\n```\n' +
             "Choose the correct tool name for the task and include those args.";
 };
-const sentinelNudge = (ports) => ports.toolsAttached
-    ? "Your previous tool call was malformed or truncated. " +
+const sentinelNudge = (ports, dsml) => ports.toolsAttached
+    ? "Your previous tool call was written as raw " +
+        (dsml ? "DSML (<｜DSML｜…>) " : "sentinel ") +
+        "markup that was malformed or truncated, so NOTHING ran. " +
         toolNudge(true) +
-        " Pass valid JSON arguments via the platform tool interface — do not use fence or sentinel markers."
-    : "Your previous tool call was malformed or truncated. " +
+        " Pass valid JSON arguments via the platform tool interface — do not write tool-call markup in your reply."
+    : "Your previous tool call was malformed or truncated, so NOTHING ran. " +
         "Reply with ONLY a fenced ```tool block containing valid JSON " +
         'of the form `{"name": "<tool>", "args": { ... }}`. ' +
-        "Do not use <|tool_call_begin|> markers.";
+        "Do not use <|tool_call_begin|> or <｜DSML｜…> markers.";
 const truncatedNudge = (ports) => ports.toolsAttached
     ? "Your previous tool call was cut off before it finished — the JSON was incomplete, so NOTHING ran. " +
         "Prefer ONE complete fs.write when it fits. If the file is too large: (1) fs.write the first large section, " +
@@ -103,10 +109,17 @@ const recoverBareArgs = (ports, state, visible) => {
     ports.messages.push(ports.recoveryUserMessage(bareArgsNudge(ports)));
     return "retry";
 };
-const recoverSentinel = (ports, visible) => {
-    ports.notify("warn", "tool call was malformed or cut off — asking the model to retry in JSON form");
+const recoverSentinel = (ports, state, visible, dsml) => {
+    state.sentinelToolRetries += 1;
+    if (state.sentinelToolRetries > MAX_SENTINEL_RETRIES) {
+        ports.notify("warn", "model kept emitting unparseable tool-call markup — it was hidden and the turn ended; try again or switch model");
+        return "proceed";
+    }
+    ports.notify("warn", dsml
+        ? "model emitted a malformed DSML tool call — asking it to retry with a valid call"
+        : "tool call was malformed or cut off — asking the model to retry in JSON form");
     ports.commitAssistantRetry(visible);
-    ports.messages.push(ports.recoveryUserMessage(sentinelNudge(ports)));
+    ports.messages.push(ports.recoveryUserMessage(sentinelNudge(ports, dsml)));
     return "retry";
 };
 const recoverTruncated = async (ports, state, visible) => {
@@ -143,8 +156,10 @@ export const recoverMissingToolCall = async (ports, state, input) => {
         if (recoverBareArgs(ports, state, input.visible) === "retry")
             return "retry";
     }
-    if (SENTINEL_TOOL_CALL.test(input.visible)) {
-        return recoverSentinel(ports, input.visible);
+    const thinkingOnlyCall = !stripToolCallSurfaces(input.visible).trim() && Boolean(input.thinking && hasSentinelMarkup(input.thinking));
+    if (hasSentinelMarkup(input.visible) || thinkingOnlyCall) {
+        const dsml = DSML_ANY_RE.test(input.visible) || (thinkingOnlyCall && DSML_ANY_RE.test(input.thinking ?? ""));
+        return recoverSentinel(ports, state, input.visible, dsml);
     }
     if (looksLikeTruncatedToolCall(input.visible)) {
         const decision = await recoverTruncated(ports, state, input.visible);

package/dist/agent/turn/loop/tool-call-recovery.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-call-recovery.js","sourceRoot":"","sources":["../../../../src/agent/turn/loop/tool-call-recovery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tool-call-recovery.js","sourceRoot":"","sources":["../../../../src/agent/turn/loop/tool-call-recovery.ts"],"names":[],"mappings":"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"}

package/dist/agent/turn/mcp-agent-tools.d.ts

@@ -3,6 +3,8 @@ import type { McpRuntime } from "../../mcp/runtime.js";
 import type { SingleToolResult } from "./contracts.js";
 export interface McpAgentToolPorts {
     readonly askMode: boolean;
+    readonly planMode?: boolean;
+    readonly signal?: AbortSignal | undefined;
     readonly showCall: (toolEventId: string, call: ToolCall) => void;
     readonly writeOutput: (toolEventId: string, chunk: string) => void;
     readonly emitResult: (toolEventId: string, result: ToolResult, contextOutput: string, artifactPath?: string) => void;
@@ -12,6 +14,7 @@ export interface McpAgentToolPorts {
 export declare const mcpAgentToolTarget: (args: Record<string, unknown>) => string | readonly string[] | undefined;
 export declare const runMcpAgentTool: (mcp: McpRuntime, call: ToolCall, options?: {
     readonly askMode?: boolean;
+    readonly signal?: AbortSignal | undefined;
 }) => Promise<ToolResult>;
 export declare const mcpAgentOutput: (call: ToolCall, result: ToolResult) => string;
 export declare const isReadOnlyMcpAgentTool: (call: ToolCall) => boolean;

package/dist/agent/turn/mcp-agent-tools.js

@@ -1,4 +1,5 @@
 import { formatToolContext, saveToolOutput } from "../tool-output-formatting.js";
+import { manageRea } from "../../rea/runtime.js";
 export const mcpAgentToolTarget = (args) => {
     if (Array.isArray(args.servers)) {
         return args.servers.filter((entry) => typeof entry === "string");
@@ -9,6 +10,10 @@ export const mcpAgentToolTarget = (args) => {
 };
 export const runMcpAgentTool = async (mcp, call, options = {}) => {
     const args = call.args ?? {};
+    if (call.name === "rea.manage")
+        return manageRea(mcp, typeof args.action === "string" ? args.action : "status", {
+            ...(options.signal ? { signal: options.signal } : {}),
+        });
     if (call.name === "mcp.list")
         return mcp.agentList();
     if (call.name === "mcp.tools") {
@@ -40,7 +45,8 @@ export const mcpAgentOutput = (call, result) => {
         ? `${call.name} completed successfully with no textual output.`
         : `${call.name} failed with no textual output (exit ${result.exitCode ?? 1}).`;
 };
-export const isReadOnlyMcpAgentTool = (call) => call.name === "mcp.list" || call.name === "mcp.tools";
+export const isReadOnlyMcpAgentTool = (call) => call.name === "mcp.list" || call.name === "mcp.tools" ||
+    (call.name === "rea.manage" && (call.args.action === "status" || call.args.action === "guide" || call.args.action === undefined));
 const failCall = (ports, toolEventId, call, reason, cancelled = false) => {
     ports.showCall(toolEventId, call);
     const result = { ok: false, output: reason, exitCode: 1 };
@@ -60,11 +66,14 @@ const execute = async (ports, runtime, call, toolEventId) => {
     if (!readOnly && ports.askMode) {
         return failCall(ports, toolEventId, call, `${call.name} is not available in ask mode because it changes MCP session state. Switch to agent mode.`);
     }
+    if (!readOnly && ports.planMode && call.name === "rea.manage") {
+        return failCall(ports, toolEventId, call, "REA installation and session changes require agent mode; use status or guide while planning.");
+    }
     if (!readOnly && !(await ports.confirm(call))) {
         return failCall(ports, toolEventId, call, "Cancelled.", true);
     }
     ports.showCall(toolEventId, call);
-    const result = await runMcpAgentTool(runtime, call, { askMode: ports.askMode });
+    const result = await runMcpAgentTool(runtime, call, { askMode: ports.askMode, signal: ports.signal });
     const shown = mcpAgentOutput(call, result);
     const artifactPath = shown.length > 24_000 ? await saveToolOutput(call, shown) : undefined;
     const framed = { ...result, output: shown, ...(artifactPath ? { outputPath: artifactPath } : {}) };

package/dist/agent/turn/mcp-agent-tools.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-agent-tools.js","sourceRoot":"","sources":["../../../src/agent/turn/mcp-agent-tools.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mcp-agent-tools.js","sourceRoot":"","sources":["../../../src/agent/turn/mcp-agent-tools.ts"],"names":[],"mappings":"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"}

package/dist/agent/turn/prompt-sections.js

@@ -16,6 +16,7 @@ const sectionKind = (content) => KIND_RULES.find((rule) => rule.matches(content)
 const MANDATORY_PREFIXES = [
     "ACTIVE PLAN",
     "MCP TOOL CONTEXT",
+    "REA WORKFLOW",
     "ENGAGEMENT SCOPE",
     "REQUEST ENVIRONMENT",
     "ORCHESTRATION:",

package/dist/agent/turn/prompt-sections.js.map

@@ -1 +1 @@
-{"version":3,"file":"prompt-sections.js","sourceRoot":"","sources":["../../../src/agent/turn/prompt-sections.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"prompt-sections.js","sourceRoot":"","sources":["../../../src/agent/turn/prompt-sections.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAShE,MAAM,UAAU,GAGX;IACH,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE;IACxE,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE;IAC7D,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE;IACnE,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE;IACpD,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE;IAC1D;QACE,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CACb,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC;YACtB,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC;YACnB,CAAC,CAAC,UAAU,CAAC,cAAc,CAAC;QAC9B,IAAI,EAAE,OAAO;KACd;CACF,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,OAAe,EAA8B,EAAE,CAClE,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,IAAI,SAAS,CAAC;AAEtE,MAAM,kBAAkB,GAAG;IACzB,aAAa;IACb,kBAAkB;IAClB,cAAc;IACd,kBAAkB;IAClB,qBAAqB;IACrB,gBAAgB;IAChB,wCAAwC;IACxC,sBAAsB;IACtB,mBAAmB;IACnB,kBAAkB;CACV,CAAC;AAEX,MAAM,WAAW,GAAG,CAAC,OAAe,EAAE,iBAA0B,EAAW,EAAE,CAC3E,OAAO,CAAC,UAAU,CAAC,qBAAqB,CAAC;IACvC,CAAC,CAAC,iBAAiB;IACnB,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAC/D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;QACxB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;AAElC,MAAM,eAAe,GAAuB;IAC1C,IAAI,EAAE,SAAS;IACf,OAAO,EAAE,iWAAiW;IAC1W,SAAS,EAAE,IAAI;CAChB,CAAC;AAEF,MAAM,YAAY,GAAuB;IACvC,IAAI,EAAE,MAAM;IACZ,OAAO,EACL,4RAA4R;IAC9R,SAAS,EAAE,IAAI;CAChB,CAAC;AAEF,MAAM,UAAU,GAAuB;IACrC,IAAI,EAAE,OAAO;IACb,OAAO,EACL,yEAAyE;IAC3E,SAAS,EAAE,IAAI;CAChB,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,KAAyB,EACH,EAAE;IACxB,MAAM,iBAAiB,GAAG,KAAK,CAAC,kBAAkB,CAAC,MAAM,GAAG,CAAC,CAAC;IAC9D,MAAM,QAAQ,GAAyB,KAAK,CAAC,cAAc,CAAC,GAAG,CAC7D,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACZ,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC;QAC1B,OAAO;QACP,SAAS,EAAE,WAAW,CAAC,OAAO,EAAE,iBAAiB,CAAC;KACnD,CAAC,CACH,CAAC;IACF,MAAM,GAAG,GAAG,CAAC,IAAgC,EAAW,EAAE,CACxD,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IACpD,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC;QAAE,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACpD,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;QAAE,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC9C,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;QAAE,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC7C,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC"}

package/dist/agent/turn/scaffold-preflight.d.ts

@@ -1,8 +1,13 @@
 import type { ToolCall } from "../../types.js";
+import { type WorkIntent } from "../workspace-orient.js";
 export interface ScaffoldPreflightDecision {
     readonly skip: boolean;
     readonly message: string;
     readonly target: string | undefined;
     readonly adoptTarget: boolean;
 }
-export declare const decideScaffoldPreflight: (call: ToolCall) => ScaffoldPreflightDecision;
+export interface ScaffoldPreflightContext {
+    readonly workIntent?: WorkIntent;
+    readonly activeProjectRoot?: string | undefined;
+}
+export declare const decideScaffoldPreflight: (call: ToolCall, context?: ScaffoldPreflightContext) => ScaffoldPreflightDecision;

package/dist/agent/turn/scaffold-preflight.js

@@ -6,7 +6,7 @@ const NO_SKIP = {
     target: undefined,
     adoptTarget: false,
 };
-export const decideScaffoldPreflight = (call) => {
+export const decideScaffoldPreflight = (call, context = {}) => {
     if (call.name !== "shell.exec")
         return NO_SKIP;
     const command = call.args.command;
@@ -17,8 +17,16 @@ export const decideScaffoldPreflight = (call) => {
     if (!scaffoldTargetConflictMessage(command, cwdArg))
         return NO_SKIP;
     const target = resolveScaffoldTargetPath(command, cwdArg);
-    const materialized = scaffoldLooksMaterialized(target);
     const location = target ? ` at ${target}` : "";
+    if (context.workIntent === "new" && target !== context.activeProjectRoot) {
+        return {
+            skip: true,
+            message: `Scaffold skipped: the target${location} already holds existing work that this new request does not target. Leave it untouched and scaffold into a new, non-colliding folder.`,
+            target,
+            adoptTarget: false,
+        };
+    }
+    const materialized = scaffoldLooksMaterialized(target);
     return {
         skip: true,
         message: materialized

package/dist/agent/turn/scaffold-preflight.js.map

@@ -1 +1 @@
-{"version":3,"file":"scaffold-preflight.js","sourceRoot":"","sources":["../../../src/agent/turn/scaffold-preflight.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EACL,yBAAyB,EACzB,yBAAyB,EACzB,6BAA6B,GAC9B,MAAM,wBAAwB,CAAC;AAShC,MAAM,OAAO,GAA8B;IACzC,IAAI,EAAE,KAAK;IACX,OAAO,EAAE,EAAE;IACX,MAAM,EAAE,SAAS;IACjB,WAAW,EAAE,KAAK;CACnB,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAAG,CACrC,IAAc,EACa,EAAE;IAC7B,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY;QAAE,OAAO,OAAO,CAAC;IAC/C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;IAClC,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,EAAE,CAAC;QACrE,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,MAAM,MAAM,GAAG,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7E,IAAI,CAAC,6BAA6B,CAAC,OAAO,EAAE,MAAM,CAAC;QAAE,OAAO,OAAO,CAAC;IACpE,MAAM,MAAM,GAAG,yBAAyB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC1D,MAAM,YAAY,GAAG,yBAAyB,CAAC,MAAM,CAAC,CAAC;IACvD,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,OAAO,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/C,OAAO;QACL,IAAI,EAAE,IAAI;QACV,OAAO,EAAE,YAAY;YACnB,CAAC,CAAC,iEAAiE,QAAQ,iEAAiE;YAC5I,CAAC,CAAC,4CAA4C,QAAQ,uIAAuI;QAC/L,MAAM;QACN,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,YAAY;KAC7C,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"scaffold-preflight.js","sourceRoot":"","sources":["../../../src/agent/turn/scaffold-preflight.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EACL,yBAAyB,EACzB,yBAAyB,EACzB,6BAA6B,GAE9B,MAAM,wBAAwB,CAAC;AAchC,MAAM,OAAO,GAA8B;IACzC,IAAI,EAAE,KAAK;IACX,OAAO,EAAE,EAAE;IACX,MAAM,EAAE,SAAS;IACjB,WAAW,EAAE,KAAK;CACnB,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAAG,CACrC,IAAc,EACd,UAAoC,EAAE,EACX,EAAE;IAC7B,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY;QAAE,OAAO,OAAO,CAAC;IAC/C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;IAClC,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,EAAE,CAAC;QACrE,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,MAAM,MAAM,GAAG,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7E,IAAI,CAAC,6BAA6B,CAAC,OAAO,EAAE,MAAM,CAAC;QAAE,OAAO,OAAO,CAAC;IACpE,MAAM,MAAM,GAAG,yBAAyB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,OAAO,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/C,IAAI,OAAO,CAAC,UAAU,KAAK,KAAK,IAAI,MAAM,KAAK,OAAO,CAAC,iBAAiB,EAAE,CAAC;QACzE,OAAO;YACL,IAAI,EAAE,IAAI;YACV,OAAO,EAAE,+BAA+B,QAAQ,uIAAuI;YACvL,MAAM;YACN,WAAW,EAAE,KAAK;SACnB,CAAC;IACJ,CAAC;IACD,MAAM,YAAY,GAAG,yBAAyB,CAAC,MAAM,CAAC,CAAC;IACvD,OAAO;QACL,IAAI,EAAE,IAAI;QACV,OAAO,EAAE,YAAY;YACnB,CAAC,CAAC,iEAAiE,QAAQ,iEAAiE;YAC5I,CAAC,CAAC,4CAA4C,QAAQ,uIAAuI;QAC/L,MAAM;QACN,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,YAAY;KAC7C,CAAC;AACJ,CAAC,CAAC"}

package/dist/agent/turn/setup/mcp-agent-ports.d.ts

@@ -5,6 +5,8 @@ import type { LoopGuard } from "../../loop-guard.js";
 import type { PromptMutex } from "../tool-call-preparation.js";
 export interface McpAgentPortsInput {
     readonly askMode: boolean;
+    readonly planMode?: boolean;
+    readonly signal?: AbortSignal | undefined;
     readonly autoConfirm: boolean;
     readonly session: SessionPolicy;
     readonly confirmPort: ConfirmPort;
@@ -20,10 +22,12 @@ export interface McpAgentPortsInput {
     readonly emitToolResult: (toolEventId: string, result: ToolResult, contextOutput: string, artifactPath?: string) => void;
 }
 export declare const buildMcpAgentToolPorts: (input: McpAgentPortsInput) => {
-    askMode: boolean;
+    signal: AbortSignal | undefined;
     showCall: (toolEventId: string, call: ToolCall) => void;
     writeOutput: (toolEventId: string, chunk: string) => void;
     emitResult: (toolEventId: string, result: ToolResult, contextOutput: string, artifactPath?: string) => void;
     confirm: (call: ToolCall) => Promise<boolean>;
     recordAttempt: (call: ToolCall, ok: boolean, output: string) => void;
+    planMode?: boolean;
+    askMode: boolean;
 };

package/dist/agent/turn/setup/mcp-agent-ports.js

@@ -2,6 +2,8 @@ import { confirmToolExecution } from "../../confirm-port.js";
 import { restoreInteractiveStdin } from "../../../noninteractive/readline-prompts.js";
 export const buildMcpAgentToolPorts = (input) => ({
     askMode: input.askMode,
+    ...(input.planMode !== undefined ? { planMode: input.planMode } : {}),
+    signal: input.signal,
     showCall: (toolEventId, call) => {
         if (input.isPrinted(toolEventId))
             return;

package/dist/agent/turn/setup/mcp-agent-ports.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-agent-ports.js","sourceRoot":"","sources":["../../../../src/agent/turn/setup/mcp-agent-ports.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,6CAA6C,CAAC;AA0BtF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,KAAyB,EAAE,EAAE,CAAC,CAAC;IACpE,OAAO,EAAE,KAAK,CAAC,OAAO;IACtB,QAAQ,EAAE,CAAC,WAAmB,EAAE,IAAc,EAAQ,EAAE;QACtD,IAAI,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC;YAAE,OAAO;QACzC,KAAK,CAAC,aAAa,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QACvC,KAAK,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IACjC,CAAC;IACD,WAAW,EAAE,CAAC,WAAmB,EAAE,KAAa,EAAE,EAAE,CAClD,KAAK,CAAC,eAAe,CAAC,WAAW,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC9D,UAAU,EAAE,KAAK,CAAC,cAAc;IAChC,OAAO,EAAE,KAAK,EAAE,IAAc,EAAoB,EAAE;QAClD,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;QACxD,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,MAAM,oBAAoB,CAC1C,IAAI,EACJ,KAAK,CAAC,WAAW,EACjB,KAAK,CAAC,OAAO,EACb,KAAK,CAAC,WAAW,CAClB,CAAC;YACF,uBAAuB,EAAE,CAAC;YAC1B,OAAO,SAAS,CAAC;QACnB,CAAC;gBAAS,CAAC;YACT,aAAa,EAAE,CAAC;QAClB,CAAC;IACH,CAAC;IACD,aAAa,EAAE,CAAC,IAAc,EAAE,EAAW,EAAE,MAAc,EAAE,EAAE,CAC7D,KAAK,CAAC,SAAS,CAAC,aAAa,CAC3B,KAAK,CAAC,IAAI,EAAE,EACZ,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,IAAI,EACT,EAAE,EACF,CAAC,EACD,MAAM,CACP;CACJ,CAAC,CAAC"}
+{"version":3,"file":"mcp-agent-ports.js","sourceRoot":"","sources":["../../../../src/agent/turn/setup/mcp-agent-ports.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,6CAA6C,CAAC;AA4BtF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,KAAyB,EAAE,EAAE,CAAC,CAAC;IACpE,OAAO,EAAE,KAAK,CAAC,OAAO;IACtB,GAAG,CAAC,KAAK,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACrE,MAAM,EAAE,KAAK,CAAC,MAAM;IACpB,QAAQ,EAAE,CAAC,WAAmB,EAAE,IAAc,EAAQ,EAAE;QACtD,IAAI,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC;YAAE,OAAO;QACzC,KAAK,CAAC,aAAa,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QACvC,KAAK,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IACjC,CAAC;IACD,WAAW,EAAE,CAAC,WAAmB,EAAE,KAAa,EAAE,EAAE,CAClD,KAAK,CAAC,eAAe,CAAC,WAAW,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC9D,UAAU,EAAE,KAAK,CAAC,cAAc;IAChC,OAAO,EAAE,KAAK,EAAE,IAAc,EAAoB,EAAE;QAClD,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;QACxD,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,MAAM,oBAAoB,CAC1C,IAAI,EACJ,KAAK,CAAC,WAAW,EACjB,KAAK,CAAC,OAAO,EACb,KAAK,CAAC,WAAW,CAClB,CAAC;YACF,uBAAuB,EAAE,CAAC;YAC1B,OAAO,SAAS,CAAC;QACnB,CAAC;gBAAS,CAAC;YACT,aAAa,EAAE,CAAC;QAClB,CAAC;IACH,CAAC;IACD,aAAa,EAAE,CAAC,IAAc,EAAE,EAAW,EAAE,MAAc,EAAE,EAAE,CAC7D,KAAK,CAAC,SAAS,CAAC,aAAa,CAC3B,KAAK,CAAC,IAAI,EAAE,EACZ,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,IAAI,EACT,EAAE,EACF,CAAC,EACD,MAAM,CACP;CACJ,CAAC,CAAC"}

package/dist/agent/turn/system-sections.d.ts

@@ -3,6 +3,7 @@ import type { BackgroundJob } from "../../tools/jobs.js";
 import type { SessionPlan } from "../../store/plan.js";
 import type { SkillMeta } from "../../skills/types.js";
 import { type PreviousTurnSignal } from "../continue-orient.js";
+import { type WorkIntent } from "../workspace-orient.js";
 export interface SystemSectionInput {
     readonly prompt: string;
     readonly mode: Mode;
@@ -13,6 +14,7 @@ export interface SystemSectionInput {
     readonly sessionId: string;
     readonly projectContext: string | undefined;
     readonly destinationHint: string | undefined;
+    readonly workIntent: WorkIntent;
     readonly isPlanMode: boolean;
     readonly buildLikeTurn: boolean;
     readonly informationalQuery: boolean;

package/dist/agent/turn/system-sections.js

@@ -20,7 +20,10 @@ const locationSection = (input, projectRoot) => {
         return `ACTIVE PROJECT ROOT: ${projectRoot}\n${PROJECT_ROOT_RULES}`;
     }
     if (input.destinationHint) {
-        return `USER DESTINATION: create or continue work under "${input.destinationHint}" (parent folder). ${DESTINATION_RULES}`;
+        const action = input.workIntent === "new"
+            ? "create the new work in its own new folder under"
+            : "create or continue work under";
+        return `USER DESTINATION: ${action} "${input.destinationHint}" (parent folder). ${DESTINATION_RULES}`;
     }
     return undefined;
 };
@@ -33,17 +36,18 @@ const workspaceSection = (input) => {
     ]
         .filter(Boolean)
         .join("\n"));
-    const extraPaths = [];
-    if (input.destinationHint && guessedName) {
-        extraPaths.push(join(input.destinationHint, guessedName));
-    }
     const fromText = extractProjectRootFromPlan(input.plan) ??
         extractProjectRootFromText(input.prompt);
-    if (fromText)
-        extraPaths.push(fromText);
-    const orientInput = { cwd: safeCwd(), extraPaths };
+    const orientInput = {
+        cwd: safeCwd(),
+        intent: input.workIntent,
+        extraPaths: fromText ? [fromText] : [],
+    };
     if (input.destinationHint)
         orientInput.destinationHint = input.destinationHint;
+    if (input.destinationHint && guessedName) {
+        orientInput.namesakePath = join(input.destinationHint, guessedName);
+    }
     const candidate = input.getProjectRoot() ?? fromText;
     if (candidate)
         orientInput.candidateProject = candidate;

package/dist/agent/turn/system-sections.js.map

@@ -1 +1 @@
-{"version":3,"file":"system-sections.js","sourceRoot":"","sources":["../../../src/agent/turn/system-sections.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"system-sections.js","sourceRoot":"","sources":["../../../src/agent/turn/system-sections.ts"],"names":[],"mappings":"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"}

package/dist/agent/turn/tool-execution/deps.d.ts

@@ -7,6 +7,7 @@ import type { LoopGuard } from "../../loop-guard.js";
 import type { WorkLedger } from "../../durable-envelope.js";
 import type { OutcomeEnvelope } from "../../outcomes.js";
 import type { LooseWorkReceipt } from "../../task-evidence.js";
+import type { WorkIntent } from "../../workspace-orient.js";
 import type { TurnState, TurnStateSnapshot } from "../../turn-state.js";
 import type { EngagementPolicyEngine } from "../../../safety/engagement-policy.js";
 import type { McpRuntime } from "../../../mcp/runtime.js";
@@ -31,6 +32,7 @@ export interface SingleToolDeps extends TurnWriters {
     readonly session: SessionPolicy;
     readonly emit: (event: AgentEvent) => void;
     readonly destinationHint: string | undefined;
+    readonly workIntent: WorkIntent;
     readonly options: SingleToolOptions;
     readonly messages: ChatMessage[];
     readonly prompt: string;

package/dist/agent/turn/tool-execution/single-tool.js

@@ -274,7 +274,10 @@ export const runSingleTool = async (deps, rawCall, toolEventId, parentSignal) =>
         }
     }
     call = applyDestinationCwd(call, deps.destinationHint ?? getActiveProjectRoot());
-    const scaffoldPreflight = decideScaffoldPreflight(call);
+    const scaffoldPreflight = decideScaffoldPreflight(call, {
+        workIntent: deps.workIntent,
+        activeProjectRoot: getActiveProjectRoot(),
+    });
     if (scaffoldPreflight.skip) {
         if (scaffoldPreflight.adoptTarget &&
             scaffoldPreflight.target &&