@cydm/pie 2.6.4 → 2.6.6

package/dist/builtin/extensions/ask-user/index.js

@@ -1,9 +1,9 @@
 import { createRequire as __createRequire } from "node:module"; const require = __createRequire(import.meta.url);
 import {
   createAskUserCapability
-} from "../../../chunks/chunk-3AOMWS2Z.js";
-import "../../../chunks/chunk-YEUBQBOB.js";
-import "../../../chunks/chunk-OCEYHWVX.js";
+} from "../../../chunks/chunk-H6BAM2N4.js";
+import "../../../chunks/chunk-KEARZX6F.js";
+import "../../../chunks/chunk-G5B6D35K.js";
 import "../../../chunks/chunk-XXGYUYXI.js";
 import "../../../chunks/chunk-LZQXQOPJ.js";
 

package/dist/builtin/extensions/mcp-adapter/index.js

@@ -24461,6 +24461,97 @@ function redactSecrets(text, secrets) {
   }
   return sanitized;
 }
+function encodedSecretVariants(secrets) {
+  const variants = [...secrets];
+  for (const secret of secrets) {
+    try {
+      const base642 = Buffer.from(secret, "utf-8").toString("base64");
+      if (base642.length >= 4) {
+        variants.push(base642);
+        const base64url2 = Buffer.from(secret, "utf-8").toString("base64url");
+        if (base64url2 !== base642 && base64url2.length >= 4) variants.push(base64url2);
+      }
+    } catch {
+    }
+    try {
+      const urlEncoded = encodeURIComponent(secret);
+      if (urlEncoded !== secret && urlEncoded.length >= 4) {
+        variants.push(urlEncoded);
+        const urlLowerHex = urlEncoded.replace(/%[0-9A-F]{2}/g, (m) => `%${m.slice(1).toLowerCase()}`);
+        if (urlLowerHex !== urlEncoded) variants.push(urlLowerHex);
+      }
+    } catch {
+    }
+  }
+  return variants;
+}
+function unicodeEscapeAll(text) {
+  let out = "";
+  for (let index = 0; index < text.length; index++) {
+    out += `\\u${text.charCodeAt(index).toString(16).padStart(4, "0")}`;
+  }
+  return out;
+}
+function unicodeEscapeVariants(secrets) {
+  const variants = [];
+  for (const secret of secrets) {
+    const escaped = unicodeEscapeAll(secret);
+    if (escaped !== secret && escaped.length >= 4) {
+      variants.push(escaped);
+      const escapedUpper = escaped.replace(/[0-9a-f]{4}/g, (m) => m.toUpperCase());
+      if (escapedUpper !== escaped) variants.push(escapedUpper);
+    }
+  }
+  return variants;
+}
+function hexSecretVariants(secrets) {
+  const variants = [];
+  for (const secret of secrets) {
+    if (secret.length < 6) continue;
+    try {
+      const hex = Buffer.from(secret, "utf-8").toString("hex");
+      if (hex.length >= 12) variants.push(hex);
+    } catch {
+    }
+  }
+  return variants;
+}
+var MIN_SECRET_FRAGMENT = 8;
+function redactSecretFragments(text, secrets) {
+  const candidates = secrets.filter((secret) => secret.length >= MIN_SECRET_FRAGMENT);
+  if (candidates.length === 0 || text.length < MIN_SECRET_FRAGMENT) return text;
+  const grams = /* @__PURE__ */ new Map();
+  for (const secret of candidates) {
+    for (let offset = 0; offset + MIN_SECRET_FRAGMENT <= secret.length; offset++) {
+      const gram = secret.slice(offset, offset + MIN_SECRET_FRAGMENT);
+      const bucket = grams.get(gram);
+      if (bucket) bucket.push({ secret, offset });
+      else grams.set(gram, [{ secret, offset }]);
+    }
+  }
+  let out = "";
+  let index = 0;
+  while (index < text.length) {
+    const bucket = grams.get(text.slice(index, index + MIN_SECRET_FRAGMENT));
+    let best = 0;
+    if (bucket) {
+      for (const { secret, offset } of bucket) {
+        let length = MIN_SECRET_FRAGMENT;
+        const maxLength = Math.min(secret.length - offset, text.length - index);
+        while (length < maxLength && text[index + length] === secret[offset + length]) length += 1;
+        if (length > best) best = length;
+      }
+    }
+    if (best > 0) {
+      out += "[redacted]";
+      index += best;
+    } else {
+      out += text[index];
+      index += 1;
+    }
+  }
+  return out;
+}
 function redactLeadingSecretSuffix(text, secrets) {
   if (secrets.length === 0 || text.length === 0) return text;
   for (const secret of secrets) {
@@ -24483,13 +24574,56 @@ function redactTrailingSecretPrefix(text, secrets) {
   }
   return text;
 }
+function redactAllSecrets(text, secrets) {
+  const encoded = encodedSecretVariants(secrets);
+  const wholeVariants = [...encoded, ...hexSecretVariants(secrets), ...unicodeEscapeVariants(secrets)];
+  return redactTrailingSecretPrefix(
+    redactLeadingSecretSuffix(
+      redactCaseInsensitiveEncodedSecrets(
+        redactSecretFragments(redactSecrets(text, wholeVariants), encoded),
+        secrets
+      ),
+      encoded
+    ),
+    encoded
+  );
+}
+function redactCaseInsensitiveEncodedSecrets(text, secrets) {
+  const escapeRegExpLiteral = (literal2) => literal2.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  let sanitized = text;
+  for (const secret of secrets) {
+    const patterns = [];
+    try {
+      const urlEncoded = encodeURIComponent(secret);
+      if (urlEncoded !== secret && urlEncoded.length >= 4 && /%[0-9A-F]{2}/i.test(urlEncoded)) {
+        patterns.push(urlEncoded);
+      }
+    } catch {
+    }
+    try {
+      if (secret.length >= 6) {
+        const hex = Buffer.from(secret, "utf-8").toString("hex");
+        if (hex.length >= 12) patterns.push(hex);
+      }
+    } catch {
+    }
+    const escaped = unicodeEscapeAll(secret);
+    if (escaped !== secret && escaped.length >= 4) patterns.push(escaped);
+    for (const pattern of patterns) {
+      sanitized = sanitized.replace(new RegExp(escapeRegExpLiteral(pattern), "gi"), "[redacted]");
+    }
+  }
+  return sanitized;
+}
 function redactStderrTail(tail, secrets) {
-  return redactTrailingSecretPrefix(redactLeadingSecretSuffix(redactSecrets(tail, secrets), secrets), secrets);
+  return redactAllSecrets(tail, secrets);
 }
 function sanitizeDiagnostic(text, secrets) {
-  const sanitized = redactLeadingSecretSuffix(redactSecrets(text, secrets), secrets);
+  let sanitized = redactAllSecrets(text, secrets);
   if (sanitized.length > DIAGNOSTIC_TEXT_LIMIT) {
-    return `${sanitized.slice(0, DIAGNOSTIC_TEXT_LIMIT)}\u2026[truncated ${sanitized.length - DIAGNOSTIC_TEXT_LIMIT} chars]`;
+    const omitted = sanitized.length - DIAGNOSTIC_TEXT_LIMIT;
+    sanitized = redactAllSecrets(sanitized.slice(0, DIAGNOSTIC_TEXT_LIMIT), secrets);
+    return `${sanitized}\u2026[truncated ${omitted} chars]`;
   }
   return sanitized;
 }
@@ -24589,6 +24723,17 @@ var McpServerManager = class {
         );
       }
     }
