@stigmer/runner 3.40.0 → 3.41.0

package/dist/shared/tool-rounds.d.ts

@@ -1,18 +1,28 @@
 /**
- * ExecutionConfig.max_tool_rounds → LangGraph recursion_limit resolution.
+ * ExecutionConfig.max_tool_rounds: the round budget, its backstop, and the
+ * signal that the budget ended a turn.
  *
  * Implements the proto contract (agentexecution/v1/spec.proto):
- *   - 0 / unset = unlimited — no recursionLimit is placed on the invoke
- *     config, preserving the run-until-done + loop-detection posture.
+ *   - 0 / unset = unlimited: no round limit and no recursionLimit, preserving
+ *     the run-until-done + loop-detection posture.
  *   - When set, valid range is 10–1000 rounds; out-of-range values are
  *     clamped to the nearest bound with a warning log.
- *   - recursion_limit = rounds × 6: each model-tool round consumes multiple
- *     graph super-steps because every active middleware hook is its own
- *     node; ×6 is the contract's floor estimate.
+ *   - A round is one model response that proposes one or more tool calls,
+ *     followed by their execution; parallel calls are one round.
  *
- * The SAME resolved limit must feed both LangGraph's hard stop (the invoke
- * config) and the ExecutionBudgetMiddleware's wrap-up advisory, so the
- * "~80% of budget" warning and the enforcement point can never disagree.
+ * The budget is COUNTED, not estimated. `middleware/execution-budget.ts`
+ * counts rounds where the model is called and throws
+ * {@link ToolRoundLimitError} before round N+1's model call, so N rounds
+ * run on every middleware stack. The count and the "~80% of budget"
+ * advisory live in that one middleware, so they can never disagree. Until
+ * #1113 the budget was LangGraph's recursion limit at rounds × 6 super-steps,
+ * and because every middleware hook is its own graph node, how many rounds
+ * fitted moved whenever the stack did.
+ *
+ * LangGraph's recursion limit stays only as a backstop
+ * ({@link backstopRecursionLimit}): generous enough never to bind before the
+ * round count on any stack, it halts a graph that loops without calling the
+ * model. Either stop is the same outcome ({@link isToolCallBudgetStop}).
  *
  * The knob and its terminal copy live together (the `cost-guard.ts` shape):
  * when the budget is exhausted the adapter ends its turn `tool_call_limit`
@@ -20,20 +30,27 @@
  * below — the platform deliberately stopped the run, work is checkpointed,
  * and the conversation continues on the next message.
  */
-export declare const SUPER_STEPS_PER_ROUND = 6;
 export declare const MIN_TOOL_ROUNDS = 10;
 export declare const MAX_TOOL_ROUNDS = 1000;
 /**
- * The advisory-only budget used when max_tool_rounds is unset: high enough
- * to never fire on a healthy run. Deliberately NOT enforced as a hard
- * recursionLimit — unset means unlimited per the proto contract.
+ * Super-steps per round the backstop allows: well above the graph nodes one
+ * round costs on any stack the runner builds (about five today), so the
+ * round count, never the backstop, is what a bounded run meets.
+ */
+export declare const SUPER_STEPS_BACKSTOP_PER_ROUND = 20;
+/**
+ * The advisory-only round budget used when max_tool_rounds is unset: high
+ * enough to never fire on a healthy run. Deliberately NOT enforced — unset
+ * means unlimited per the proto contract.
  */
-export declare const UNBOUNDED_ADVISORY_RECURSION_LIMIT = 6000;
+export declare const UNBOUNDED_ADVISORY_TOOL_ROUNDS = 1000;
 /**
- * The recursionLimit for the invoke config, or null when the execution is
- * unbounded (max_tool_rounds 0/unset — the pre-existing default posture).
+ * The round budget for a turn, clamped to the valid range, or null when the
+ * execution is unbounded (max_tool_rounds 0/unset — the default posture).
  */
