iterate-plugin 2.9.2 → 2.9.4

package/dist/config-loader.js

@@ -167,25 +167,46 @@ export function validateConfig(config) {
  * path is unsafe; callers must short-circuit on the failure and return a
  * structured error instead of proceeding.
  */
-export function resolveProjectRoot(input) {
+/**
+ * Resolve a caller-supplied project root to a safe absolute path.
+ *
+ * Resolution order for the default (no explicit `path`) case:
+ *   1. `sessionCwd` — the absolute working directory the calling DSH session
+ *      was created in (`exec.agent.session.header.cwd`). This is the
+ *      authoritative workspace for the current conversation and is immune to
+ *      where the web-service process happened to start.
+ *   2. the process cwd, when it is a usable directory (not `/` or the home
+ *      dir — launchd/daemon-managed servers start with cwd=`/`);
+ *   3. the session workspace decoded from `DSH_SESSION_JSONL` (present when
+ *      the DSH runtime injects per-session env into tool sub-processes).
+ */
+export function resolveProjectRoot(input, sessionCwd) {
     const raw = (input ?? '').trim();
-    const root = raw ? resolve(raw) : resolve(effectiveCwd());
+    const root = raw ? resolve(raw) : resolve(effectiveCwd(sessionCwd));
     if (!root || root === sep) {
         return { ok: false, reason: 'Refusing filesystem root as project root.' };
     }
     return { ok: true, root };
 }
+/**
+ * Thin adapter for tool `execute(args, exec)` bodies: pull the session cwd
+ * from the DSH run context and hand it to {@link resolveProjectRoot}.
+ */
+export function resolveProjectRootForExec(exec, input) {
+    return resolveProjectRoot(input, exec?.agent?.session?.header?.cwd);
+}
 /**
  * Resolve the default working directory for tools invoked without an explicit
- * `path`. Prefers the process cwd, but a daemon-managed web server can start
- * with cwd = `/` (e.g. launchd), which is not a usable project root. In that
- * case fall back to the session workspace encoded in `DSH_SESSION_JSONL`
+ * `path`. Prefers the caller-provided session cwd, then the process cwd, then
+ * the session workspace encoded in `DSH_SESSION_JSONL`
  * (`…/sessions/<encoded-workspace>/<session-id>/session.jsonl.zstd`), where
  * the workspace directory is `--`-wrapped with `/` → `-` and percent-encoded
  * bytes spelled as `~<hex>` (e.g. `/Volumes/Eng-Dev/iterate-skill` →
  * `--Volumes-Eng-Dev-iterate-skill--`).
  */
-function effectiveCwd() {
+function effectiveCwd(sessionCwd) {
+    if (sessionCwd && sessionCwd !== sep && sessionCwd !== homedir())
+        return sessionCwd;
     let cwd = '';
     try {
         cwd = process.cwd();

package/dist/tools/checkpoint.js

@@ -10,7 +10,7 @@
  */
 import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { defineTool } from '@deepseek-ai/dsh-tools';
-import { resolveProjectRoot } from "../config-loader.js";
+import { resolveProjectRootForExec } from "../config-loader.js";
 import { checkpointPath, iterateDir } from "../paths.js";
 import { readRegistry } from "./fix.js";
 import { readDecisionEntries } from "./decision-log.js";
@@ -142,8 +142,8 @@ export function registerCheckpointTool(ctx) {
                 { type: 'text', text: JSON.stringify(value, null, 2) },
             ],
         },
-        async execute(args) {
-            const resolved = resolveProjectRoot(args.path);
+        async execute(args, exec) {
+            const resolved = resolveProjectRootForExec(exec, args.path);
             if (!resolved.ok)
                 return { operation: args.operation, ok: false, error: resolved.reason };
             const projectRoot = resolved.root;
@@ -246,8 +246,8 @@ export function registerStatusTool(ctx) {
                 return [{ type: 'text', text: lines.filter(Boolean).join('\n') }];
             },
         },
-        async execute(args) {
-            const resolved = resolveProjectRoot(args.path);
+        async execute(args, exec) {
+            const resolved = resolveProjectRootForExec(exec, args.path);
             if (!resolved.ok)
                 return { ok: false, error: resolved.reason };
             const projectRoot = resolved.root;

package/dist/tools/config.js

@@ -1,6 +1,6 @@
 import { join } from 'node:path';
 import { defineTool } from '@deepseek-ai/dsh-tools';
-import { loadEffectiveConfig, validateConfig, resolveProjectRoot } from "../config-loader.js";
+import { loadEffectiveConfig, validateConfig, resolveProjectRootForExec } from "../config-loader.js";
 import { applyConfigUpdates, readRawConfig, validateConfigUpdates, writeConfigFile, } from "../config-write.js";
 /**
  * Register the `iterate_config` tool.
@@ -62,8 +62,8 @@ export function registerConfigTool(ctx) {
                 { type: 'text', text: JSON.stringify(value, null, 2) },
             ],
         },
-        async execute(args) {
-            const resolved = resolveProjectRoot(args.path);
+        async execute(args, exec) {
+            const resolved = resolveProjectRootForExec(exec, args.path);
             if (!resolved.ok) {
                 return { found: false, error: resolved.reason };
             }

package/dist/tools/context.js

@@ -2,7 +2,7 @@ import { readFileSync, existsSync } from 'node:fs';
 import { join, dirname, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { defineTool } from '@deepseek-ai/dsh-tools';
-import { resolveProjectRoot } from "../config-loader.js";
+import { resolveProjectRootForExec } from "../config-loader.js";
 /** How many ancestor directories we walk up looking for a SKILL.md. */
 const MAX_SKILL_DIR_LOOKUP_DEPTH = 12;
 /** Maximum number of image attachments relayed into the context in one call. */
@@ -235,8 +235,8 @@ export function registerContextTool(ctx) {
                 return [{ type: 'text', text: parts.join('\n\n') }];
             },
         },
-        async execute(args) {
-            const resolved = resolveProjectRoot(args.path);
+        async execute(args, exec) {
+            const resolved = resolveProjectRootForExec(exec, args.path);
             if (!resolved.ok) {
                 return { found: false, error: resolved.reason, searched: [] };
             }

package/dist/tools/decision-log.js

@@ -1,7 +1,7 @@
 import { appendFileSync, readFileSync, mkdirSync, existsSync } from 'node:fs';
 import { join } from 'node:path';
 import { defineTool } from '@deepseek-ai/dsh-tools';
-import { resolveProjectRoot } from "../config-loader.js";
+import { resolveProjectRootForExec } from "../config-loader.js";
 const LOG_DIR = '.iterate';
 const LOG_FILE = 'decision-log.jsonl';
 /** All valid DecisionLogEntry `type` values (must stay in sync with Types). */
@@ -147,8 +147,8 @@ export function registerDecisionLogTool(ctx) {
                 { type: 'text', text: JSON.stringify(value, null, 2) },
             ],
         },
-        async execute(args) {
-            const resolved = resolveProjectRoot(args.path);
+        async execute(args, exec) {
+            const resolved = resolveProjectRootForExec(exec, args.path);
             if (!resolved.ok) {
                 return { operation: args.operation, error: resolved.reason };
             }

package/dist/tools/fix.js

@@ -19,7 +19,7 @@
 import { copyFileSync, existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { defineTool } from '@deepseek-ai/dsh-tools';
-import { loadEffectiveConfig, resolveProjectRoot } from "../config-loader.js";
+import { loadEffectiveConfig, resolveProjectRootForExec } from "../config-loader.js";
 import { countTouchedMethods } from "../method-scope.js";
 import { fixBackupPath, fixRegistryPath, fixesDir } from "../paths.js";
 import { appendDecisionEntry } from "./decision-log.js";
@@ -272,8 +272,8 @@ export function registerFixTool(ctx) {
                 { type: 'text', text: value.ok ? `${value.diffSummary ?? 'fixed'} @ ${value.file} (id: ${value.id})` : `fix failed: ${value.error}` },
             ],
         },
-        async execute(args) {
-            const resolved = resolveProjectRoot(args.path);
+        async execute(args, exec) {
+            const resolved = resolveProjectRootForExec(exec, args.path);
             if (!resolved.ok)
                 return { ok: false, error: resolved.reason };
             const projectRoot = resolved.root;
@@ -433,8 +433,8 @@ export function registerDiffTool(ctx) {
                 return [{ type: 'text', text }];
             },
         },
-        async execute(args) {
-            const resolved = resolveProjectRoot(args.path);
+        async execute(args, exec) {
+            const resolved = resolveProjectRootForExec(exec, args.path);
             if (!resolved.ok)
                 return { ok: false, error: resolved.reason };
             const projectRoot = resolved.root;
@@ -520,8 +520,8 @@ export function registerRollbackTool(ctx) {
                 { type: 'text', text: value.ok ? `reverted fix ${value.id} in ${value.file}` : `rollback failed: ${value.error}` },
             ],
         },
-        async execute(args) {
-            const resolved = resolveProjectRoot(args.path);
+        async execute(args, exec) {
+            const resolved = resolveProjectRootForExec(exec, args.path);
             if (!resolved.ok)
                 return { ok: false, error: resolved.reason };
             const projectRoot = resolved.root;

package/dist/tools/history.js

@@ -8,7 +8,7 @@
  * Complements `iterate_status` (compact summary) with the actual detail.
  */
 import { defineTool } from '@deepseek-ai/dsh-tools';
-import { resolveProjectRoot } from "../config-loader.js";
+import { resolveProjectRootForExec } from "../config-loader.js";
 import { readDecisionEntries } from "./decision-log.js";
 import { readRegistry } from "./fix.js";
 const DEFAULT_LIMIT = 50;
@@ -117,8 +117,8 @@ export function registerHistoryTool(ctx) {
                 return [{ type: 'text', text: lines.join('\n') }];
             },
         },
-        async execute(args) {
-            const resolved = resolveProjectRoot(args.path);
+        async execute(args, exec) {
+            const resolved = resolveProjectRootForExec(exec, args.path);
             if (!resolved.ok)
                 return { ok: false, kind: 'history', error: resolved.reason };
             const projectRoot = resolved.root;

package/dist/tools/prune.js

@@ -20,7 +20,7 @@
 import { existsSync, readdirSync, rmSync, unlinkSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { defineTool } from '@deepseek-ai/dsh-tools';
-import { resolveProjectRoot } from "../config-loader.js";
+import { resolveProjectRootForExec } from "../config-loader.js";
 import { readDecisionEntries, appendDecisionEntry } from "./decision-log.js";
 import { readRegistry, removeRecord, recomputeRoundCounts } from "./fix.js";
 import { iterateDir, fixesDir, checkpointPath, fixRegistryPath } from "../paths.js";
@@ -225,8 +225,8 @@ export function registerPruneTool(ctx) {
                 return [{ type: 'text', text: lines.join('\n') }];
             },
         },
-        async execute(args) {
-            const resolved = resolveProjectRoot(args.path);
+        async execute(args, exec) {
+            const resolved = resolveProjectRootForExec(exec, args.path);
             if (!resolved.ok)
                 return { ok: false, dryRun: true, error: resolved.reason };
             const projectRoot = resolved.root;

package/dist/tools/review.js

@@ -1,5 +1,5 @@
 import { defineTool } from '@deepseek-ai/dsh-tools';
-import { loadEffectiveConfig, resolveProjectRoot } from "../config-loader.js";
+import { loadEffectiveConfig, resolveProjectRootForExec } from "../config-loader.js";
 import { buildReviewPlan, buildReviewReport, sanitizeRounds, validateRoundsSchema, } from "../review.js";
 import { buildFinalReviewReport, metaReviewReport } from "../meta-review.js";
 import { evidenceToPlain, verifyFindings } from "../evidence.js";
@@ -106,8 +106,8 @@ export function registerReviewTool(ctx) {
                 { type: 'text', text: JSON.stringify(value, null, 2) },
             ],
         },
-        async execute(args) {
-            const resolved = resolveProjectRoot(args.path);
+        async execute(args, exec) {
+            const resolved = resolveProjectRootForExec(exec, args.path);
             if (!resolved.ok) {
                 return { operation: args.operation, error: resolved.reason };
             }

package/dist/tools/triage.js

@@ -2,7 +2,7 @@ import { copyFileSync, existsSync, readFileSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { defineTool } from '@deepseek-ai/dsh-tools';
 import yaml from 'js-yaml';
-import { resolveProjectRoot } from "../config-loader.js";
+import { resolveProjectRootForExec } from "../config-loader.js";
 const CONFIG_FILE = 'iterate.config.yaml';
 /** Personalization key that holds the known-intentional list. */
 const PERSONALIZATION_KEY = 'personalization';
@@ -272,8 +272,8 @@ export function registerTriageTool(ctx) {
                 { type: 'text', text: JSON.stringify(value, null, 2) },
             ],
         },
-        async execute(args) {
-            const resolved = resolveProjectRoot(args.path);
+        async execute(args, exec) {
+            const resolved = resolveProjectRootForExec(exec, args.path);
             if (!resolved.ok) {
                 return { operation: args.operation, error: resolved.reason };
             }

package/dist/tools/validate.js

@@ -1,6 +1,6 @@
 import { exec } from 'node:child_process';
 import { defineTool } from '@deepseek-ai/dsh-tools';
-import { loadEffectiveConfig, isCommandAllowed, flattenCommands, resolveProjectRoot, } from "../config-loader.js";
+import { loadEffectiveConfig, isCommandAllowed, flattenCommands, resolveProjectRootForExec, } from "../config-loader.js";
 const DEFAULT_TIMEOUT_MS = 120_000;
 /** Hard ceiling on a single validation command's runtime, so a model cannot
  *  pin the tool open indefinitely via an unbounded `timeout` argument. */
@@ -103,8 +103,8 @@ export function registerValidateTool(ctx) {
                 },
             ],
         },
-        async execute(args) {
-            const resolved = resolveProjectRoot(args.path);
+        async execute(args, exec) {
+            const resolved = resolveProjectRootForExec(exec, args.path);
             if (!resolved.ok) {
                 return {
                     allowed: false,

package/lib/client.js

@@ -43,6 +43,20 @@ var SEVERITY_COLOR = {
   medium: "#eab308",
   low: "#6b7280"
 };
+function safeGet(o, key) {
+  try {
+    return o[key];
+  } catch {
+    return void 0;
+  }
+}
+function safeKeys(o) {
+  try {
+    return Object.keys(o);
+  } catch {
+    return [];
+  }
+}
 function scanSessionForResume(obj, seen, maxDepth = 20) {
   if (maxDepth <= 0) return 0;
   if (!obj || typeof obj !== "object") return 0;
@@ -54,27 +68,28 @@ function scanSessionForResume(obj, seen, maxDepth = 20) {
     /** @type {Record<string, unknown>} */
     obj
   );
-  if (direct.type === "resume") {
+  if (safeGet(direct, "type") === "resume") {
     const data = (
       /** @type {Record<string, unknown>} */
-      direct.data || {}
+      safeGet(direct, "data") || {}
     );
-    if (typeof data.resumeCount === "number" && data.resumeCount > best) {
-      best = data.resumeCount;
+    if (typeof safeGet(data, "resumeCount") === "number" && safeGet(data, "resumeCount") > best) {
+      best = safeGet(data, "resumeCount");
     }
   }
-  if (direct.entry && typeof direct.entry === "object") {
+  const directEntry = safeGet(direct, "entry");
+  if (directEntry && typeof directEntry === "object") {
     const entry = (
       /** @type {Record<string, unknown>} */
-      direct.entry
+      directEntry
     );
-    if (entry.type === "resume") {
+    if (safeGet(entry, "type") === "resume") {
       const data = (
         /** @type {Record<string, unknown>} */
-        entry.data || {}
+        safeGet(entry, "data") || {}
       );
-      if (typeof data.resumeCount === "number" && data.resumeCount > best) {
-        best = data.resumeCount;
+      if (typeof safeGet(data, "resumeCount") === "number" && safeGet(data, "resumeCount") > best) {
+        best = safeGet(data, "resumeCount");
       }
     }
   }
@@ -85,8 +100,8 @@ function scanSessionForResume(obj, seen, maxDepth = 20) {
     }
     return best;
   }
-  for (const key of Object.keys(direct)) {
-    const val = direct[key];
+  for (const key of safeKeys(direct)) {
+    const val = safeGet(direct, key);
     if (val && typeof val === "object") {
       const found = scanSessionForResume(val, s, maxDepth - 1);
       if (found > best) best = found;
@@ -107,15 +122,15 @@ function countSessionImages(session) {
       obj
     );
     let ref = null;
-    if (o.type === "image" && o.attachment && typeof o.attachment === "object") {
+    if (safeGet(o, "type") === "image" && safeGet(o, "attachment") && typeof safeGet(o, "attachment") === "object") {
       ref = /** @type {Record<string, unknown>} */
-      o.attachment;
+      safeGet(o, "attachment");
     }
-    if (!ref && typeof o.mediaType === "string" && String(o.mediaType).startsWith("image/")) {
+    if (!ref && typeof safeGet(o, "mediaType") === "string" && String(safeGet(o, "mediaType")).startsWith("image/")) {
       ref = o;
     }
     if (ref) {
-      const id = typeof ref.attachmentId === "string" ? ref.attachmentId : null;
+      const id = typeof safeGet(ref, "attachmentId") === "string" ? safeGet(ref, "attachmentId") : null;
       if (id) {
         if (!ids.has(id)) {
           ids.add(id);
@@ -129,8 +144,8 @@ function countSessionImages(session) {
       for (const item of obj) walk(item, depth - 1);
       return;
     }
-    for (const key of Object.keys(o)) {
-      const val = o[key];
+    for (const key of safeKeys(o)) {
+      const val = safeGet(o, key);
       if (val && typeof val === "object") walk(val, depth - 1);
     }
   };
@@ -144,7 +159,8 @@ function isReviewReport(obj) {
     /** @type {Record<string, unknown>} */
     obj
   );
-  return typeof o.convergence === "object" && o.convergence !== null && Array.isArray(o.findings) && Array.isArray(o.rounds);
+  const convergence = safeGet(o, "convergence");
+  return typeof convergence === "object" && convergence !== null && Array.isArray(safeGet(o, "findings")) && Array.isArray(safeGet(o, "rounds"));
 }
 function findReportInObject(obj, seen, maxDepth = 20) {
   if (maxDepth <= 0) return null;
@@ -167,8 +183,8 @@ function findReportInObject(obj, seen, maxDepth = 20) {
     /** @type {Record<string, unknown>} */
     obj
   );
-  for (const key of Object.keys(o)) {
-    const val = o[key];
+  for (const key of safeKeys(o)) {
+    const val = safeGet(o, key);
     if (val && typeof val === "object") {
       const found = findReportInObject(val, s, maxDepth - 1);
       if (found) return found;
@@ -184,54 +200,58 @@ function scanSessionForReport(session) {
     /** @type {Record<string, unknown>} */
     session
   );
-  if (Array.isArray(s.toolCalls)) {
+  const toolCalls = safeGet(s, "toolCalls");
+  if (Array.isArray(toolCalls)) {
     const calls = (
       /** @type {Array<Record<string, unknown>>} */
-      s.toolCalls
+      toolCalls
     );
     for (let i = calls.length - 1; i >= 0; i--) {
       const call = calls[i];
       if (!call) continue;
-      if (call.tool === "iterate_review" || String(call.tool ?? "").endsWith("iterate_review")) {
-        const result = call.result;
+      if (safeGet(call, "tool") === "iterate_review" || String(safeGet(call, "tool") ?? "").endsWith("iterate_review")) {
+        const result = safeGet(call, "result");
         if (result && typeof result === "object") {
           const r = (
             /** @type {Record<string, unknown>} */
             result
           );
-          if (r.report && typeof r.report === "object") {
+          const report = safeGet(r, "report");
+          if (report && typeof report === "object") {
             return (
               /** @type {Record<string, unknown>} */
-              r.report
+              report
             );
           }
         }
       }
     }
   }
-  if (Array.isArray(s.messages)) {
+  const messages = safeGet(s, "messages");
+  if (Array.isArray(messages)) {
     const msgs = (
       /** @type {Array<Record<string, unknown>>} */
-      s.messages
+      messages
     );
     for (let i = msgs.length - 1; i >= 0; i--) {
       const msg = msgs[i];
-      if (!msg || !Array.isArray(msg.tool_calls)) continue;
+      const msgCalls = msg && Array.isArray(safeGet(msg, "tool_calls")) ? safeGet(msg, "tool_calls") : null;
+      if (!msg || !msgCalls) continue;
       const calls = (
         /** @type {Array<Record<string, unknown>>} */
-        msg.tool_calls
+        msgCalls
       );
       for (const call of calls) {
         if (!call) continue;
-        const fn = call.function;
+        const fn = safeGet(call, "function");
         if (fn && typeof fn === "object") {
           const f = (
             /** @type {Record<string, unknown>} */
             fn
           );
-          if (String(f.name ?? "").endsWith("iterate_review")) {
+          if (String(safeGet(f, "name") ?? "").endsWith("iterate_review")) {
             try {
-              const args = JSON.parse(String(f.arguments ?? "{}"));
+              const args = JSON.parse(String(safeGet(f, "arguments") ?? "{}"));
               const found = findReportInObject(args);
               if (found) return found;
             } catch {
@@ -249,8 +269,8 @@ function isRunSummary(obj) {
     /** @type {Record<string, unknown>} */
     obj
   );
-  const final = o.finalReport;
-  return !!final && typeof final === "object" && (final.verdict === "approved" || final.verdict === "needs_revision");
+  const final = safeGet(o, "finalReport");
+  return !!final && typeof final === "object" && (safeGet(final, "verdict") === "approved" || safeGet(final, "verdict") === "needs_revision");
 }
 function findRunSummaryInObject(obj, seen, maxDepth = 20) {
   if (maxDepth <= 0) return null;
@@ -273,8 +293,8 @@ function findRunSummaryInObject(obj, seen, maxDepth = 20) {
     /** @type {Record<string, unknown>} */
     obj
   );
-  for (const key of Object.keys(o)) {
-    const val = o[key];
+  for (const key of safeKeys(o)) {
+    const val = safeGet(o, key);
     if (val && typeof val === "object") {
       const found = findRunSummaryInObject(val, s, maxDepth - 1);
       if (found) return found;
@@ -290,29 +310,31 @@ function scanSessionForRunSummary(session) {
     /** @type {Record<string, unknown>} */
     session
   );
-  if (Array.isArray(s.toolCalls)) {
+  const toolCalls = safeGet(s, "toolCalls");
+  if (Array.isArray(toolCalls)) {
     const calls = (
       /** @type {Array<Record<string, unknown>>} */
-      s.toolCalls
+      toolCalls
     );
     for (let i = calls.length - 1; i >= 0; i--) {
       const call = calls[i];
       if (!call) continue;
-      if (call.tool === "workflow" || String(call.tool ?? "").endsWith("workflow")) {
-        const found = findRunSummaryInObject(call.result, void 0, 24);
+      if (safeGet(call, "tool") === "workflow" || String(safeGet(call, "tool") ?? "").endsWith("workflow")) {
+        const found = findRunSummaryInObject(safeGet(call, "result"), void 0, 24);
         if (found) return found;
       }
     }
   }
-  if (Array.isArray(s.messages)) {
+  const messages = safeGet(s, "messages");
+  if (Array.isArray(messages)) {
     const msgs = (
       /** @type {Array<Record<string, unknown>>} */
-      s.messages
+      messages
     );
     for (let i = msgs.length - 1; i >= 0; i--) {
       const msg = msgs[i];
       if (!msg) continue;
-      const found = findRunSummaryInObject(msg.content);
+      const found = findRunSummaryInObject(safeGet(msg, "content"));
       if (found) return found;
     }
   }
@@ -326,22 +348,22 @@ function extractVerdict(runSummary) {
   );
   const final = (
     /** @type {Record<string, unknown>} */
-    o.finalReport
+    safeGet(o, "finalReport")
   );
-  const meta = final.metaReview && typeof final.metaReview === "object" ? (
+  const meta = safeGet(final, "metaReview") && typeof safeGet(final, "metaReview") === "object" ? (
     /** @type {Record<string, unknown>} */
-    final.metaReview
+    safeGet(final, "metaReview")
   ) : {};
-  const issues = Array.isArray(meta.issues) ? meta.issues : [];
-  const roundsVal = o.rounds;
+  const issues = Array.isArray(safeGet(meta, "issues")) ? safeGet(meta, "issues") : [];
+  const roundsVal = safeGet(o, "rounds");
   const totalRounds = typeof roundsVal === "number" ? roundsVal : Array.isArray(roundsVal) ? roundsVal.length : 0;
   return {
-    verdict: final.verdict === "needs_revision" ? "needs_revision" : "approved",
+    verdict: safeGet(final, "verdict") === "needs_revision" ? "needs_revision" : "approved",
     reportIssues: issues.length,
-    checksRun: typeof meta.checksRun === "number" ? meta.checksRun : 0,
-    converged: o.converged === true,
+    checksRun: typeof safeGet(meta, "checksRun") === "number" ? safeGet(meta, "checksRun") : 0,
+    converged: safeGet(o, "converged") === true,
     totalRounds,
-    totalFindings: typeof o.totalFindings === "number" ? o.totalFindings : 0
+    totalFindings: typeof safeGet(o, "totalFindings") === "number" ? safeGet(o, "totalFindings") : 0
   };
 }
 function normalizeReport(report) {

package/lib/parse.js

@@ -28,6 +28,31 @@ export const SEVERITY_COLOR = {
   low: '#6b7280',
 }
 
+// ─── Safe property access ────────────────────────────────────────────────────
+// Session snapshots handed to the client UI can be cordis service proxies or
+// contain proxy references (owner share objects). Reading an un-injected
+// service name off such a proxy throws `cannot get property "x" without
+// inject`. All deep scans below therefore read through these helpers so a
+// hostile/proxied object degrades to "no match" instead of crashing the slot.
+
+/** Read one property that may sit on a cordis service proxy; never throws. */
+function safeGet(o, key) {
+  try {
+    return o[key]
+  } catch {
+    return undefined
+  }
+}
+
+/** Keys of an object that may be a cordis service proxy; never throws. */
+function safeKeys(o) {
+  try {
+    return Object.keys(o)
+  } catch {
+    return []
+  }
+}
+
 // ─── Interruption / resume + image attachment detection ──────────────────────
 
 /**
@@ -55,19 +80,20 @@ export function scanSessionForResume(obj, seen, maxDepth = 20) {
 
   // Direct marker: { type: "resume", data: { resumeCount } }.
   const direct = /** @type {Record<string, unknown>} */ (obj)
-  if (direct.type === 'resume') {
-    const data = /** @type {Record<string, unknown>} */ (direct.data || {})
-    if (typeof data.resumeCount === 'number' && data.resumeCount > best) {
-      best = data.resumeCount
+  if (safeGet(direct, 'type') === 'resume') {
+    const data = /** @type {Record<string, unknown>} */ (safeGet(direct, 'data') || {})
+    if (typeof safeGet(data, 'resumeCount') === 'number' && safeGet(data, 'resumeCount') > best) {
+      best = safeGet(data, 'resumeCount')
     }
   }
   // Nested entry: { entry: { type: "resume", data: { resumeCount } } }.
-  if (direct.entry && typeof direct.entry === 'object') {
-    const entry = /** @type {Record<string, unknown>} */ (direct.entry)
-    if (entry.type === 'resume') {
-      const data = /** @type {Record<string, unknown>} */ (entry.data || {})
-      if (typeof data.resumeCount === 'number' && data.resumeCount > best) {
-        best = data.resumeCount
+  const directEntry = safeGet(direct, 'entry')
+  if (directEntry && typeof directEntry === 'object') {
+    const entry = /** @type {Record<string, unknown>} */ (directEntry)
+    if (safeGet(entry, 'type') === 'resume') {
+      const data = /** @type {Record<string, unknown>} */ (safeGet(entry, 'data') || {})
+      if (typeof safeGet(data, 'resumeCount') === 'number' && safeGet(data, 'resumeCount') > best) {
+        best = safeGet(data, 'resumeCount')
       }
     }
   }
@@ -80,8 +106,8 @@ export function scanSessionForResume(obj, seen, maxDepth = 20) {
     return best
   }
 
-  for (const key of Object.keys(direct)) {
-    const val = direct[key]
+  for (const key of safeKeys(direct)) {
+    const val = safeGet(direct, key)
     if (val && typeof val === 'object') {
       const found = scanSessionForResume(val, s, maxDepth - 1)
       if (found > best) best = found
@@ -115,15 +141,15 @@ export function countSessionImages(session) {
 
     // Image block: { type: "image", attachment: { ...ref } }.
     let ref = null
-    if (o.type === 'image' && o.attachment && typeof o.attachment === 'object') {
-      ref = /** @type {Record<string, unknown>} */ (o.attachment)
+    if (safeGet(o, 'type') === 'image' && safeGet(o, 'attachment') && typeof safeGet(o, 'attachment') === 'object') {
+      ref = /** @type {Record<string, unknown>} */ (safeGet(o, 'attachment'))
     }
     // Raw attachment reference shape.
-    if (!ref && typeof o.mediaType === 'string' && String(o.mediaType).startsWith('image/')) {
+    if (!ref && typeof safeGet(o, 'mediaType') === 'string' && String(safeGet(o, 'mediaType')).startsWith('image/')) {
       ref = o
     }
     if (ref) {
-      const id = typeof ref.attachmentId === 'string' ? ref.attachmentId : null
+      const id = typeof safeGet(ref, 'attachmentId') === 'string' ? safeGet(ref, 'attachmentId') : null
       if (id) {
         if (!ids.has(id)) { ids.add(id); count += 1 }
       } else {
@@ -135,8 +161,8 @@ export function countSessionImages(session) {
       for (const item of obj) walk(item, depth - 1)
       return
     }
-    for (const key of Object.keys(o)) {
-      const val = o[key]
+    for (const key of safeKeys(o)) {
+      const val = safeGet(o, key)
       if (val && typeof val === 'object') walk(val, depth - 1)
     }
   }
@@ -159,11 +185,12 @@ export function countSessionImages(session) {
 export function isReviewReport(obj) {
   if (!obj || typeof obj !== 'object') return false
   const o = /** @type {Record<string, unknown>} */ (obj)
+  const convergence = safeGet(o, 'convergence')
   return (
-    typeof o.convergence === 'object' &&
-    o.convergence !== null &&
-    Array.isArray(o.findings) &&
-    Array.isArray(o.rounds)
+    typeof convergence === 'object' &&
+    convergence !== null &&
+    Array.isArray(safeGet(o, 'findings')) &&
+    Array.isArray(safeGet(o, 'rounds'))
   )
 }
 
@@ -201,8 +228,8 @@ export function findReportInObject(obj, seen, maxDepth = 20) {
 
   // Check object values
   const o = /** @type {Record<string, unknown>} */ (obj)
-  for (const key of Object.keys(o)) {
-    const val = o[key]
+  for (const key of safeKeys(o)) {
+    const val = safeGet(o, key)
     if (val && typeof val === 'object') {
       // Check leaf values that are arrays or objects
       const found = findReportInObject(val, s, maxDepth - 1)
@@ -231,17 +258,19 @@ export function scanSessionForReport(session) {
   const s = /** @type {Record<string, unknown>} */ (session)
 
   // Common pattern: session.toolCalls[].result.report
-  if (Array.isArray(s.toolCalls)) {
-    const calls = /** @type {Array<Record<string, unknown>>} */ (s.toolCalls)
+  const toolCalls = safeGet(s, 'toolCalls')
+  if (Array.isArray(toolCalls)) {
+    const calls = /** @type {Array<Record<string, unknown>>} */ (toolCalls)
     for (let i = calls.length - 1; i >= 0; i--) {
       const call = calls[i]
       if (!call) continue
-      if (call.tool === 'iterate_review' || String(call.tool ?? '').endsWith('iterate_review')) {
-        const result = call.result
+      if (safeGet(call, 'tool') === 'iterate_review' || String(safeGet(call, 'tool') ?? '').endsWith('iterate_review')) {
+        const result = safeGet(call, 'result')
         if (result && typeof result === 'object') {
           const r = /** @type {Record<string, unknown>} */ (result)
-          if (r.report && typeof r.report === 'object') {
-            return /** @type {Record<string, unknown>} */ (r.report)
+          const report = safeGet(r, 'report')
+          if (report && typeof report === 'object') {
+            return /** @type {Record<string, unknown>} */ (report)
           }
         }
       }
@@ -249,21 +278,23 @@ export function scanSessionForReport(session) {
   }
 
   // Common pattern: session.messages[].tool_calls[].function.arguments
-  if (Array.isArray(s.messages)) {
-    const msgs = /** @type {Array<Record<string, unknown>>} */ (s.messages)
+  const messages = safeGet(s, 'messages')
+  if (Array.isArray(messages)) {
+    const msgs = /** @type {Array<Record<string, unknown>>} */ (messages)
     for (let i = msgs.length - 1; i >= 0; i--) {
       const msg = msgs[i]
-      if (!msg || !Array.isArray(msg.tool_calls)) continue
-      const calls = /** @type {Array<Record<string, unknown>>} */ (msg.tool_calls)
+      const msgCalls = msg && Array.isArray(safeGet(msg, 'tool_calls')) ? safeGet(msg, 'tool_calls') : null
+      if (!msg || !msgCalls) continue
+      const calls = /** @type {Array<Record<string, unknown>>} */ (msgCalls)
       for (const call of calls) {
         if (!call) continue
-        const fn = call.function
+        const fn = safeGet(call, 'function')
         if (fn && typeof fn === 'object') {
           const f = /** @type {Record<string, unknown>} */ (fn)
-          if (String(f.name ?? '').endsWith('iterate_review')) {
+          if (String(safeGet(f, 'name') ?? '').endsWith('iterate_review')) {
             // Try to parse arguments
             try {
-              const args = JSON.parse(String(f.arguments ?? '{}'))
+              const args = JSON.parse(String(safeGet(f, 'arguments') ?? '{}'))
               const found = findReportInObject(args)
               if (found) return found
             } catch {
@@ -296,10 +327,10 @@ export function scanSessionForReport(session) {
 export function isRunSummary(obj) {
   if (!obj || typeof obj !== 'object') return false
   const o = /** @type {Record<string, unknown>} */ (obj)
-  const final = o.finalReport
+  const final = safeGet(o, 'finalReport')
   return !!final &&
     typeof final === 'object' &&
-    (final.verdict === 'approved' || final.verdict === 'needs_revision')
+    (safeGet(final, 'verdict') === 'approved' || safeGet(final, 'verdict') === 'needs_revision')
 }
 
 /**
@@ -330,8 +361,8 @@ export function findRunSummaryInObject(obj, seen, maxDepth = 20) {
   }
 
   const o = /** @type {Record<string, unknown>} */ (obj)
-  for (const key of Object.keys(o)) {
-    const val = o[key]
+  for (const key of safeKeys(o)) {
+    const val = safeGet(o, key)
     if (val && typeof val === 'object') {
       const found = findRunSummaryInObject(val, s, maxDepth - 1)
       if (found) return found
@@ -357,25 +388,27 @@ export function scanSessionForRunSummary(session) {
   const s = /** @type {Record<string, unknown>} */ (session)
 
   // Common pattern: session.toolCalls[].result contains a run summary.
-  if (Array.isArray(s.toolCalls)) {
-    const calls = /** @type {Array<Record<string, unknown>>} */ (s.toolCalls)
+  const toolCalls = safeGet(s, 'toolCalls')
+  if (Array.isArray(toolCalls)) {
+    const calls = /** @type {Array<Record<string, unknown>>} */ (toolCalls)
     for (let i = calls.length - 1; i >= 0; i--) {
       const call = calls[i]
       if (!call) continue
-      if (call.tool === 'workflow' || String(call.tool ?? '').endsWith('workflow')) {
-        const found = findRunSummaryInObject(call.result, undefined, 24)
+      if (safeGet(call, 'tool') === 'workflow' || String(safeGet(call, 'tool') ?? '').endsWith('workflow')) {
+        const found = findRunSummaryInObject(safeGet(call, 'result'), undefined, 24)
         if (found) return found
       }
     }
   }
 
   // Common pattern: assistant message content holding the workflow return.
-  if (Array.isArray(s.messages)) {
-    const msgs = /** @type {Array<Record<string, unknown>>} */ (s.messages)
+  const messages = safeGet(s, 'messages')
+  if (Array.isArray(messages)) {
+    const msgs = /** @type {Array<Record<string, unknown>>} */ (messages)
     for (let i = msgs.length - 1; i >= 0; i--) {
       const msg = msgs[i]
       if (!msg) continue
-      const found = findRunSummaryInObject(msg.content)
+      const found = findRunSummaryInObject(safeGet(msg, 'content'))
       if (found) return found
     }
   }
@@ -393,21 +426,21 @@ export function scanSessionForRunSummary(session) {
 export function extractVerdict(runSummary) {
   if (!isRunSummary(runSummary)) return null
   const o = /** @type {Record<string, unknown>} */ (runSummary)
-  const final = /** @type {Record<string, unknown>} */ (o.finalReport)
-  const meta = final.metaReview && typeof final.metaReview === 'object'
-    ? /** @type {Record<string, unknown>} */ (final.metaReview)
+  const final = /** @type {Record<string, unknown>} */ (safeGet(o, 'finalReport'))
+  const meta = safeGet(final, 'metaReview') && typeof safeGet(final, 'metaReview') === 'object'
+    ? /** @type {Record<string, unknown>} */ (safeGet(final, 'metaReview'))
     : {}
-  const issues = Array.isArray(meta.issues) ? meta.issues : []
+  const issues = Array.isArray(safeGet(meta, 'issues')) ? safeGet(meta, 'issues') : []
   // `totalRounds` may be a bare number (dry-run returns `rounds`) or a count.
-  const roundsVal = o.rounds
+  const roundsVal = safeGet(o, 'rounds')
   const totalRounds = typeof roundsVal === 'number' ? roundsVal : (Array.isArray(roundsVal) ? roundsVal.length : 0)
   return {
-    verdict: final.verdict === 'needs_revision' ? 'needs_revision' : 'approved',
+    verdict: safeGet(final, 'verdict') === 'needs_revision' ? 'needs_revision' : 'approved',
     reportIssues: issues.length,
-    checksRun: typeof meta.checksRun === 'number' ? meta.checksRun : 0,
-    converged: o.converged === true,
+    checksRun: typeof safeGet(meta, 'checksRun') === 'number' ? safeGet(meta, 'checksRun') : 0,
+    converged: safeGet(o, 'converged') === true,
     totalRounds,
-    totalFindings: typeof o.totalFindings === 'number' ? o.totalFindings : 0,
+    totalFindings: typeof safeGet(o, 'totalFindings') === 'number' ? safeGet(o, 'totalFindings') : 0,
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iterate-plugin",
-  "version": "2.9.2",
+  "version": "2.9.4",
   "description": "dsh plugin that turns the iterate skill into an autonomous closed-loop harness: plan -> parallel review xN -> atomic fixes -> validate -> loop -> auto-stop, plus a dry-run pure-review mode with multi-round convergence and a meta-review that audits the report and emits a final review report.",
   "type": "module",
   "license": "MIT",

package/src/config-loader.ts

@@ -184,26 +184,50 @@ export type ProjectRootResult = { ok: true; root: string } | { ok: false; reason
  * path is unsafe; callers must short-circuit on the failure and return a
  * structured error instead of proceeding.
  */
-export function resolveProjectRoot(input?: string): ProjectRootResult {
+/**
+ * Resolve a caller-supplied project root to a safe absolute path.
+ *
+ * Resolution order for the default (no explicit `path`) case:
+ *   1. `sessionCwd` — the absolute working directory the calling DSH session
+ *      was created in (`exec.agent.session.header.cwd`). This is the
+ *      authoritative workspace for the current conversation and is immune to
+ *      where the web-service process happened to start.
+ *   2. the process cwd, when it is a usable directory (not `/` or the home
+ *      dir — launchd/daemon-managed servers start with cwd=`/`);
+ *   3. the session workspace decoded from `DSH_SESSION_JSONL` (present when
+ *      the DSH runtime injects per-session env into tool sub-processes).
+ */
+export function resolveProjectRoot(input?: string, sessionCwd?: string): ProjectRootResult {
   const raw = (input ?? '').trim()
-  const root = raw ? resolve(raw) : resolve(effectiveCwd())
+  const root = raw ? resolve(raw) : resolve(effectiveCwd(sessionCwd))
   if (!root || root === sep) {
     return { ok: false, reason: 'Refusing filesystem root as project root.' }
   }
   return { ok: true, root }
 }
 
+/**
+ * Thin adapter for tool `execute(args, exec)` bodies: pull the session cwd
+ * from the DSH run context and hand it to {@link resolveProjectRoot}.
+ */
+export function resolveProjectRootForExec(
+  exec: { agent?: { session?: { header?: { cwd?: string } } } } | undefined,
+  input?: string,
+): ProjectRootResult {
+  return resolveProjectRoot(input, exec?.agent?.session?.header?.cwd)
+}
+
 /**
  * Resolve the default working directory for tools invoked without an explicit
- * `path`. Prefers the process cwd, but a daemon-managed web server can start
- * with cwd = `/` (e.g. launchd), which is not a usable project root. In that
- * case fall back to the session workspace encoded in `DSH_SESSION_JSONL`
+ * `path`. Prefers the caller-provided session cwd, then the process cwd, then
+ * the session workspace encoded in `DSH_SESSION_JSONL`
  * (`…/sessions/<encoded-workspace>/<session-id>/session.jsonl.zstd`), where
  * the workspace directory is `--`-wrapped with `/` → `-` and percent-encoded
  * bytes spelled as `~<hex>` (e.g. `/Volumes/Eng-Dev/iterate-skill` →
  * `--Volumes-Eng-Dev-iterate-skill--`).
  */
-function effectiveCwd(): string {
+function effectiveCwd(sessionCwd?: string): string {
+  if (sessionCwd && sessionCwd !== sep && sessionCwd !== homedir()) return sessionCwd
   let cwd = ''
   try {
     cwd = process.cwd()

package/src/tools/checkpoint.ts

@@ -12,7 +12,7 @@
 import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
 import { defineTool } from '@deepseek-ai/dsh-tools'
 import type { JsonValue } from '@deepseek-ai/dsh-session'
-import { resolveProjectRoot } from '../config-loader.ts'
+import { resolveProjectRootForExec } from '../config-loader.ts'
 import { checkpointPath, iterateDir } from '../paths.ts'
 import { readRegistry } from './fix.ts'
 import { readDecisionEntries } from './decision-log.ts'
@@ -166,8 +166,8 @@ export function registerCheckpointTool(ctx: { tools: { register: (def: ReturnTyp
         ],
       },
 
-      async execute(args) {
-        const resolved = resolveProjectRoot(args.path)
+      async execute(args, exec) {
+        const resolved = resolveProjectRootForExec(exec, args.path)
         if (!resolved.ok) return { operation: args.operation, ok: false, error: resolved.reason }
         const projectRoot = resolved.root
 
@@ -274,8 +274,8 @@ export function registerStatusTool(ctx: { tools: { register: (def: ReturnType<ty
         },
       },
 
-      async execute(args) {
-        const resolved = resolveProjectRoot(args.path)
+      async execute(args, exec) {
+        const resolved = resolveProjectRootForExec(exec, args.path)
         if (!resolved.ok) return { ok: false, error: resolved.reason }
         const projectRoot = resolved.root
         const status = computeStatus({

package/src/tools/config.ts

@@ -1,7 +1,7 @@
 import { join } from 'node:path'
 import { defineTool } from '@deepseek-ai/dsh-tools'
 import type { JsonValue } from '@deepseek-ai/dsh-session'
-import { loadEffectiveConfig, validateConfig, resolveProjectRoot } from '../config-loader.ts'
+import { loadEffectiveConfig, validateConfig, resolveProjectRootForExec } from '../config-loader.ts'
 import {
   applyConfigUpdates,
   readRawConfig,
@@ -76,8 +76,8 @@ export function registerConfigTool(ctx: { tools: { register: (def: ReturnType<ty
         ],
       },
 
-      async execute(args) {
-        const resolved = resolveProjectRoot(args.path)
+      async execute(args, exec) {
+        const resolved = resolveProjectRootForExec(exec, args.path)
         if (!resolved.ok) {
           return { found: false, error: resolved.reason }
         }

package/src/tools/context.ts

@@ -2,7 +2,7 @@ import { readFileSync, existsSync } from 'node:fs'
 import { join, dirname, resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { defineTool } from '@deepseek-ai/dsh-tools'
-import { resolveProjectRoot } from '../config-loader.ts'
+import { resolveProjectRootForExec } from '../config-loader.ts'
 
 /** How many ancestor directories we walk up looking for a SKILL.md. */
 const MAX_SKILL_DIR_LOOKUP_DEPTH = 12
@@ -257,8 +257,8 @@ export function registerContextTool(ctx: { tools: { register: (def: ReturnType<t
         },
       },
 
-      async execute(args) {
-        const resolved = resolveProjectRoot(args.path)
+      async execute(args, exec) {
+        const resolved = resolveProjectRootForExec(exec, args.path)
         if (!resolved.ok) {
           return { found: false, error: resolved.reason, searched: [] }
         }

package/src/tools/decision-log.ts

@@ -2,7 +2,7 @@ import { appendFileSync, readFileSync, mkdirSync, existsSync } from 'node:fs'
 import { join } from 'node:path'
 import { defineTool } from '@deepseek-ai/dsh-tools'
 import type { JsonValue } from '@deepseek-ai/dsh-session'
-import { resolveProjectRoot } from '../config-loader.ts'
+import { resolveProjectRootForExec } from '../config-loader.ts'
 import type { DecisionLogEntry } from '../types.ts'
 
 const LOG_DIR = '.iterate'
@@ -159,8 +159,8 @@ export function registerDecisionLogTool(ctx: { tools: { register: (def: ReturnTy
         ],
       },
 
-      async execute(args) {
-        const resolved = resolveProjectRoot(args.path)
+      async execute(args, exec) {
+        const resolved = resolveProjectRootForExec(exec, args.path)
         if (!resolved.ok) {
           return { operation: args.operation, error: resolved.reason }
         }

package/src/tools/fix.ts

@@ -21,7 +21,7 @@ import { copyFileSync, existsSync, mkdirSync, readFileSync, writeFileSync } from
 import { join } from 'node:path'
 import { defineTool } from '@deepseek-ai/dsh-tools'
 import type { JsonValue } from '@deepseek-ai/dsh-session'
-import { loadEffectiveConfig, resolveProjectRoot } from '../config-loader.ts'
+import { loadEffectiveConfig, resolveProjectRootForExec } from '../config-loader.ts'
 import { countTouchedMethods } from '../method-scope.ts'
 import { fixBackupPath, fixRegistryPath, fixesDir } from '../paths.ts'
 import { appendDecisionEntry } from './decision-log.ts'
@@ -284,8 +284,8 @@ export function registerFixTool(ctx: { tools: { register: (def: ReturnType<typeo
         ],
       },
 
-      async execute(args) {
-        const resolved = resolveProjectRoot(args.path)
+      async execute(args, exec) {
+        const resolved = resolveProjectRootForExec(exec, args.path)
         if (!resolved.ok) return { ok: false, error: resolved.reason }
         const projectRoot = resolved.root
         const { config } = loadEffectiveConfig(projectRoot)
@@ -454,8 +454,8 @@ export function registerDiffTool(ctx: { tools: { register: (def: ReturnType<type
         },
       },
 
-      async execute(args) {
-        const resolved = resolveProjectRoot(args.path)
+      async execute(args, exec) {
+        const resolved = resolveProjectRootForExec(exec, args.path)
         if (!resolved.ok) return { ok: false, error: resolved.reason }
         const projectRoot = resolved.root
         const registry = readRegistry(projectRoot)
@@ -544,8 +544,8 @@ export function registerRollbackTool(ctx: { tools: { register: (def: ReturnType<
         ],
       },
 
-      async execute(args) {
-        const resolved = resolveProjectRoot(args.path)
+      async execute(args, exec) {
+        const resolved = resolveProjectRootForExec(exec, args.path)
         if (!resolved.ok) return { ok: false, error: resolved.reason }
         const projectRoot = resolved.root
         const id = typeof args.id === 'string' ? args.id : ''

package/src/tools/history.ts

@@ -10,7 +10,7 @@
 
 import { defineTool } from '@deepseek-ai/dsh-tools'
 import type { JsonValue } from '@deepseek-ai/dsh-session'
-import { resolveProjectRoot } from '../config-loader.ts'
+import { resolveProjectRootForExec } from '../config-loader.ts'
 import { readDecisionEntries } from './decision-log.ts'
 import { readRegistry } from './fix.ts'
 import type { DecisionLogEntry, FixRegistry } from '../types.ts'
@@ -136,8 +136,8 @@ export function registerHistoryTool(ctx: { tools: { register: (def: ReturnType<t
         },
       },
 
-      async execute(args) {
-        const resolved = resolveProjectRoot(args.path)
+      async execute(args, exec) {
+        const resolved = resolveProjectRootForExec(exec, args.path)
         if (!resolved.ok) return { ok: false, kind: 'history', error: resolved.reason }
         const projectRoot = resolved.root
 

package/src/tools/prune.ts

@@ -22,7 +22,7 @@ import { existsSync, readdirSync, rmSync, unlinkSync, writeFileSync } from 'node
 import { join } from 'node:path'
 import { defineTool } from '@deepseek-ai/dsh-tools'
 import type { JsonValue } from '@deepseek-ai/dsh-session'
-import { resolveProjectRoot } from '../config-loader.ts'
+import { resolveProjectRootForExec } from '../config-loader.ts'
 import { readDecisionEntries, appendDecisionEntry } from './decision-log.ts'
 import { readRegistry, removeRecord, recomputeRoundCounts } from './fix.ts'
 import { iterateDir, fixesDir, checkpointPath, fixRegistryPath } from '../paths.ts'
@@ -265,8 +265,8 @@ export function registerPruneTool(ctx: { tools: { register: (def: ReturnType<typ
         },
       },
 
-      async execute(args) {
-        const resolved = resolveProjectRoot(args.path)
+      async execute(args, exec) {
+        const resolved = resolveProjectRootForExec(exec, args.path)
         if (!resolved.ok) return { ok: false, dryRun: true, error: resolved.reason }
         const projectRoot = resolved.root
         const retainDays = clampRetainDays(args.retainDays as number | undefined)

package/src/tools/review.ts

@@ -1,6 +1,6 @@
 import { defineTool } from '@deepseek-ai/dsh-tools'
 import type { JsonValue } from '@deepseek-ai/dsh-session'
-import { loadEffectiveConfig, resolveProjectRoot } from '../config-loader.ts'
+import { loadEffectiveConfig, resolveProjectRootForExec } from '../config-loader.ts'
 import {
   buildReviewPlan,
   buildReviewReport,
@@ -131,8 +131,8 @@ export function registerReviewTool(ctx: { tools: { register: (def: ReturnType<ty
         ],
       },
 
-      async execute(args) {
-        const resolved = resolveProjectRoot(args.path)
+      async execute(args, exec) {
+        const resolved = resolveProjectRootForExec(exec, args.path)
         if (!resolved.ok) {
           return { operation: args.operation, error: resolved.reason }
         }

package/src/tools/triage.ts

@@ -3,7 +3,7 @@ import { join } from 'node:path'
 import { defineTool } from '@deepseek-ai/dsh-tools'
 import type { JsonValue } from '@deepseek-ai/dsh-session'
 import yaml from 'js-yaml'
-import { resolveProjectRoot } from '../config-loader.ts'
+import { resolveProjectRootForExec } from '../config-loader.ts'
 import type { KnownIntentional } from '../types.ts'
 
 const CONFIG_FILE = 'iterate.config.yaml'
@@ -313,8 +313,8 @@ export function registerTriageTool(ctx: { tools: { register: (def: ReturnType<ty
         ],
       },
 
-      async execute(args) {
-        const resolved = resolveProjectRoot(args.path)
+      async execute(args, exec) {
+        const resolved = resolveProjectRootForExec(exec, args.path)
         if (!resolved.ok) {
           return { operation: args.operation, error: resolved.reason }
         }

package/src/tools/validate.ts

@@ -4,7 +4,7 @@ import {
   loadEffectiveConfig,
   isCommandAllowed,
   flattenCommands,
-  resolveProjectRoot,
+  resolveProjectRootForExec,
 } from '../config-loader.ts'
 import type { ValidationResult } from '../types.ts'
 
@@ -126,8 +126,8 @@ export function registerValidateTool(ctx: { tools: { register: (def: ReturnType<
         ],
       },
 
-      async execute(args) {
-        const resolved = resolveProjectRoot(args.path)
+      async execute(args, exec) {
+        const resolved = resolveProjectRootForExec(exec, args.path)
         if (!resolved.ok) {
           return {
             allowed: false,