+    const byLowercase = /* @__PURE__ */ new Map();
+    for (const key of this.definitions.keys()) {
+      const lower = key.toLowerCase();
+      byLowercase.set(lower, [...byLowercase.get(lower) ?? [], key]);
+    }
+    const caseClashes = [...byLowercase.entries()].filter(([, keys]) => keys.length > 1).map(([, keys]) => keys.map((key) => `"${key}"`).join(" and "));
+    if (caseClashes.length > 0) {
+      throw new Error(
+        `MCP server names collide case-insensitively (their cache shard files share one name on macOS/Windows): ${caseClashes.join("; ")}. Rename one of them.`
+      );
+    }
     this.cacheDir = cacheDir;
     this.log = log;
   }

package/dist/builtin/extensions/plan-mode/index.js

@@ -7,9 +7,9 @@ import {
   isPlanModeSafeCommand,
   markCompletedPlanSteps,
   restoreExecutionState
-} from "../../../chunks/chunk-3AOMWS2Z.js";
-import "../../../chunks/chunk-YEUBQBOB.js";
-import "../../../chunks/chunk-OCEYHWVX.js";
+} from "../../../chunks/chunk-H6BAM2N4.js";
+import "../../../chunks/chunk-KEARZX6F.js";
+import "../../../chunks/chunk-G5B6D35K.js";
 import {
   Type
 } from "../../../chunks/chunk-XXGYUYXI.js";