-export declare function resolveRecursionLimit(maxToolRounds: number | undefined): number | null;
+export declare function resolveToolRoundLimit(maxToolRounds: number | undefined): number | null;
+/** The recursionLimit backstop for a bounded turn's invoke config; see {@link SUPER_STEPS_BACKSTOP_PER_ROUND}. */
+export declare function backstopRecursionLimit(toolRoundLimit: number): number;
 /**
  * Stable prefix of the tool-call-limit terminal error. This is a cross-repo
  * contract: consumers that need to distinguish "ran out of tool-call budget"
@@ -53,10 +70,21 @@ export declare function formatToolCallLimitError(): string;
  */
 export declare const TOOL_CALL_LIMIT_USER_COPY: string;
 /**
- * Whether an error thrown out of a LangGraph run is the graph exhausting the
- * recursion limit `resolveRecursionLimit` placed on it — the budget's own
- * signal, not a failure: the adapter ends the turn `tool_call_limit`.
- * Matched by class name and message because the error class is not
- * exported on a stable path across `@langchain/langgraph` versions.
+ * The execution budget's stop: thrown by `middleware/execution-budget.ts` in
+ * place of round N+1's model call, so the graph ends on round N's tool
+ * results with no proposed call left unexecuted.
+ */
+export declare class ToolRoundLimitError extends Error {
+    readonly toolRoundLimit: number;
+    constructor(toolRoundLimit: number);
+}
+/**
+ * Whether an error thrown out of a LangGraph run is the tool-call budget
+ * ending the turn — the budget's own signal, not a failure: the adapter ends
+ * the turn `tool_call_limit`. Two producers, one outcome: the round count's
+ * {@link ToolRoundLimitError}, which reaches the turn wrapped in LangChain's
+ * `MiddlewareError` once per `wrapModelCall` layer (so the cause chain is
+ * walked, as `unwrapModelError` does for a model error), and the backstop's
+ * `GraphRecursionError`.
  */
-export declare function isGraphRecursionError(err: unknown): boolean;
+export declare function isToolCallBudgetStop(err: unknown): boolean;

package/dist/shared/tool-rounds.js

@@ -1,18 +1,28 @@
 /**
- * ExecutionConfig.max_tool_rounds → LangGraph recursion_limit resolution.
+ * ExecutionConfig.max_tool_rounds: the round budget, its backstop, and the
+ * signal that the budget ended a turn.
  *
  * Implements the proto contract (agentexecution/v1/spec.proto):
- *   - 0 / unset = unlimited — no recursionLimit is placed on the invoke
- *     config, preserving the run-until-done + loop-detection posture.
+ *   - 0 / unset = unlimited: no round limit and no recursionLimit, preserving
+ *     the run-until-done + loop-detection posture.
  *   - When set, valid range is 10–1000 rounds; out-of-range values are
  *     clamped to the nearest bound with a warning log.
- *   - recursion_limit = rounds × 6: each model-tool round consumes multiple
- *     graph super-steps because every active middleware hook is its own
- *     node; ×6 is the contract's floor estimate.
+ *   - A round is one model response that proposes one or more tool calls,
+ *     followed by their execution; parallel calls are one round.
  *
- * The SAME resolved limit must feed both LangGraph's hard stop (the invoke
- * config) and the ExecutionBudgetMiddleware's wrap-up advisory, so the
- * "~80% of budget" warning and the enforcement point can never disagree.
+ * The budget is COUNTED, not estimated. `middleware/execution-budget.ts`
+ * counts rounds where the model is called and throws
+ * {@link ToolRoundLimitError} before round N+1's model call, so N rounds
+ * run on every middleware stack. The count and the "~80% of budget"
+ * advisory live in that one middleware, so they can never disagree. Until
+ * #1113 the budget was LangGraph's recursion limit at rounds × 6 super-steps,
+ * and because every middleware hook is its own graph node, how many rounds
+ * fitted moved whenever the stack did.
+ *
+ * LangGraph's recursion limit stays only as a backstop
+ * ({@link backstopRecursionLimit}): generous enough never to bind before the
+ * round count on any stack, it halts a graph that loops without calling the
+ * model. Either stop is the same outcome ({@link isToolCallBudgetStop}).
  *
  * The knob and its terminal copy live together (the `cost-guard.ts` shape):
  * when the budget is exhausted the adapter ends its turn `tool_call_limit`
@@ -20,24 +30,34 @@
  * below — the platform deliberately stopped the run, work is checkpointed,
  * and the conversation continues on the next message.
  */
-export const SUPER_STEPS_PER_ROUND = 6;
+import { unwrapModelError } from "./model-error.js";
 export const MIN_TOOL_ROUNDS = 10;
 export const MAX_TOOL_ROUNDS = 1000;
 /**
- * The advisory-only budget used when max_tool_rounds is unset: high enough
- * to never fire on a healthy run. Deliberately NOT enforced as a hard
- * recursionLimit — unset means unlimited per the proto contract.
+ * Super-steps per round the backstop allows: well above the graph nodes one
+ * round costs on any stack the runner builds (about five today), so the
+ * round count, never the backstop, is what a bounded run meets.
+ */
+export const SUPER_STEPS_BACKSTOP_PER_ROUND = 20;
+/**
+ * The advisory-only round budget used when max_tool_rounds is unset: high
+ * enough to never fire on a healthy run. Deliberately NOT enforced — unset
+ * means unlimited per the proto contract.
  */
-export const UNBOUNDED_ADVISORY_RECURSION_LIMIT = 6000;
+export const UNBOUNDED_ADVISORY_TOOL_ROUNDS = MAX_TOOL_ROUNDS;
 /**
- * The recursionLimit for the invoke config, or null when the execution is
- * unbounded (max_tool_rounds 0/unset — the pre-existing default posture).
+ * The round budget for a turn, clamped to the valid range, or null when the
+ * execution is unbounded (max_tool_rounds 0/unset — the default posture).
  */