package/dist/builtin/extensions/subagent/index.js

@@ -1,13 +1,13 @@
 import { createRequire as __createRequire } from "node:module"; const require = __createRequire(import.meta.url);
 import {
   createCliHostCapabilities
-} from "../../../chunks/chunk-6QEDYZUR.js";
+} from "../../../chunks/chunk-OWSXALCG.js";
 import {
   createSharedFileSystemTools,
   createSubagentCapability
-} from "../../../chunks/chunk-3AOMWS2Z.js";
-import "../../../chunks/chunk-YEUBQBOB.js";
-import "../../../chunks/chunk-OCEYHWVX.js";
+} from "../../../chunks/chunk-H6BAM2N4.js";
+import "../../../chunks/chunk-KEARZX6F.js";
+import "../../../chunks/chunk-G5B6D35K.js";
 import "../../../chunks/chunk-5353DEEC.js";
 import "../../../chunks/chunk-XXGYUYXI.js";
 import "../../../chunks/chunk-LZQXQOPJ.js";

package/dist/builtin/extensions/todo/index.js

@@ -8,9 +8,9 @@ import {
   executeManageTodoList,
   executionStateToTodos,
   restoreExecutionState
-} from "../../../chunks/chunk-3AOMWS2Z.js";
-import "../../../chunks/chunk-YEUBQBOB.js";
-import "../../../chunks/chunk-OCEYHWVX.js";
+} from "../../../chunks/chunk-H6BAM2N4.js";
+import "../../../chunks/chunk-KEARZX6F.js";
+import "../../../chunks/chunk-G5B6D35K.js";
 import "../../../chunks/chunk-XXGYUYXI.js";
 import "../../../chunks/chunk-LZQXQOPJ.js";
 

package/dist/builtin/skills/chrome-devtools-axi/chrome-devtools-axi-bridge.js

@@ -4,10 +4,11 @@ import {
   BRIDGE_PORT_IN_USE_EXIT_CODE,
   PAGE_IDENTITY_CHANGED_ERROR,
   clearSelectedPageId,
+  readSelfStartTime,
   resolveSessionName,
   resolveSessionPidFile,
   resolveSessionPort
-} from "./chunk-UPATXALW.js";
+} from "./chunk-U75F4DPF.js";
 import {
   __commonJS,
   __export,
@@ -19599,7 +19600,7 @@ async function isBridgeTargetReachable(client) {
 function writePidFile(port) {
   const pidFile = resolveSessionPidFile();
   mkdirSync(dirname(pidFile), { recursive: true });
-  writeFileSync(pidFile, JSON.stringify({ pid: process.pid, port }));
+  writeFileSync(pidFile, JSON.stringify({ pid: process.pid, port, startTime: readSelfStartTime() }));
 }
 function removePidFile(pidFile = resolveSessionPidFile(), ownerPid = process.pid) {
   try {

package/dist/builtin/skills/chrome-devtools-axi/chrome-devtools-axi-runtime.js

@@ -21,6 +21,6 @@ function tryFastPath(argv, options) {
 
 // vendor/chrome-devtools-axi/bin/chrome-devtools-axi.ts
 if (!tryFastPath(process.argv.slice(2), { version: VERSION })) {
-  const { main } = await import("./cli-GB37NZHQ.js");
+  const { main } = await import("./cli-QAILYGLM.js");
   await main(process.argv.slice(2));
 }

package/dist/builtin/skills/chrome-devtools-axi/{chunk-UPATXALW.js → chunk-U75F4DPF.js}

@@ -200,10 +200,70 @@ function resolveBridgeScript(importMetaDir) {
 var BRIDGE_PORT_IN_USE_EXIT_CODE = 48;
 var PAGE_IDENTITY_CHANGED_ERROR = "The browser reconnected and every page id changed, so this call did not target the page you selected";
 
+// vendor/chrome-devtools-axi/src/process-identity.ts
+import { execFileSync } from "node:child_process";
+function inspectProcessIdentity(pid) {
+  if (!Number.isInteger(pid) || pid <= 0) return {};
+  if (process.platform === "win32") {
+    try {
+      const output = execFileSync(
+        "powershell",
+        [
+          "-NoProfile",
+          "-NonInteractive",
+          "-Command",
+          `$p = Get-CimInstance Win32_Process -Filter "ProcessId=<pid>"; if ($p) { $p.CommandLine; $p.CreationDate.ToString('o') }`.replace("<pid>", String(pid))
+        ],
+        { encoding: "utf-8", timeout: 4e3 }
+      );
+      const lines = output.split(/\r?\n/).filter((line) => line.length > 0);
+      if (lines.length === 0) return {};
+      const startTime = lines.length >= 2 ? lines[lines.length - 1] : void 0;
+      return { command: lines.slice(0, lines.length - 1).join("\n"), startTime };
+    } catch {
+      return {};
+    }
+  }
+  try {
+    const psEnv = { ...process.env, LC_ALL: "C", LANG: "C" };
+    const output = execFileSync(
+      "ps",
+      ["-p", String(pid), "-o", "lstart=", "-o", "command="],
+      { encoding: "utf-8", timeout: 1e3, env: psEnv }
+    );
+    const firstNewline = output.indexOf("\n");
+    const firstLine = firstNewline === -1 ? output : output.slice(0, firstNewline);
+    const lstart = /^(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)\s+(?:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s+\d{1,2}\s+\d{1,2}:\d{2}:\d{2}\s+\d{4}\s+/.exec(firstLine);
+    if (lstart) {
+      return { startTime: lstart[0].trimEnd(), command: output.slice(lstart[0].length) };
+    }
+    try {
+      const command = execFileSync("ps", ["-p", String(pid), "-o", "command="], {
+        encoding: "utf-8",
+        timeout: 1e3,
+        env: psEnv
+      });
+      return { command };
+    } catch {
+      return {};
+    }
+  } catch {
+    return {};
+  }
+}
+function readProcessStartTime(pid) {
+  return inspectProcessIdentity(pid).startTime;
+}
+function readSelfStartTime() {
+  return readProcessStartTime(process.pid);
+}
+
 export {
   resolveBridgeScript,
   BRIDGE_PORT_IN_USE_EXIT_CODE,
   PAGE_IDENTITY_CHANGED_ERROR,
+  inspectProcessIdentity,
+  readSelfStartTime,
   resolveSessionName,
   resolveSessionPort,
   resolveSessionStateDir,

package/dist/builtin/skills/chrome-devtools-axi/{cli-GB37NZHQ.js → cli-QAILYGLM.js}

@@ -7,6 +7,7 @@ import {
   PAGE_IDENTITY_CHANGED_ERROR,
   clearSelectedPageId,
   getSelectedPageId,
+  inspectProcessIdentity,
   overlaySessionSelected,
   rememberToolRouting,
   resolveBridgeScript,
@@ -14,7 +15,7 @@ import {
   resolveSessionPidFile,
   resolveSessionPort,
   resolveSessionStateDir
-} from "./chunk-UPATXALW.js";
+} from "./chunk-U75F4DPF.js";
 import "./chunk-OJ6N23UZ.js";
 
 // ../../node_modules/chrome-devtools-axi/node_modules/@toon-format/toon/dist/index.mjs
@@ -1934,33 +1935,80 @@ async function waitForProcessExit(pid, timeoutMs) {
   }
   return !isProcessAlive(pid);
 }
-function isBridgeProcess(pid) {
-  if (process.platform === "win32") {
-    try {
-      const command = execFileSync(
-        "powershell",
-        [
-          "-NoProfile",
-          "-NonInteractive",
-          "-Command",
-          `(Get-CimInstance Win32_Process -Filter "ProcessId=${pid}").CommandLine`
-        ],
-        { encoding: "utf-8", timeout: 4e3 }
-      );
-      return command.includes("chrome-devtools-axi-bridge");
-    } catch {
-      return false;
+function splitCommandLine(command) {
+  const tokens = [];
+  let current = "";
+  let quote = null;
+  for (const char of command.trim()) {
+    if (quote !== null) {
+      if (char === quote) quote = null;
+      else current += char;
+      continue;
+    }
+    if (char === '"' || char === "'") {
+      quote = char;
+      continue;
     }
+    if (/\s/.test(char)) {
+      if (current.length > 0) {
+        tokens.push(current);
+        current = "";
+      }
+      continue;
+    }
+    current += char;
+  }
+  if (current.length > 0) tokens.push(current);
+  return tokens;
+}
+function commandLineLooksLikeBridge(command) {
+  const tokens = splitCommandLine(command);
+  if (tokens.length === 0) return false;
+  if (!/(?:^|[\\/])(node|npx|tsx)(?:\.(?:exe|cmd))?$/i.test(tokens[0])) return false;
+  for (let index = 1; index < tokens.length; index++) {
+    const token = tokens[index];
+    if (token.startsWith("-")) continue;
+    if (/(?:^|[\\/])tsx(?:\.(?:exe|cmd))?$/i.test(token)) continue;
+    const base = token.split(/[\\/]/).pop() ?? token;
+    return /^chrome-devtools-axi-bridge\.(?:js|mjs|cjs|ts)$/i.test(base);
   }
-  try {
-    const command = execFileSync("ps", ["-p", String(pid), "-o", "command="], {
-      encoding: "utf-8",
-      timeout: 1e3
-    });
-    return command.includes("chrome-devtools-axi-bridge");
-  } catch {
-    return false;
+  return false;
+}
+function isBridgeProcess(pid, expectedStartTime) {
+  const identity = inspectProcessIdentity(pid);
+  if (identity.command !== void 0) {
+    if (!commandLineLooksLikeBridge(identity.command)) return false;
+  } else {
+    if (process.platform === "win32") {
+      try {
+        const command = execFileSync(
+          "powershell",
+          [
+            "-NoProfile",
+            "-NonInteractive",
+            "-Command",
+            `(Get-CimInstance Win32_Process -Filter "ProcessId=${pid}").CommandLine`
+          ],
+          { encoding: "utf-8", timeout: 4e3 }
+        );
+        if (!commandLineLooksLikeBridge(command)) return false;
+      } catch {
+        return false;
+      }
+    } else {
+      try {
+        const command = execFileSync("ps", ["-p", String(pid), "-o", "command="], {
+          encoding: "utf-8",
+          timeout: 1e3
+        });
+        if (!commandLineLooksLikeBridge(command)) return false;
+      } catch {
+        return false;
+      }
+    }
   }
+  if (expectedStartTime === void 0) return true;
+  return identity.startTime !== void 0 && identity.startTime === expectedStartTime;
 }
 async function probeBridgeIdentity(port, sessionName) {
   try {
@@ -1983,26 +2031,29 @@ async function judgeRecordedBridge(pidInfo, sessionName) {
   if (probe.identity === "own") {
     if (probe.reportedPid !== void 0) {
       if (probe.reportedPid === pidInfo.pid) {
+        const verified = isBridgeProcess(pidInfo.pid, pidInfo.startTime);
         return {
-          terminate: true,
-          killProcessGroup: isBridgeProcess(pidInfo.pid),
-          targetPid: pidInfo.pid
+          terminate: verified,
+          killProcessGroup: verified,
+          targetPid: pidInfo.pid,
+          expectedStartTime: pidInfo.startTime
         };
       }
+      const reportedIsBridge = isBridgeProcess(probe.reportedPid);
       return {
-        terminate: true,
-        killProcessGroup: isBridgeProcess(probe.reportedPid),
+        terminate: reportedIsBridge,
+        killProcessGroup: reportedIsBridge,
         targetPid: probe.reportedPid
       };
     }
-    const bridge2 = isBridgeProcess(pidInfo.pid);
-    return { terminate: bridge2, killProcessGroup: bridge2, targetPid: pidInfo.pid };
+    const bridge2 = isBridgeProcess(pidInfo.pid, pidInfo.startTime);
+    return { terminate: bridge2, killProcessGroup: bridge2, targetPid: pidInfo.pid, expectedStartTime: pidInfo.startTime };
   }
   if (probe.identity === "other") {
     return { terminate: false, killProcessGroup: false };
   }
-  const bridge = isBridgeProcess(pidInfo.pid);
-  return { terminate: bridge, killProcessGroup: bridge, targetPid: pidInfo.pid };
+  const bridge = isBridgeProcess(pidInfo.pid, pidInfo.startTime);
+  return { terminate: bridge, killProcessGroup: bridge, targetPid: pidInfo.pid, expectedStartTime: pidInfo.startTime };
 }
 function removePidFile(pidFile) {
   try {
@@ -2024,9 +2075,13 @@ function taskkillTree(pid) {
 async function terminateBridgeProcess(pid, opts = {}) {
   if (!isProcessAlive(pid)) return true;
   const killProcessGroup = opts.killProcessGroup === true;
+  const identityHolds = () => !opts.requireBridgeIdentity || isBridgeProcess(pid, opts.expectedStartTime);
+  const refuseIfUnverified = async () => !await isProcessAlive(pid);
   if (process.platform === "win32") {
+    if (!identityHolds()) return refuseIfUnverified();
     return taskkillTree(pid) && !await isProcessAlive(pid);
   }
+  if (!identityHolds()) return refuseIfUnverified();
   try {
     process.kill(pid, "SIGTERM");
   } catch (error) {
@@ -2041,10 +2096,12 @@ async function terminateBridgeProcess(pid, opts = {}) {
     }
     return true;
   }
+  if (!identityHolds()) return refuseIfUnverified();
   if (killProcessGroup) {
     try {
       process.kill(-pid, "SIGKILL");
     } catch {
+      if (!identityHolds()) return refuseIfUnverified();
       try {
         process.kill(pid, "SIGKILL");
       } catch {
@@ -2147,7 +2204,9 @@ async function ensureBridge(spawnBridge = spawnBridgeProcess, notice) {
     const verdict = await judgeRecordedBridge(pidInfo, sessionName);
     if (verdict.terminate) {
       await terminateBridgeProcess(verdict.targetPid ?? pidInfo.pid, {
-        killProcessGroup: verdict.killProcessGroup
+        killProcessGroup: verdict.killProcessGroup,
+        requireBridgeIdentity: true,
+        expectedStartTime: verdict.expectedStartTime
       });
     } else {
       removePidFile(pidFile);
@@ -2425,7 +2484,9 @@ async function stopBridge() {
   const verdict = await judgeRecordedBridge(pidInfo, resolveSessionName());
   if (!verdict.terminate) return "noop";
   const terminated = await terminateBridgeProcess(verdict.targetPid ?? pidInfo.pid, {
-    killProcessGroup: verdict.killProcessGroup
+    killProcessGroup: verdict.killProcessGroup,
+    requireBridgeIdentity: true,
+    expectedStartTime: verdict.expectedStartTime
   });
   clearSelectedPageId();
   return terminated ? "stopped" : "failed";

package/dist/builtin/skills/skill-creator/SKILL.md

@@ -166,9 +166,9 @@ This section is one continuous sequence — don't stop partway through. Do NOT u
 
 Put results in `<skill-name>-workspace/` as a sibling to the skill directory. Within the workspace, organize results by iteration (`iteration-1/`, `iteration-2/`, etc.) and within that, each test case gets a directory (`eval-0/`, `eval-1/`, etc.). Don't create all of this upfront — just create directories as you go.
 
-### Step 1: Spawn all runs (with-skill AND baseline) in the same turn
+### Step 1: Schedule paired runs (with-skill AND baseline)
 
-For each test case, spawn two subagents in the same turn — one with the skill, one without. This is important: don't spawn the with-skill runs first and then come back for baselines later. Launch everything at once so it all finishes around the same time.
+For each test case, prepare paired runs — one with the skill, one baseline. Read-only runs may be batched; Pie uses bounded concurrency (default 4), not unlimited simultaneous execution. Default `mode: "read"` tasks cannot write source files: ask them to return outputs and grading evidence, then have the parent persist artifacts, metadata, timing and grades. When evaluation genuinely requires file edits, use explicit `mode: "edit"` with exactly one task per call, wait for it to finish before any parent edit or next edit task, and review its changes. The workspace is shared, not isolated. Use parent-owned persistence or serialized single edit tasks for all evaluation writes; a save-path instruction does not grant a read task write permission.
 
 **With-skill run:**
 
@@ -177,7 +177,7 @@ Execute this task:
 - Skill path: <path-to-skill>
 - Task: <eval prompt>
 - Input files: <eval files if any, or "none">
-- Save outputs to: <workspace>/iteration-<N>/eval-<ID>/with_skill/outputs/
+- Return outputs for parent persistence to: <workspace>/iteration-<N>/eval-<ID>/with_skill/outputs/ (or use a serialized single edit task)
 - Outputs to save: <what the user cares about — e.g., "the .docx file", "the final CSV">
 ```
 
@@ -206,29 +206,28 @@ Update the `eval_metadata.json` files and `evals/evals.json` with the assertions
 
 ### Step 3: As runs complete, capture timing data
 
-When each subagent task completes, you receive a notification containing `total_tokens` and `duration_ms`. Save this data immediately to `timing.json` in the run directory:
+Pie exposes per-task timing as `task.details.durationMs` when available and aggregate wall time as result `details.totalDuration` (milliseconds). It does not supply `total_tokens` or `duration_ms` notification fields. Have the parent persist available per-run timing to `timing.json`, converting units for the viewer:
 
 ```json
 {
-  "total_tokens": 84852,
   "duration_ms": 23332,
   "total_duration_seconds": 23.3
 }
 ```
 
-This is the only opportunity to capture this data — it comes through the task notification and isn't persisted elsewhere. Process each notification as it arrives rather than trying to batch them.
+Here `duration_ms` is an artifact field derived from `task.details.durationMs`, not a native notification field. Keep aggregate `totalDuration` separate from per-run duration; concurrency means it is not the sum of task times. If timing is absent, mark it unavailable rather than inventing a value. Do not report token counts unless separate instrumentation actually provides them; omit `total_tokens` otherwise. Viewer/aggregator default zeros are not measured token usage.
 
 ### Step 4: Grade, aggregate, and launch the viewer
 
 Once all runs are done:
 
-1. **Grade each run** — spawn a grader subagent (or grade inline) that reads `agents/grader.md` and evaluates each assertion against the outputs. Save results to `grading.json` in each run directory. The grading.json expectations array must use the fields `text`, `passed`, and `evidence` (not `name`/`met`/`details` or other variants) — the viewer depends on these exact field names. For assertions that can be checked programmatically, write and run a script rather than eyeballing it — scripts are faster, more reliable, and can be reused across iterations.
+1. **Grade each run** — spawn a grader subagent (or grade inline) that reads `agents/grader.md` and evaluates each assertion against the outputs. Have the parent save returned grades to `grading.json` in each run directory (or use a serialized single edit task); read graders must not write files. The grading.json expectations array must use the fields `text`, `passed`, and `evidence` (not `name`/`met`/`details` or other variants) — the viewer depends on these exact field names. For assertions that can be checked programmatically, write and run a script rather than eyeballing it — scripts are faster, more reliable, and can be reused across iterations.
 
 2. **Aggregate into benchmark** — run the aggregation script from the skill-creator directory:
    ```bash
    node <skill-creator-path>/scripts/aggregate_benchmark.mjs <workspace>/iteration-N --skill-name <name>
    ```
-   This produces `benchmark.json` and `benchmark.md` with pass_rate, time, and tokens for each configuration, with mean ± stddev and the delta. If generating benchmark.json manually, see `references/schemas.md` for the exact schema the viewer expects.
+   This produces `benchmark.json` and `benchmark.md` with pass_rate and available timing for each configuration, with mean ± stddev and the delta. Token fields are meaningful only with separate instrumentation; label them unavailable otherwise. If generating benchmark.json manually, see `references/schemas.md` for the exact schema the viewer expects.
 Put each with_skill version before its baseline counterpart.
 
 3. **Do an analyst pass** — read the benchmark data and surface patterns the aggregate stats might hide. See `agents/analyzer.md` (the "Analyzing Benchmark Results" section) for what to look for — things like assertions that always pass regardless of skill (non-discriminating), high-variance evals (possibly flaky), and time/token tradeoffs.