-export function resolveRecursionLimit(maxToolRounds) {
+export function resolveToolRoundLimit(maxToolRounds) {
     if (!maxToolRounds || maxToolRounds <= 0) {
         return null;
     }
-    return clampToolRounds(maxToolRounds) * SUPER_STEPS_PER_ROUND;
+    return clampToolRounds(maxToolRounds);
+}
+/** The recursionLimit backstop for a bounded turn's invoke config; see {@link SUPER_STEPS_BACKSTOP_PER_ROUND}. */
+export function backstopRecursionLimit(toolRoundLimit) {
+    return toolRoundLimit * SUPER_STEPS_BACKSTOP_PER_ROUND;
 }
 function clampToolRounds(requested) {
     if (requested < MIN_TOOL_ROUNDS) {
@@ -75,13 +95,36 @@ export const TOOL_CALL_LIMIT_USER_COPY = "The agent reached the tool-call limit
     "Work completed so far has been saved. " +
     "Send another message to continue where the agent left off.";
 /**
- * Whether an error thrown out of a LangGraph run is the graph exhausting the
- * recursion limit `resolveRecursionLimit` placed on it — the budget's own
- * signal, not a failure: the adapter ends the turn `tool_call_limit`.
- * Matched by class name and message because the error class is not
- * exported on a stable path across `@langchain/langgraph` versions.
+ * The execution budget's stop: thrown by `middleware/execution-budget.ts` in
+ * place of round N+1's model call, so the graph ends on round N's tool
+ * results with no proposed call left unexecuted.
+ */
+export class ToolRoundLimitError extends Error {
+    toolRoundLimit;
+    constructor(toolRoundLimit) {
+        super(`Tool-round limit reached: ${toolRoundLimit} rounds`);
+        this.toolRoundLimit = toolRoundLimit;
+        this.name = "ToolRoundLimitError";
+    }
+}
+/**
+ * Whether an error thrown out of a LangGraph run is the tool-call budget
+ * ending the turn — the budget's own signal, not a failure: the adapter ends
+ * the turn `tool_call_limit`. Two producers, one outcome: the round count's
+ * {@link ToolRoundLimitError}, which reaches the turn wrapped in LangChain's
+ * `MiddlewareError` once per `wrapModelCall` layer (so the cause chain is
+ * walked, as `unwrapModelError` does for a model error), and the backstop's
+ * `GraphRecursionError`.
+ */
+export function isToolCallBudgetStop(err) {
+    return unwrapModelError(err) instanceof ToolRoundLimitError || isRecursionLimitError(err);
+}
+/**
+ * LangGraph exhausting the backstop recursion limit. Matched by class name and
+ * message because the error class is not exported on a stable path across
+ * `@langchain/langgraph` versions.
  */
-export function isGraphRecursionError(err) {
+function isRecursionLimitError(err) {
     if (err instanceof Error) {
         return err.constructor.name === "GraphRecursionError" ||
             err.message.includes("GraphRecursionError") ||

package/dist/shared/tool-rounds.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-rounds.js","sourceRoot":"","sources":["../../src/shared/tool-rounds.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,CAAC;AACvC,MAAM,CAAC,MAAM,eAAe,GAAG,EAAE,CAAC;AAClC,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,CAAC;AAEpC;;;;GAIG;AACH,MAAM,CAAC,MAAM,kCAAkC,GAAG,IAAI,CAAC;AAEvD;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CAAC,aAAiC;IACrE,IAAI,CAAC,aAAa,IAAI,aAAa,IAAI,CAAC,EAAE,CAAC;QACzC,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,eAAe,CAAC,aAAa,CAAC,GAAG,qBAAqB,CAAC;AAChE,CAAC;AAED,SAAS,eAAe,CAAC,SAAiB;IACxC,IAAI,SAAS,GAAG,eAAe,EAAE,CAAC;QAChC,OAAO,CAAC,IAAI,CACV,iCAAiC,SAAS,yBAAyB;YACnE,IAAI,eAAe,IAAI,eAAe,kBAAkB,eAAe,EAAE,CAC1E,CAAC;QACF,OAAO,eAAe,CAAC;IACzB,CAAC;IACD,IAAI,SAAS,GAAG,eAAe,EAAE,CAAC;QAChC,OAAO,CAAC,IAAI,CACV,iCAAiC,SAAS,yBAAyB;YACnE,IAAI,eAAe,IAAI,eAAe,kBAAkB,eAAe,EAAE,CAC1E,CAAC;QACF,OAAO,eAAe,CAAC;IACzB,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAAG,mCAAmC,CAAC;AAEhF,6GAA6G;AAC7G,MAAM,UAAU,wBAAwB;IACtC,OAAO,GAAG,4BAA4B,sDAAsD,CAAC;AAC/F,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,yBAAyB,GACpC,0DAA0D;IAC1D,wCAAwC;IACxC,4DAA4D,CAAC;AAE/D;;;;;;GAMG;AACH,MAAM,UAAU,qBAAqB,CAAC,GAAY;IAChD,IAAI,GAAG,YAAY,KAAK,EAAE,CAAC;QACzB,OAAO,GAAG,CAAC,WAAW,CAAC,IAAI,KAAK,qBAAqB;YACnD,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC;YAC3C,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"tool-rounds.js","sourceRoot":"","sources":["../../src/shared/tool-rounds.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,MAAM,CAAC,MAAM,eAAe,GAAG,EAAE,CAAC;AAClC,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,CAAC;AAEpC;;;;GAIG;AACH,MAAM,CAAC,MAAM,8BAA8B,GAAG,EAAE,CAAC;AAEjD;;;;GAIG;AACH,MAAM,CAAC,MAAM,8BAA8B,GAAG,eAAe,CAAC;AAE9D;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CAAC,aAAiC;IACrE,IAAI,CAAC,aAAa,IAAI,aAAa,IAAI,CAAC,EAAE,CAAC;QACzC,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,eAAe,CAAC,aAAa,CAAC,CAAC;AACxC,CAAC;AAED,kHAAkH;AAClH,MAAM,UAAU,sBAAsB,CAAC,cAAsB;IAC3D,OAAO,cAAc,GAAG,8BAA8B,CAAC;AACzD,CAAC;AAED,SAAS,eAAe,CAAC,SAAiB;IACxC,IAAI,SAAS,GAAG,eAAe,EAAE,CAAC;QAChC,OAAO,CAAC,IAAI,CACV,iCAAiC,SAAS,yBAAyB;YACnE,IAAI,eAAe,IAAI,eAAe,kBAAkB,eAAe,EAAE,CAC1E,CAAC;QACF,OAAO,eAAe,CAAC;IACzB,CAAC;IACD,IAAI,SAAS,GAAG,eAAe,EAAE,CAAC;QAChC,OAAO,CAAC,IAAI,CACV,iCAAiC,SAAS,yBAAyB;YACnE,IAAI,eAAe,IAAI,eAAe,kBAAkB,eAAe,EAAE,CAC1E,CAAC;QACF,OAAO,eAAe,CAAC;IACzB,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAAG,mCAAmC,CAAC;AAEhF,6GAA6G;AAC7G,MAAM,UAAU,wBAAwB;IACtC,OAAO,GAAG,4BAA4B,sDAAsD,CAAC;AAC/F,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,yBAAyB,GACpC,0DAA0D;IAC1D,wCAAwC;IACxC,4DAA4D,CAAC;AAE/D;;;;GAIG;AACH,MAAM,OAAO,mBAAoB,SAAQ,KAAK;IACvB;IAArB,YAAqB,cAAsB;QACzC,KAAK,CAAC,6BAA6B,cAAc,SAAS,CAAC,CAAC;QADzC,mBAAc,GAAd,cAAc,CAAQ;QAEzC,IAAI,CAAC,IAAI,GAAG,qBAAqB,CAAC;IACpC,CAAC;CACF;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,oBAAoB,CAAC,GAAY;IAC/C,OAAO,gBAAgB,CAAC,GAAG,CAAC,YAAY,mBAAmB,IAAI,qBAAqB,CAAC,GAAG,CAAC,CAAC;AAC5F,CAAC;AAED;;;;GAIG;AACH,SAAS,qBAAqB,CAAC,GAAY;IACzC,IAAI,GAAG,YAAY,KAAK,EAAE,CAAC;QACzB,OAAO,GAAG,CAAC,WAAW,CAAC,IAAI,KAAK,qBAAqB;YACnD,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC;YAC3C,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}

package/dist/shared/workspace/platform-dir.d.ts

@@ -10,6 +10,8 @@
  *   a real repo never leaves Stigmer files behind in it (see issue #173); only
  *   a minimal, transient `.cursor/hooks.json` referencing the absolute script
  *   path is written into the workspace itself.
+ * - `displaced/` — a real `.stigmer` entry found in the workspace when the
+ *   platform link takes the name, kept rather than deleted (stigmer-link.ts).
  *
  * This module replaces the duplicated `getPlatformDir` helpers in
  * execute-cursor/skill-resolver.ts and shared/attachment-resolver.ts.
@@ -70,6 +72,19 @@ export declare function ensureCheckpointDbPath(sessionId: string): Promise<strin
  * safe to call multiple times for the same session.
  */
 export declare function ensurePlatformDir(sessionId: string): Promise<string>;
+/**
+ * Compute where a real `.stigmer` entry found in a workspace is moved when the
+ * platform link takes the name — `displaced/<stamp>` beside the session's
+ * `platform/` and `hitl/` trees (see stigmer-link.ts). Outside the workspace,
+ * so a real repo is never left holding it (issue #173) and a write-back never
+ * commits it; outside `platform/`, so the agent never reads it back as
+ * platform content.
+ *
+ * Takes the platform dir rather than a session id, unlike its siblings: the
+ * link step knows only the dir it links to, and the session dir is its parent.
+ * Pure function — performs no I/O.
+ */
+export declare function getDisplacedDir(platformDir: string, stamp: string): string;
 /**
  * Compute the HITL directory path for a session — the runner-owned home for the
  * approval gate's hook script, approval-state file, and denial ledger.

package/dist/shared/workspace/platform-dir.js

@@ -10,11 +10,13 @@
  *   a real repo never leaves Stigmer files behind in it (see issue #173); only
  *   a minimal, transient `.cursor/hooks.json` referencing the absolute script
  *   path is written into the workspace itself.
+ * - `displaced/` — a real `.stigmer` entry found in the workspace when the
+ *   platform link takes the name, kept rather than deleted (stigmer-link.ts).
  *
  * This module replaces the duplicated `getPlatformDir` helpers in
  * execute-cursor/skill-resolver.ts and shared/attachment-resolver.ts.
  */
-import { join } from "node:path";
+import { dirname, join } from "node:path";
 import { mkdir } from "node:fs/promises";
 import { homedir } from "node:os";
 import { createHash } from "node:crypto";
@@ -100,6 +102,21 @@ export async function ensurePlatformDir(sessionId) {
     await mkdir(dir, { recursive: true });
     return dir;
 }
+/**
+ * Compute where a real `.stigmer` entry found in a workspace is moved when the
+ * platform link takes the name — `displaced/<stamp>` beside the session's
+ * `platform/` and `hitl/` trees (see stigmer-link.ts). Outside the workspace,
+ * so a real repo is never left holding it (issue #173) and a write-back never
+ * commits it; outside `platform/`, so the agent never reads it back as
+ * platform content.
+ *
+ * Takes the platform dir rather than a session id, unlike its siblings: the
+ * link step knows only the dir it links to, and the session dir is its parent.
+ * Pure function — performs no I/O.
+ */
+export function getDisplacedDir(platformDir, stamp) {
+    return join(dirname(platformDir), "displaced", stamp);
+}
 /**
  * Compute the HITL directory path for a session — the runner-owned home for the
  * approval gate's hook script, approval-state file, and denial ledger.

package/dist/shared/workspace/platform-dir.js.map

@@ -1 +1 @@
-{"version":3,"file":"platform-dir.js","sourceRoot":"","sources":["../../../src/shared/workspace/platform-dir.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,qFAAqF;AACrF,SAAS,cAAc;IACrB,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,EAAE,CAAC;AAClE,CAAC;AAED,+EAA+E;AAC/E,SAAS,aAAa,CAAC,SAAiB;IACtC,OAAO,IAAI,CAAC,cAAc,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;AACnE,CAAC;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,UAAU,cAAc,CAAC,aAAqB;IAClD,MAAM,GAAG,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAClF,OAAO,IAAI,CAAC,cAAc,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,CAAC,CAAC;AAC9D,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,aAAqB;IAC3D,MAAM,GAAG,GAAG,cAAc,CAAC,aAAa,CAAC,CAAC;IAC1C,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACtC,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAAC,SAAiB;IAC9C,OAAO,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,UAAU,CAAC,CAAC;AACpD,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,mBAAmB,CAAC,SAAiB;IACnD,OAAO,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,gBAAgB,CAAC,CAAC;AAC1D,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,SAAiB;IAC5D,MAAM,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3D,OAAO,mBAAmB,CAAC,SAAS,CAAC,CAAC;AACxC,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,SAAiB;IACvD,MAAM,GAAG,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC;IACtC,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACtC,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,UAAU,CAAC,SAAiB;IAC1C,OAAO,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC;AAChD,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,SAAiB;IACnD,MAAM,GAAG,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC;IAClC,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACtC,OAAO,GAAG,CAAC;AACb,CAAC"}
+{"version":3,"file":"platform-dir.js","sourceRoot":"","sources":["../../../src/shared/workspace/platform-dir.ts"],"names":[],"mappings":"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"}

package/dist/shared/workspace/sources/git.js

@@ -50,13 +50,22 @@ export async function provisionGit(options) {
         rootDir: cloneDir,
         sourceType: "git_repo",
         consumedKeys,
-        workspaceDescription: `Your workspace is a git clone of ${url}` +
-            (metadata.branch ? ` (branch: ${metadata.branch})` : "") +
-            `.\nBase commit: ${metadata.baseCommit}`,
+        workspaceDescription: describeClone(url, metadata.branch),
         gitMetadata: metadata,
         entryName: "",
     };
 }
+/**
+ * The model's description of a cloned workspace, the same on the turn that
+ * clones and on every turn that reuses the clone: the native system prompt
+ * carries it and must not change from one message to the next. So it names
+ * the repository and the branch, never the commit (write-back commits move
+ * `HEAD` on every approved turn) and never whether the clone was reused. The
+ * branch changes only when a branch really changes, and the text says so.
+ */
+function describeClone(url, branch) {
+    return `Your workspace is a git clone of ${url}` + (branch ? ` (branch: ${branch})` : "") + ".";
+}
 async function reuseExistingRepo(cloneDir, url, backend, envVars, configureCredentials, targetSubdir) {
     let metadata = await extractGitMetadata(cloneDir, url, backend, targetSubdir);
     const githubToken = envVars.GITHUB_TOKEN;
@@ -70,9 +79,7 @@ async function reuseExistingRepo(cloneDir, url, backend, envVars, configureCrede
         rootDir: cloneDir,
         sourceType: "git_repo",
         consumedKeys: [],
-        workspaceDescription: `Your workspace is a git clone of ${url}` +
-            (metadata.branch ? ` (branch: ${metadata.branch})` : "") +
-            ` (existing repo detected).\nBase commit: ${metadata.baseCommit}`,
+        workspaceDescription: describeClone(url, metadata.branch),
         gitMetadata: metadata,
         entryName: "",
     };

package/dist/shared/workspace/sources/git.js.map

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

package/dist/shared/workspace/stigmer-link.d.ts

@@ -11,10 +11,10 @@
  * `.stigmer/…` paths those agents are prompted with (skill locations,
  * `.stigmer/inputs/…` attachments) actually resolve. The native harness's
  * FILE tools are the exception: their virtual-rooted backend refuses a path
- * whose real location leaves the workspace, so they read the platform dir
- * through a read-only `.stigmer/` route instead
- * (`activities/execute-deep-agent/platform-route.ts`), mounted on exactly
- * the turns this link exists ({@link stigmerSymlinkPointsAt}).
+ * whose real location leaves the workspace, so they reach `.stigmer/` through
+ * a route instead (`activities/execute-deep-agent/platform-route.ts`),
+ * mounted on every turn and exposing the platform dir on exactly the turns
+ * this link exists ({@link stigmerSymlinkPointsAt}).
  *
  * Lifecycle contract (same for both harnesses):
  * - Created per turn, under the workspace turn lock — the link is a
@@ -29,21 +29,28 @@
  * - {@link ensureStigmerSymlink} is idempotent, so multiple populaters may
  *   run in any order within a turn.
  *
- * OWNERSHIP SHARP EDGE: the platform owns the `.stigmer` name inside a
- * workspace. {@link ensureStigmerSymlink} REPLACES a real (non-symlink)
- * `.stigmer` directory it finds there — deliberate, so a directory left
- * behind by an older runner can never shadow the platform mount. (A user's
- * own `.stigmer` content is unreachable anyway: the runner's
- * `LocalWorkspaceBackend` routes every `.stigmer/…` path to the platform
- * dir.) Turn-end removal is the conservative half: it only ever removes a
- * SYMLINK.
+ * OWNERSHIP: the platform owns the `.stigmer` name inside a workspace, but
+ * never deletes what it did not make. A real (non-symlink) `.stigmer` entry
+ * found where the link goes — left by an older runner, or written by a shell
+ * command or a Cursor edit on a turn with no link, where nothing sits between
+ * those tools and the disk (#1123) — is MOVED out of the workspace to the
+ * session's `displaced/` dir (platform-dir.ts `getDisplacedDir`) and named in
+ * a warning; an empty directory is simply removed. Out of the workspace
+ * because a write-back commits everything the tree holds (`git add -A`) and
+ * git excludes only the exact `.stigmer` name. One case is refused outright:
+ * a `.stigmer` that is, or holds, the platform dir itself — a workspace
+ * rooted at the home directory, whose `.stigmer` is the Stigmer home (#1424).
+ * Turn-end removal is the conservative half: it only ever removes a SYMLINK.
  */
 /** The workspace-visible name of the platform namespace. */
 export declare const STIGMER_LOCAL_STATE_DIR = ".stigmer";
 /**
  * Ensure the workspace `.stigmer` symlink points to the platform dir.
- * Idempotent: an existing correct link is kept; a stale link (or a non-link
- * left behind by an older runner) is replaced.
+ * Idempotent: an existing correct link is kept and a stale link is
+ * re-pointed. A real entry in the link's place is moved to the session's
+ * `displaced/` dir first (an empty directory is removed); a real `.stigmer`
+ * that holds the platform dir is refused with an error naming it, before
+ * anything is touched. See the module header, OWNERSHIP.
  */
 export declare function ensureStigmerSymlink(workspaceDir: string, platformDir: string): Promise<void>;
 /**

package/dist/shared/workspace/stigmer-link.js

@@ -11,10 +11,10 @@
  * `.stigmer/…` paths those agents are prompted with (skill locations,
  * `.stigmer/inputs/…` attachments) actually resolve. The native harness's
  * FILE tools are the exception: their virtual-rooted backend refuses a path
- * whose real location leaves the workspace, so they read the platform dir
- * through a read-only `.stigmer/` route instead
- * (`activities/execute-deep-agent/platform-route.ts`), mounted on exactly
- * the turns this link exists ({@link stigmerSymlinkPointsAt}).
+ * whose real location leaves the workspace, so they reach `.stigmer/` through
+ * a route instead (`activities/execute-deep-agent/platform-route.ts`),
+ * mounted on every turn and exposing the platform dir on exactly the turns
+ * this link exists ({@link stigmerSymlinkPointsAt}).
  *
  * Lifecycle contract (same for both harnesses):
  * - Created per turn, under the workspace turn lock — the link is a
@@ -29,45 +29,107 @@
  * - {@link ensureStigmerSymlink} is idempotent, so multiple populaters may
  *   run in any order within a turn.
  *
- * OWNERSHIP SHARP EDGE: the platform owns the `.stigmer` name inside a
- * workspace. {@link ensureStigmerSymlink} REPLACES a real (non-symlink)
- * `.stigmer` directory it finds there — deliberate, so a directory left
- * behind by an older runner can never shadow the platform mount. (A user's
- * own `.stigmer` content is unreachable anyway: the runner's
- * `LocalWorkspaceBackend` routes every `.stigmer/…` path to the platform
- * dir.) Turn-end removal is the conservative half: it only ever removes a
- * SYMLINK.
+ * OWNERSHIP: the platform owns the `.stigmer` name inside a workspace, but
+ * never deletes what it did not make. A real (non-symlink) `.stigmer` entry
+ * found where the link goes — left by an older runner, or written by a shell
+ * command or a Cursor edit on a turn with no link, where nothing sits between
+ * those tools and the disk (#1123) — is MOVED out of the workspace to the
+ * session's `displaced/` dir (platform-dir.ts `getDisplacedDir`) and named in
+ * a warning; an empty directory is simply removed. Out of the workspace
+ * because a write-back commits everything the tree holds (`git add -A`) and
+ * git excludes only the exact `.stigmer` name. One case is refused outright:
+ * a `.stigmer` that is, or holds, the platform dir itself — a workspace
+ * rooted at the home directory, whose `.stigmer` is the Stigmer home (#1424).
+ * Turn-end removal is the conservative half: it only ever removes a SYMLINK.
  */
-import { symlink, readlink, unlink, rm, lstat } from "node:fs/promises";
-import { join } from "node:path";
+import { cp, lstat, mkdir, readdir, readlink, realpath, rename, rm, rmdir, symlink, unlink } from "node:fs/promises";
+import { dirname, isAbsolute, join, relative, sep } from "node:path";
+import { getDisplacedDir } from "./platform-dir.js";
 /** The workspace-visible name of the platform namespace. */
 export const STIGMER_LOCAL_STATE_DIR = ".stigmer";
 /**
  * Ensure the workspace `.stigmer` symlink points to the platform dir.
- * Idempotent: an existing correct link is kept; a stale link (or a non-link
- * left behind by an older runner) is replaced.
+ * Idempotent: an existing correct link is kept and a stale link is
+ * re-pointed. A real entry in the link's place is moved to the session's
+ * `displaced/` dir first (an empty directory is removed); a real `.stigmer`
+ * that holds the platform dir is refused with an error naming it, before
+ * anything is touched. See the module header, OWNERSHIP.
  */
 export async function ensureStigmerSymlink(workspaceDir, platformDir) {
     const linkPath = join(workspaceDir, STIGMER_LOCAL_STATE_DIR);
+    let entry;
     try {
-        const existing = await readlink(linkPath);
-        if (existing === platformDir)
+        entry = await lstat(linkPath);
+    }
+    catch (err) {
+        if (errnoCode(err) !== "ENOENT")
+            throw err;
+    }
+    if (entry?.isSymbolicLink()) {
+        if ((await readlink(linkPath)) === platformDir)
             return;
         await unlink(linkPath);
     }
-    catch (err) {
-        if (err.code === "ENOENT") {
-            // No existing symlink
-        }
-        else if (err.code === "EINVAL") {
-            // Exists but is not a symlink — remove the directory
-            await rm(linkPath, { recursive: true, force: true });
+    else if (entry !== undefined) {
+        await displaceRealEntry(linkPath, platformDir, entry);
+    }
+    await symlink(platformDir, linkPath, "dir");
+}
+/**
+ * Clear a real `.stigmer` entry out of the link's place without losing it:
+ * refuse the Stigmer home, remove an empty directory, move anything else.
+ */
+async function displaceRealEntry(linkPath, platformDir, entry) {
+    if (entry.isDirectory()) {
+        await refuseDirHoldingPlatform(linkPath, platformDir);
+        if ((await readdir(linkPath)).length === 0) {
+            await rmdir(linkPath);
+            return;
         }
-        else {
+    }
+    const destination = getDisplacedDir(platformDir, displacementStamp(new Date()));
+    await mkdir(dirname(destination), { recursive: true });
+    await moveEntry(linkPath, destination);
+    console.warn(`ensureStigmerSymlink: moved the real ${linkPath} out of the workspace to ${destination}; ` +
+        "the platform owns the .stigmer name, so the link to the session's platform dir takes its place");
+}
+/**
+ * Throw when the real `.stigmer` directory is, or contains, the platform dir:
+ * a workspace rooted at the home directory resolves `.stigmer` to the Stigmer
+ * home, where the platform dir, the CLI's config and every session live.
+ * Compared by real path, so a symlinked or `HOME`-overridden spelling of
+ * either side cannot slip past.
+ */
+async function refuseDirHoldingPlatform(linkPath, platformDir) {
+    const [realLink, realPlatform] = await Promise.all([realpath(linkPath), realpath(platformDir)]);
+    const fromLink = relative(realLink, realPlatform);
+    const outside = fromLink === ".." || fromLink.startsWith(`..${sep}`) || isAbsolute(fromLink);
+    if (!outside) {
+        throw new Error(`The workspace's ${linkPath} is the Stigmer home (it holds this session's platform dir, ${platformDir}); ` +
+            "use a project directory as the workspace, not the home directory");
+    }
+}
+/** Rename, or copy then remove when the destination is on another filesystem (a cloud workspace volume and `$HOME` are). */
+async function moveEntry(source, destination) {
+    try {
+        await rename(source, destination);
+    }
+    catch (err) {
+        if (errnoCode(err) !== "EXDEV")
             throw err;
-        }
+        await cp(source, destination, { recursive: true, errorOnExist: true, force: false, verbatimSymlinks: true });
+        await rm(source, { recursive: true, force: true });
     }
-    await symlink(platformDir, linkPath, "dir");
+}
+/** A compact UTC stamp with milliseconds (`20260929T101500123Z`): sortable, and free of the colons a path should not carry. */
+function displacementStamp(now) {
+    return now.toISOString().replace(/[-:.]/g, "");
+}
+/** The errno code of a Node filesystem error, or `undefined` for anything else. */
+function errnoCode(err) {
+    if (typeof err !== "object" || err === null || !("code" in err))
+        return undefined;
+    return typeof err.code === "string" ? err.code : undefined;
 }
 /**
  * Whether the workspace's `.stigmer` is, right now, the link
@@ -102,7 +164,7 @@ export async function removeStigmerSymlink(workspaceDir) {
         }
     }
     catch (err) {
-        if (err?.code !== "ENOENT") {
+        if (errnoCode(err) !== "ENOENT") {
             console.warn(`removeStigmerSymlink: failed to remove ${linkPath} (non-fatal): ` +
                 `${err instanceof Error ? err.message : err}`);
         }

package/dist/shared/workspace/stigmer-link.js.map

@@ -1 +1 @@
-{"version":3,"file":"stigmer-link.js","sourceRoot":"","sources":["../../../src/shared/workspace/stigmer-link.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AAEH,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,4DAA4D;AAC5D,MAAM,CAAC,MAAM,uBAAuB,GAAG,UAAU,CAAC;AAElD;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,YAAoB,EACpB,WAAmB;IAEnB,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,EAAE,uBAAuB,CAAC,CAAC;IAE7D,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC1C,IAAI,QAAQ,KAAK,WAAW;YAAE,OAAO;QACrC,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC;IACzB,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC1B,sBAAsB;QACxB,CAAC;aAAM,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACjC,qDAAqD;YACrD,MAAM,EAAE,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACvD,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;IAED,MAAM,OAAO,CAAC,WAAW,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;AAC9C,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,YAAoB,EAAE,WAAmB;IACpF,IAAI,CAAC;QACH,OAAO,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,uBAAuB,CAAC,CAAC,CAAC,KAAK,WAAW,CAAC;IACvF,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,YAAoB;IAC7D,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,EAAE,uBAAuB,CAAC,CAAC;IAC7D,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,CAAC;QACnC,IAAI,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC;YAC1B,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC;QACzB,CAAC;IACH,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,IAAI,GAAG,EAAE,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC3B,OAAO,CAAC,IAAI,CACV,0CAA0C,QAAQ,gBAAgB;gBAClE,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,CAC9C,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"stigmer-link.js","sourceRoot":"","sources":["../../../src/shared/workspace/stigmer-link.ts"],"names":[],"mappings":"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"}