claudish 10.4.0 → 10.4.1

package/bin/claudish.cjs

@@ -114,7 +114,7 @@ Learn more: https://bun.sh`);
       // The pid pair tells the Bun child who launched it: this launcher, and the
       // launcher's own parent (Claude Code, for an MCP server). The child
       // believes the pair only when CLAUDISH_LAUNCHER_PID is its real parent
-      // (channel/parent-proof.ts `hostPidFrom`), so a value leaked into a
+      // (channel/parent-session.ts `hostPidFrom`), so a value leaked into a
       // nested claudish is inert.
       env: {
         ...process.env,

package/dist/index.js

@@ -889,7 +889,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "10.4.0";
+var VERSION = "10.4.1";
 
 // src/logger.ts
 import { appendFile, existsSync as existsSync2, mkdirSync, readdirSync, unlinkSync, writeFileSync as writeFileSync2 } from "fs";
@@ -32422,66 +32422,6 @@ function sessionsDirFrom(env, homedirFn = homedir23) {
     return explicit;
   return join23(userHomeFrom(env, homedirFn), ".claudish", "sessions");
 }
-var init_home_dir = () => {};
-
-// src/channel/parent-proof.ts
-import * as fsPromises from "fs/promises";
-import { join as join24 } from "path";
-function positiveInt(value) {
-  if (value === undefined || !/^[1-9][0-9]*$/.test(value))
-    return;
-  const n = Number(value);
-  return Number.isSafeInteger(n) ? n : undefined;
-}
-function hostPidFrom(env, ppid) {
-  const launcherPpid = positiveInt(env.CLAUDISH_LAUNCHER_PPID);
-  if (env.CLAUDISH_LAUNCHER_PID === String(ppid) && launcherPpid !== undefined && launcherPpid !== ppid) {
-    return { hostPid: launcherPpid, launcherPid: ppid };
-  }
-  return { hostPid: ppid };
-}
-function parentSessionIdFrom(env) {
-  const id = env.CLAUDE_CODE_SESSION_ID;
-  if (id === undefined || !CLAUDE_ID_RE.test(id))
-    return;
-  if (env.CLAUDE_CODE_CHILD_SESSION)
-    return;
-  return id;
-}
-function claudeConfigDir(env) {
-  const fromEnv = env.CLAUDE_CONFIG_DIR;
-  return fromEnv && fromEnv.length > 0 ? fromEnv : join24(userHomeFrom(env), ".claude");
-}
-async function readHostSessionRecord(opts) {
-  const fs = opts.fs ?? defaultFs;
-  try {
-    const raw = await fs.readFile(join24(opts.configDir, "sessions", `${opts.hostPid}.json`), "utf-8");
-    const parsed = JSON.parse(raw);
-    if (!parsed || typeof parsed !== "object")
-      return;
-    const rec = parsed;
-    if (rec.pid !== opts.hostPid)
-      return;
-    if (typeof rec.sessionId !== "string" || !CLAUDE_ID_RE.test(rec.sessionId))
-      return;
-    return {
-      sessionId: rec.sessionId,
-      ...typeof rec.cwd === "string" && rec.cwd.length > 0 ? { cwd: rec.cwd } : {}
-    };
-  } catch {
-    return;
-  }
-}
-async function gatherProofCandidates(opts) {
-  const record = await readHostSessionRecord({
-    configDir: opts.configDir,
-    hostPid: opts.hostPid,
-    fs: opts.fs
-  });
-  const cwd = record?.cwd;
-  const ids = [parentSessionIdFrom(opts.env), record?.sessionId].filter((id) => id !== undefined);
-  return [...new Set(ids)].map((sessionId) => ({ sessionId, ...cwd ? { cwd } : {} }));
-}
 function claudeCodeStringHash(s) {
   let h = 0;
   for (let i = 0;i < s.length; i++)
@@ -32494,183 +32434,8 @@ function projectDirNameFor(cwd) {
     return slug;
   return `${slug.slice(0, PROJECT_DIR_SLUG_MAX)}-${Math.abs(claudeCodeStringHash(cwd)).toString(36)}`;
 }
-async function isTranscriptFile(fs, path) {
-  try {
-    return (await fs.stat(path)).isFile();
-  } catch {
-    return false;
-  }
-}
-async function findProjectDir(fs, configDir, candidate, cache) {
-  const cacheKey = `${configDir}\x00${candidate.sessionId}`;
-  const projectsDir = join24(configDir, "projects");
-  const fileName = `${candidate.sessionId}.jsonl`;
-  const cached = cache.get(cacheKey);
-  if (cached !== undefined) {
-    if (await isTranscriptFile(fs, join24(cached, fileName)))
-      return cached;
-    cache.delete(cacheKey);
-  }
-  if (candidate.cwd) {
-    const fast = join24(projectsDir, projectDirNameFor(candidate.cwd));
-    if (await isTranscriptFile(fs, join24(fast, fileName)))
-      return fast;
-  }
-  let names;
-  try {
-    names = await fs.readdir(projectsDir);
-  } catch {
-    return;
-  }
-  for (const name of names) {
-    const dir = join24(projectsDir, name);
-    if (await isTranscriptFile(fs, join24(dir, fileName))) {
-      cache.set(cacheKey, dir);
-      return dir;
-    }
-  }
-  return;
-}
-async function tailContains(fs, path, needle) {
-  let handle;
-  try {
-    const { size } = await fs.stat(path);
-    const length = Math.min(size, TRANSCRIPT_TAIL_BYTES);
-    if (length < needle.length)
-      return false;
-    const buffer = Buffer.alloc(length);
-    handle = await fs.open(path, "r");
-    const { bytesRead } = await handle.read(buffer, 0, length, size - length);
-    return buffer.subarray(0, bytesRead).includes(needle);
-  } catch {
-    return false;
-  } finally {
-    await handle?.close().catch(() => {});
-  }
-}
-async function recentSubagentTranscripts(fs, projectDir, candidateId, nowMs) {
-  const dir = join24(projectDir, candidateId, "subagents");
-  let names;
-  try {
-    names = await fs.readdir(dir);
-  } catch {
-    return [];
-  }
-  const recent = [];
-  for (const name of names) {
-    if (!name.endsWith(".jsonl"))
-      continue;
-    const path = join24(dir, name);
-    try {
-      const { mtimeMs } = await fs.stat(path);
-      if (nowMs - mtimeMs <= SUBAGENT_WINDOW_MS)
-        recent.push({ path, mtimeMs });
-    } catch {}
-  }
-  recent.sort((a, b) => b.mtimeMs - a.mtimeMs);
-  return recent.slice(0, MAX_SUBAGENT_FILES).map((f) => f.path);
-}
-async function candidateHolds(fs, configDir, candidate, needle, nowMs, cache) {
-  const projectDir = await findProjectDir(fs, configDir, candidate, cache);
-  if (projectDir === undefined)
-    return false;
-  if (await tailContains(fs, join24(projectDir, `${candidate.sessionId}.jsonl`), needle)) {
-    return true;
-  }
-  for (const path of await recentSubagentTranscripts(fs, projectDir, candidate.sessionId, nowMs)) {
-    if (await tailContains(fs, path, needle))
-      return true;
-  }
-  return false;
-}
-async function proveCallingConversation(opts) {
-  const { toolUseId } = opts;
-  if (typeof toolUseId !== "string" || !CLAUDE_ID_RE.test(toolUseId))
-    return;
-  const candidates = normaliseCandidates(opts.candidates);
-  if (candidates.length === 0)
-    return;
-  const fs = opts.fs ?? defaultFs;
-  const now = opts.now ?? Date.now;
-  const sleep = opts.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
-  const cache = opts.cache ?? serverProjectDirCache;
-  const needle = Buffer.from(`"${toolUseId}"`, "utf-8");
-  const look = async () => {
-    for (const candidate of candidates) {
-      if (await candidateHolds(fs, opts.configDir, candidate, needle, now(), cache)) {
-        return candidate.sessionId;
-      }
-    }
-    return;
-  };
-  try {
-    const startedAt = now();
-    let slept = 0;
-    for (;; ) {
-      const found = await look();
-      if (found !== undefined)
-        return found;
-      const remaining = PROOF_DEADLINE_MS - Math.max(now() - startedAt, slept);
-      if (remaining <= 0)
-        return;
-      const wait = Math.min(PROOF_POLL_INTERVAL_MS, remaining);
-      await sleep(wait);
-      slept += wait;
-    }
-  } catch {
-    return;
-  }
-}
-function normaliseCandidates(raw) {
-  const out = [];
-  for (const entry of raw) {
-    const candidate = typeof entry === "string" ? { sessionId: entry } : entry;
-    if (!CLAUDE_ID_RE.test(candidate.sessionId))
-      continue;
-    if (out.some((c) => c.sessionId === candidate.sessionId))
-      continue;
-    out.push(candidate);
-    if (out.length === 2)
-      break;
-  }
-  return out;
-}
-async function proveParentForCall(opts) {
-  if (typeof opts.toolUseId !== "string" || !CLAUDE_ID_RE.test(opts.toolUseId))
-    return;
-  const env = opts.env ?? process.env;
-  const configDir = claudeConfigDir(env);
-  try {
-    const candidates = await gatherProofCandidates({
-      env,
-      hostPid: opts.hostPid,
-      configDir,
-      fs: opts.fs
-    });
-    return await proveCallingConversation({
-      toolUseId: opts.toolUseId,
-      candidates,
-      configDir,
-      fs: opts.fs
-    });
-  } catch {
-    return;
-  }
-}
-var CLAUDE_ID_RE, TOOL_USE_ID_META_KEY = "claudecode/toolUseId", TRANSCRIPT_TAIL_BYTES, SUBAGENT_WINDOW_MS, MAX_SUBAGENT_FILES = 32, PROOF_POLL_INTERVAL_MS = 100, PROOF_DEADLINE_MS = 2000, defaultFs, PROJECT_DIR_SLUG_MAX = 200, serverProjectDirCache;
-var init_parent_proof = __esm(() => {
-  init_home_dir();
-  CLAUDE_ID_RE = /^[A-Za-z0-9_-]{8,128}$/;
-  TRANSCRIPT_TAIL_BYTES = 256 * 1024;
-  SUBAGENT_WINDOW_MS = 10 * 60000;
-  defaultFs = {
-    readFile: (path, encoding) => fsPromises.readFile(path, encoding),
-    readdir: (path) => fsPromises.readdir(path),
-    stat: (path) => fsPromises.stat(path),
-    open: (path, flags) => fsPromises.open(path, flags)
-  };
-  serverProjectDirCache = new Map;
-});
+var PROJECT_DIR_SLUG_MAX = 200;
+var init_home_dir = () => {};
 
 // src/session-events/event-translator.ts
 function translateLine(line) {
@@ -32830,7 +32595,7 @@ var init_transcript_tailer = () => {};
 // src/session-events/index.ts
 import { existsSync as existsSync16, readFileSync as readFileSync16, readdirSync as readdirSync3 } from "fs";
 import { homedir as homedir24 } from "os";
-import { join as join25 } from "path";
+import { join as join24 } from "path";
 function extractSessionId2(metadata) {
   const userId = metadata?.user_id;
   if (typeof userId !== "string")
@@ -32855,7 +32620,7 @@ class SessionEventRegistry {
   claudeHome;
   pollIntervalMs;
   constructor(opts = {}) {
-    this.claudeHome = opts.claudeHome ?? join25(homedir24(), ".claude");
+    this.claudeHome = opts.claudeHome ?? join24(homedir24(), ".claude");
     this.pollIntervalMs = opts.pollIntervalMs;
   }
   ensureSession(sessionId) {
@@ -32941,13 +32706,13 @@ class SessionEventRegistry {
     }
   }
   locateTranscript(sessionId) {
-    const projectsDir = join25(this.claudeHome, "projects");
-    const primary = join25(projectsDir, slugFromCwd(process.cwd()), `${sessionId}.jsonl`);
+    const projectsDir = join24(this.claudeHome, "projects");
+    const primary = join24(projectsDir, slugFromCwd(process.cwd()), `${sessionId}.jsonl`);
     if (existsSync16(primary))
       return primary;
     try {
       for (const dir of readdirSync3(projectsDir)) {
-        const candidate = join25(projectsDir, dir, `${sessionId}.jsonl`);
+        const candidate = join24(projectsDir, dir, `${sessionId}.jsonl`);
         if (existsSync16(candidate))
           return candidate;
       }
@@ -32956,7 +32721,7 @@ class SessionEventRegistry {
   }
   readSettingsEffortLevel() {
     try {
-      const settings = JSON.parse(readFileSync16(join25(this.claudeHome, "settings.json"), "utf-8"));
+      const settings = JSON.parse(readFileSync16(join24(this.claudeHome, "settings.json"), "utf-8"));
       return typeof settings.effortLevel === "string" ? settings.effortLevel : undefined;
     } catch {
       return;
@@ -32974,7 +32739,7 @@ class SessionEventRegistry {
 }
 var MISS_TTL_MS = 5000, MAX_MISSES = 5, IDLE_SWEEP_MS, sessionEvents;
 var init_session_events = __esm(() => {
-  init_parent_proof();
+  init_home_dir();
   init_logger();
   init_event_translator();
   init_transcript_tailer();
@@ -33213,7 +32978,7 @@ import {
   writeFileSync as writeFileSync8
 } from "fs";
 import { homedir as homedir25 } from "os";
-import { join as join26 } from "path";
+import { join as join25 } from "path";
 function ensureDir() {
   if (!existsSync17(CLAUDISH_DIR)) {
     mkdirSync9(CLAUDISH_DIR, { recursive: true });
@@ -33248,7 +33013,7 @@ function writeToDisk(events) {
     ensureDir();
     const trimmed = enforceSizeCap([...events]);
     const payload = { version: 1, events: trimmed };
-    const tmpFile = join26(CLAUDISH_DIR, `stats-buffer.tmp.${process.pid}.json`);
+    const tmpFile = join25(CLAUDISH_DIR, `stats-buffer.tmp.${process.pid}.json`);
     writeFileSync8(tmpFile, JSON.stringify(payload, null, 2), "utf-8");
     renameSync2(tmpFile, BUFFER_FILE);
     memoryCache = trimmed;
@@ -33321,8 +33086,8 @@ function syncFlushOnExit() {
 var BUFFER_MAX_BYTES, CLAUDISH_DIR, BUFFER_FILE, memoryCache = null, eventsSinceLastFlush = 0, flushScheduled = false, SIGNAL_EXIT_CODE;
 var init_stats_buffer = __esm(() => {
   BUFFER_MAX_BYTES = 64 * 1024;
-  CLAUDISH_DIR = join26(homedir25(), ".claudish");
-  BUFFER_FILE = join26(CLAUDISH_DIR, "stats-buffer.json");
+  CLAUDISH_DIR = join25(homedir25(), ".claudish");
+  BUFFER_FILE = join25(CLAUDISH_DIR, "stats-buffer.json");
   process.on("exit", syncFlushOnExit);
   SIGNAL_EXIT_CODE = { SIGTERM: 143, SIGINT: 130 };
   for (const signal of ["SIGTERM", "SIGINT"]) {
@@ -36462,7 +36227,7 @@ var init_openai_responses_sse = __esm(() => {
 });
 
 // src/session/token-file.ts
-import { join as join27 } from "path";
+import { join as join26 } from "path";
 function assignedTokenFile(env) {
   const f = env.CLAUDISH_TOKEN_FILE;
   if (!f || f === env.CLAUDISH_PUBLISHED_TOKEN_FILE)
@@ -36470,7 +36235,7 @@ function assignedTokenFile(env) {
   return f;
 }
 function resolveTokenFilePath(port, env = process.env) {
-  return assignedTokenFile(env) ?? join27(userHomeFrom(env), ".claudish", `tokens-${port}.json`);
+  return assignedTokenFile(env) ?? join26(userHomeFrom(env), ".claudish", `tokens-${port}.json`);
 }
 var init_token_file = __esm(() => {
   init_home_dir();
@@ -38023,9 +37788,9 @@ var init_composed_handler = __esm(() => {
 // src/providers/api-key-provenance.ts
 import { existsSync as existsSync18, readFileSync as readFileSync18 } from "fs";
 import { homedir as homedir26 } from "os";
-import { join as join28, resolve as resolve2 } from "path";
+import { join as join27, resolve as resolve2 } from "path";
 function activeConfigPath() {
-  return activeGlobalConfigFile(join28(homedir26(), ".claudish", "config.json"));
+  return activeGlobalConfigFile(join27(homedir26(), ".claudish", "config.json"));
 }
 function configLayerLabel() {
   return getConfigFileOverride() ? activeConfigPath() : "~/.claudish/config.json";
@@ -41828,7 +41593,7 @@ function compareByConnectionPrice(a, b) {
 // src/providers/probe-catalog.ts
 import { existsSync as existsSync19, mkdirSync as mkdirSync11, readFileSync as readFileSync19, writeFileSync as writeFileSync10 } from "fs";
 import { homedir as homedir27 } from "os";
-import { dirname as dirname9, join as join29 } from "path";
+import { dirname as dirname9, join as join28 } from "path";
 function describeProbeCatalogFailure(outcome) {
   switch (outcome.kind) {
     case "incompatible":
@@ -41999,7 +41764,7 @@ var PROBE_MODELS_URL = "https://us-central1-claudish-6da10.cloudfunctions.net/pr
 var init_probe_catalog = __esm(() => {
   init_catalog_route_bindings();
   CACHE_TTL_MS4 = 60 * 60 * 1000;
-  PROBE_MODELS_CACHE_PATH = join29(homedir27(), ".claudish", "probe-models.json");
+  PROBE_MODELS_CACHE_PATH = join28(homedir27(), ".claudish", "probe-models.json");
 });
 
 // src/providers/route-candidates.ts
@@ -43352,7 +43117,7 @@ var init_slot_row = __esm(() => {
 
 // src/pane/prompt-delivery.ts
 import { writeFileSync as writeFileSync11 } from "fs";
-import { join as join30 } from "path";
+import { join as join29 } from "path";
 function stripControl(s) {
   let out = "";
   for (const ch of s) {
@@ -43419,7 +43184,7 @@ function renderTurnFile(text, limit = READ_LINE_LIMIT) {
 `), lines: out.length, marker };
 }
 function turnFilePath(turnDir, turnIndex) {
-  return join30(turnDir, `turn-${turnIndex}.md`);
+  return join29(turnDir, `turn-${turnIndex}.md`);
 }
 function fileTemplate(file, marker) {
   const base = `Your task is in the file \`${file}\`. Read all of it with the Read tool (in parts if it is long), then do exactly what it says, treating its content as the user's message.`;
@@ -43500,12 +43265,12 @@ var init_prompt_delivery = __esm(() => {
 
 // src/team-stats.ts
 import { existsSync as existsSync20, readFileSync as readFileSync20, writeFileSync as writeFileSync12 } from "fs";
-import { join as join31 } from "path";
+import { join as join30 } from "path";
 function statsDir(sessionPath) {
-  return join31(sessionPath, "stats");
+  return join30(sessionPath, "stats");
 }
 function tokenFileFor(sessionPath, anonId) {
-  return join31(statsDir(sessionPath), `${anonId}.json`);
+  return join30(statsDir(sessionPath), `${anonId}.json`);
 }
 function readTokenStatsAt(path) {
   if (!existsSync20(path))
@@ -43668,7 +43433,7 @@ ${segs.join(" \xB7 ")}`;
 }
 function writeStatusFile(sessionPath, manifest, status, opts) {
   try {
-    writeFileSync12(join31(sessionPath, "status.txt"), `${renderTeamStats(sessionPath, manifest, status, opts)}
+    writeFileSync12(join30(sessionPath, "status.txt"), `${renderTeamStats(sessionPath, manifest, status, opts)}
 `, "utf-8");
   } catch {}
 }
@@ -43758,7 +43523,7 @@ var init_cache_ttl = __esm(() => {
 // src/model-loader.ts
 import { existsSync as existsSync21, mkdirSync as mkdirSync12, readFileSync as readFileSync21, writeFileSync as writeFileSync13 } from "fs";
 import { homedir as homedir28 } from "os";
-import { join as join32 } from "path";
+import { join as join31 } from "path";
 async function fetchCatalogPage(url, timeoutMs, generationId) {
   const requestUrl = new URL(url);
   if (generationId)
@@ -43985,7 +43750,7 @@ async function getRecommendedModels(opts = {}) {
     if (data.models.length > 0) {
       _cachedRecommendedModels = data;
       try {
-        const cacheDir = join32(homedir28(), ".claudish");
+        const cacheDir = join31(homedir28(), ".claudish");
         mkdirSync12(cacheDir, { recursive: true });
         writeFileSync13(RECOMMENDED_MODELS_CACHE_PATH, JSON.stringify(data), "utf-8");
       } catch {}
@@ -44129,7 +43894,7 @@ var init_model_loader = __esm(() => {
   init_catalog_client();
   init_catalog_route_bindings();
   FIREBASE_RECOMMENDED_URL = `${FIREBASE_BASE_URL}?catalog=recommended`;
-  RECOMMENDED_MODELS_CACHE_PATH = join32(homedir28(), ".claudish", "recommended-models-cache.json");
+  RECOMMENDED_MODELS_CACHE_PATH = join31(homedir28(), ".claudish", "recommended-models-cache.json");
   RECOMMENDED_ROUTE_TIER_ORDER = {
     native: 0,
     general: 1,
@@ -47697,7 +47462,7 @@ var init_DiscoveryNotice = __esm(() => {
 // src/providers/model-descriptions.ts
 import { existsSync as existsSync22, mkdirSync as mkdirSync13, readFileSync as readFileSync22, writeFileSync as writeFileSync14 } from "fs";
 import { homedir as homedir29 } from "os";
-import { dirname as dirname10, join as join33 } from "path";
+import { dirname as dirname10, join as join32 } from "path";
 function emptyDescriptionIndex() {
   return EMPTY_INDEX;
 }
@@ -47790,7 +47555,7 @@ var init_model_descriptions = __esm(() => {
   init_logger();
   init_model_loader();
   init_cache_ttl();
-  MODEL_DESCRIPTIONS_CACHE_PATH = join33(homedir29(), ".claudish", "model-descriptions.json");
+  MODEL_DESCRIPTIONS_CACHE_PATH = join32(homedir29(), ".claudish", "model-descriptions.json");
   EMPTY_INDEX = { get: () => {
     return;
   }, size: 0 };
@@ -53728,22 +53493,22 @@ var init_branding = __esm(() => {
 // src/update-checker.ts
 import { existsSync as existsSync23, mkdirSync as mkdirSync14, readFileSync as readFileSync23, unlinkSync as unlinkSync6, writeFileSync as writeFileSync15 } from "fs";
 import { homedir as homedir30, platform as platform2, tmpdir } from "os";
-import { join as join34 } from "path";
+import { join as join33 } from "path";
 function getCacheFilePath() {
   let cacheDir;
   if (isWindows) {
-    const localAppData = process.env.LOCALAPPDATA || join34(homedir30(), "AppData", "Local");
-    cacheDir = join34(localAppData, "claudish");
+    const localAppData = process.env.LOCALAPPDATA || join33(homedir30(), "AppData", "Local");
+    cacheDir = join33(localAppData, "claudish");
   } else {
-    cacheDir = join34(homedir30(), ".cache", "claudish");
+    cacheDir = join33(homedir30(), ".cache", "claudish");
   }
   try {
     if (!existsSync23(cacheDir)) {
       mkdirSync14(cacheDir, { recursive: true });
     }
-    return join34(cacheDir, "update-check.json");
+    return join33(cacheDir, "update-check.json");
   } catch {
-    return join34(tmpdir(), "claudish-update-check.json");
+    return join33(tmpdir(), "claudish-update-check.json");
   }
 }
 function readCache2() {
@@ -58403,7 +58168,7 @@ var init_openrouter = __esm(() => {
 // src/services/pricing-cache.ts
 import { existsSync as existsSync24, readFileSync as readFileSync24, statSync as statSync6 } from "fs";
 import { homedir as homedir31 } from "os";
-import { join as join35 } from "path";
+import { join as join34 } from "path";
 function prefixMatch(modelName) {
   for (const [key, pricing] of pricingMap) {
     if (modelName.startsWith(key))
@@ -58463,14 +58228,14 @@ var init_pricing_cache = __esm(() => {
   init_logger();
   init_catalog_query();
   pricingMap = new Map;
-  CACHE_DIR = join35(homedir31(), ".claudish");
-  CACHE_FILE = join35(CACHE_DIR, "pricing-cache.json");
+  CACHE_DIR = join34(homedir31(), ".claudish");
+  CACHE_FILE = join34(CACHE_DIR, "pricing-cache.json");
   CACHE_TTL_MS5 = 24 * 60 * 60 * 1000;
 });
 
 // src/proxy-server.ts
 import { appendFileSync as appendFileSync7, mkdirSync as mkdirSync15 } from "fs";
-import { join as join36 } from "path";
+import { join as join35 } from "path";
 function isTerminalRoutingFailure(e) {
   return e instanceof RoutingError;
 }
@@ -58478,7 +58243,7 @@ function maybeCaptureClassifierRequest(c, body) {
   if (!process.env.CLAUDISH_CLASSIFIER_DEBUG)
     return;
   try {
-    const dir = join36(process.cwd(), "logs");
+    const dir = join35(process.cwd(), "logs");
     if (!classifierCaptureDirReady) {
       mkdirSync15(dir, { recursive: true });
       classifierCaptureDirReady = true;
@@ -58503,7 +58268,7 @@ function maybeCaptureClassifierRequest(c, body) {
         "x-api-key": c.req.header("x-api-key") ? "<present>" : null
       }
     };
-    appendFileSync7(join36(dir, "classifier-capture.jsonl"), `${JSON.stringify(record)}
+    appendFileSync7(join35(dir, "classifier-capture.jsonl"), `${JSON.stringify(record)}
 `);
   } catch {}
 }
@@ -59052,13 +58817,13 @@ import {
   unlinkSync as unlinkSync7
 } from "fs";
 import { homedir as homedir32 } from "os";
-import { dirname as dirname11, join as join37 } from "path";
+import { dirname as dirname11, join as join36 } from "path";
 import { fileURLToPath } from "url";
 function getVersion3() {
   return VERSION;
 }
 function clearAllModelCaches() {
-  const cacheDir = join37(homedir32(), ".claudish");
+  const cacheDir = join36(homedir32(), ".claudish");
   if (!existsSync25(cacheDir))
     return;
   const cachePatterns = ["pricing-cache.json", "recommended-models-cache.json"];
@@ -59067,7 +58832,7 @@ function clearAllModelCaches() {
     const files = readdirSync4(cacheDir);
     for (const file of files) {
       if (cachePatterns.includes(file)) {
-        unlinkSync7(join37(cacheDir, file));
+        unlinkSync7(join36(cacheDir, file));
         cleared++;
       }
     }
@@ -60601,7 +60366,7 @@ ${h("MORE INFO")}
 }
 function printAIAgentGuide() {
   try {
-    const guidePath = join37(__dirname2, "../AI_AGENT_GUIDE.md");
+    const guidePath = join36(__dirname2, "../AI_AGENT_GUIDE.md");
     const guideContent = readFileSync25(guidePath, "utf-8");
     console.log(guideContent);
   } catch (error) {
@@ -60618,10 +60383,10 @@ async function initializeClaudishSkill() {
   console.log(`\uD83D\uDD27 Initializing Claudish skill in current project...
 `);
   const cwd = process.cwd();
-  const claudeDir = join37(cwd, ".claude");
-  const skillsDir = join37(claudeDir, "skills");
-  const claudishSkillDir = join37(skillsDir, "claudish-usage");
-  const skillFile = join37(claudishSkillDir, "SKILL.md");
+  const claudeDir = join36(cwd, ".claude");
+  const skillsDir = join36(claudeDir, "skills");
+  const claudishSkillDir = join36(skillsDir, "claudish-usage");
+  const skillFile = join36(claudishSkillDir, "SKILL.md");
   if (existsSync25(skillFile)) {
     console.log("\u2705 Claudish skill already installed at:");
     console.log(`   ${skillFile}
@@ -60629,7 +60394,7 @@ async function initializeClaudishSkill() {
     console.log("\uD83D\uDCA1 To reinstall, delete the file and run 'claudish --init' again.");
     return;
   }
-  const sourceSkillPath = join37(__dirname2, "../skills/claudish-usage/SKILL.md");
+  const sourceSkillPath = join36(__dirname2, "../skills/claudish-usage/SKILL.md");
   if (!existsSync25(sourceSkillPath)) {
     console.error("\u274C Error: Claudish skill file not found in installation.");
     console.error(`   Expected at: ${sourceSkillPath}`);
@@ -60819,16 +60584,16 @@ var init_cli = __esm(() => {
 // src/launcher/magmux-binary.ts
 import { execSync } from "child_process";
 import { existsSync as existsSync26 } from "fs";
-import { dirname as dirname12, join as join38 } from "path";
+import { dirname as dirname12, join as join37 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 function findMagmuxBinaryOrNull() {
   const thisFile = fileURLToPath2(import.meta.url);
   const thisDir = dirname12(thisFile);
-  const pkgRoots = [join38(thisDir, ".."), join38(thisDir, "..", "..")];
+  const pkgRoots = [join37(thisDir, ".."), join37(thisDir, "..", "..")];
   const platform = process.platform;
   const arch = process.arch;
   for (const pkgRoot of pkgRoots) {
-    const bundled = join38(pkgRoot, "native", `magmux-${platform}-${arch}`);
+    const bundled = join37(pkgRoot, "native", `magmux-${platform}-${arch}`);
     if (existsSync26(bundled))
       return bundled;
   }
@@ -60836,7 +60601,7 @@ function findMagmuxBinaryOrNull() {
     const pkgName = `@claudish/magmux-${platform}-${arch}`;
     let searchDir = pkgRoots[0];
     for (let i = 0;i < 5; i++) {
-      const candidate = join38(searchDir, "node_modules", pkgName, "bin", "magmux");
+      const candidate = join37(searchDir, "node_modules", pkgName, "bin", "magmux");
       if (existsSync26(candidate))
         return candidate;
       const parent = dirname12(searchDir);
@@ -60873,7 +60638,7 @@ import {
   writeFileSync as writeFileSync16
 } from "fs";
 import { connect as netConnect } from "net";
-import { join as join39 } from "path";
+import { join as join38 } from "path";
 function envDeltas(parentEnv, childEnv) {
   const set = [];
   const unset = [];
@@ -60939,9 +60704,9 @@ function planMagmuxWrap(input) {
   const controlSocket = `/tmp/magmux-${id}.sock`;
   const tmpRoot = input.tmpRoot ?? "/tmp";
   mkdirSync17(tmpRoot, { recursive: true });
-  const scriptDir = mkdtempSync(join39(tmpRoot, "claudish-launch-"));
+  const scriptDir = mkdtempSync(join38(tmpRoot, "claudish-launch-"));
   chmodSync(scriptDir, 448);
-  const scriptPath = join39(scriptDir, "claude-launch.sh");
+  const scriptPath = join38(scriptDir, "claude-launch.sh");
   const parentEnv = input.parentEnv ?? process.env;
   const deltas = envDeltas(parentEnv, input.childEnv);
   const fd = openSync6(scriptPath, "wx", 384);
@@ -61070,7 +60835,7 @@ var CLAUDISH_BIN_ENV = "CLAUDISH_BIN";
 // src/pane/process-identity.ts
 import { execFile, execFileSync as execFileSync2 } from "child_process";
 import { lstatSync } from "fs";
-import { basename, dirname as dirname13, join as join40 } from "path";
+import { basename, dirname as dirname13, join as join39 } from "path";
 function collapse(s) {
   return s.trim().replace(/\s+/g, " ");
 }
@@ -61251,16 +61016,16 @@ function isValidPaneId(id) {
   return PANE_ID_RE.test(id) && !/^\d+$/.test(id);
 }
 function sockPathOf(root, paneId) {
-  return join40(root, `magmux-${paneId}.sock`);
+  return join39(root, `magmux-${paneId}.sock`);
 }
 function recordPathOf(root, paneId) {
-  return join40(root, "panes", `${paneId}.json`);
+  return join39(root, "panes", `${paneId}.json`);
 }
 function isPaneSockPath(root, p, paneId) {
   return isValidPaneId(paneId) && dirname13(p) === root && basename(p) === `magmux-${paneId}.sock`;
 }
 function isPaneRecordPath(root, p, paneId) {
-  return isValidPaneId(paneId) && dirname13(p) === join40(root, "panes") && basename(p) === `${paneId}.json`;
+  return isValidPaneId(paneId) && dirname13(p) === join39(root, "panes") && basename(p) === `${paneId}.json`;
 }
 function watcherArgv(a) {
   return [
@@ -61361,7 +61126,7 @@ var init_process_identity = __esm(() => {
 import { execFile as execFile2, spawn } from "child_process";
 import { randomBytes as randomBytes7 } from "crypto";
 import { chmodSync as chmodSync2, lstatSync as lstatSync2, mkdirSync as mkdirSync18, mkdtempSync as mkdtempSync2, writeFileSync as writeFileSync17 } from "fs";
-import { join as join41, resolve as resolve3 } from "path";
+import { join as join40, resolve as resolve3 } from "path";
 import { promisify as promisify5 } from "util";
 function uid() {
   return typeof process.getuid === "function" ? process.getuid() : 0;
@@ -61390,7 +61155,7 @@ function ensureSockRoot(given = sockRootFor()) {
       throw e;
   }
   assertPrivateDir(root);
-  const panes = join41(root, "panes");
+  const panes = join40(root, "panes");
   try {
     mkdirSync18(panes, { mode: 448 });
   } catch (e) {
@@ -61445,7 +61210,7 @@ function buildPaneEnv(input) {
   if ((input.platform ?? process.platform) === "linux" && entryBytes > LINUX_ENV_STRING_LIMIT)
     throw new PaneEnvTooLargeError(`pane environment snapshot is ${entryBytes} bytes, over Linux's 131072-byte limit per variable`);
   env[ENV.CLAUDISH_PANE_ENV] = json;
-  env.SHELL = join41(input.ctlDir, "sh-shim");
+  env.SHELL = join40(input.ctlDir, "sh-shim");
   return { magmuxEnv: env };
 }
 function buildClaudishPaneArgv(spawnModel, sessionUuid, turnDir, callerFlags) {
@@ -61591,21 +61356,21 @@ exec ${words}
 `;
 }
 function paneCommand(ctlDir) {
-  const cmd = `. ${shq2(join41(ctlDir, "pane-launch.sh"))}`;
+  const cmd = `. ${shq2(join40(ctlDir, "pane-launch.sh"))}`;
   if (/claude /.test(cmd) || /claude$/.test(cmd) || /(^|\/)claude['"]?$/.test(cmd))
     throw new Error(`pane command would attach magmux's Claude Code controller: ${cmd}`);
   return cmd;
 }
 function createLaunchDirs(root) {
-  const ctlDir = mkdtempSync2(join41(root, "launch-"));
+  const ctlDir = mkdtempSync2(join40(root, "launch-"));
   chmodSync2(ctlDir, 448);
-  const turnDir = mkdtempSync2(join41(root, "launch-"));
+  const turnDir = mkdtempSync2(join40(root, "launch-"));
   chmodSync2(turnDir, 448);
   return { ctlDir, turnDir };
 }
 function writeLauncherFiles(ctlDir, script) {
-  writeFileSync17(join41(ctlDir, "pane-launch.sh"), script, { mode: 384, flag: "wx" });
-  writeFileSync17(join41(ctlDir, "sh-shim"), SHELL_SHIM, { mode: 448, flag: "wx" });
+  writeFileSync17(join40(ctlDir, "pane-launch.sh"), script, { mode: 384, flag: "wx" });
+  writeFileSync17(join40(ctlDir, "sh-shim"), SHELL_SHIM, { mode: 448, flag: "wx" });
 }
 function spawnPaneWatcher(args) {
   const proc = spawn("/bin/sh", watcherArgv(args), {
@@ -61983,7 +61748,7 @@ import {
   unlinkSync as unlinkSync8,
   writeFileSync as writeFileSync18
 } from "fs";
-import { join as join42 } from "path";
+import { join as join41 } from "path";
 function ownerStartOfSelf() {
   if (ownStart)
     return ownStart;
@@ -61996,7 +61761,7 @@ function ownerAlive(rec, table) {
   return !!row && row.lstart === rec.ownerStart;
 }
 function recordsDir(root) {
-  return join42(root, "panes");
+  return join41(root, "panes");
 }
 function writeRecord(root, rec) {
   const p = recordPathOf(root, rec.paneId);
@@ -62066,13 +61831,13 @@ function readRecords(root) {
 }
 function readGroupFile(ctlDir) {
   try {
-    return parseGroupFile(readFileSync26(join42(ctlDir, "group"), "utf8"));
+    return parseGroupFile(readFileSync26(join41(ctlDir, "group"), "utf8"));
   } catch {
     return null;
   }
 }
 function writeGroupFile(ctlDir, snap) {
-  const p = join42(ctlDir, "group");
+  const p = join41(ctlDir, "group");
   const tmp = `${p}.tmp`;
   try {
     writeFileSync18(tmp, formatGroupFile(snap), { mode: 384 });
@@ -62284,7 +62049,7 @@ async function sweepRecordlessSocket(root, name, out) {
   const table = readProcessTable();
   if (ownerOfIdAlive(id, table))
     return;
-  const sockPath = join42(root, name);
+  const sockPath = join41(root, name);
   let client = null;
   try {
     client = await MagmuxClient.dial(sockPath);
@@ -62855,7 +62620,7 @@ import {
   realpathSync as realpathSync2,
   statSync as statSync7
 } from "fs";
-import { join as join43 } from "path";
+import { join as join42 } from "path";
 function initialFollowerState(resolvePath = safeRealpath) {
   return {
     turns: [],
@@ -63361,7 +63126,7 @@ class TranscriptFollower {
     for (const f of this.subagentFiles()) {
       let tail = this.subs.get(f);
       if (!tail) {
-        tail = new Tail(join43(this.subagentsDir, f));
+        tail = new Tail(join42(this.subagentsDir, f));
         this.subs.set(f, tail);
       }
       for (const { line } of tail.read()) {
@@ -63444,7 +63209,7 @@ var init_transcript_follower = __esm(() => {
 
 // src/pane/pane-session.ts
 import { readFileSync as readFileSync27, realpathSync as realpathSync3, rmSync as rmSync4, statSync as statSync8, writeFileSync as writeFileSync19 } from "fs";
-import { join as join44 } from "path";
+import { join as join43 } from "path";
 function iso(ms) {
   return new Date(ms).toISOString();
 }
@@ -63546,7 +63311,7 @@ class PaneSessionImpl {
       this.queue.push(o.initialPrompt);
     this.secondaryQuietMs = o.timings?.secondaryQuietMs ?? SECONDARY_QUIET_MS;
     this.corroborationMs = o.timings?.corroborationMs ?? CORROBORATION_MS;
-    this.follower = new TranscriptFollower(o.transcriptPath, join44(o.transcriptPath.replace(/\.jsonl$/, ""), "subagents"));
+    this.follower = new TranscriptFollower(o.transcriptPath, join43(o.transcriptPath.replace(/\.jsonl$/, ""), "subagents"));
     this.ready = new Promise((r) => {
       this.resolveReady = r;
     });
@@ -63587,7 +63352,7 @@ class PaneSessionImpl {
       return this.spawnFailed(new Error("magmux did not start"));
     this.magmux = proc;
     try {
-      writeFileSync19(join44(this.ctlDir, "magmux.pid"), `${proc.pid}
+      writeFileSync19(join43(this.ctlDir, "magmux.pid"), `${proc.pid}
 `, { mode: 384 });
     } catch {}
     updateRecord(this.root, this.paneId, { magmuxPid: proc.pid });
@@ -64872,6 +64637,64 @@ var init_pane = __esm(() => {
   init_contract();
 });
 
+// src/channel/parent-session.ts
+import { readFile as readFile4 } from "fs/promises";
+import { join as join44 } from "path";
+function positiveInt(value) {
+  if (value === undefined || !/^[1-9][0-9]*$/.test(value))
+    return;
+  const n = Number(value);
+  return Number.isSafeInteger(n) ? n : undefined;
+}
+function hostPidFrom(env, ppid) {
+  const launcherPpid = positiveInt(env.CLAUDISH_LAUNCHER_PPID);
+  if (env.CLAUDISH_LAUNCHER_PID === String(ppid) && launcherPpid !== undefined && launcherPpid !== ppid) {
+    return { hostPid: launcherPpid, launcherPid: ppid };
+  }
+  return { hostPid: ppid };
+}
+function parentSessionIdFrom(env) {
+  const id = env.CLAUDE_CODE_SESSION_ID;
+  if (id === undefined || !CLAUDE_ID_RE.test(id))
+    return;
+  if (env.CLAUDE_CODE_CHILD_SESSION)
+    return;
+  return id;
+}
+function claudeConfigDir(env) {
+  const fromEnv = env.CLAUDE_CONFIG_DIR;
+  return fromEnv && fromEnv.length > 0 ? fromEnv : join44(userHomeFrom(env), ".claude");
+}
+async function readHostSessionRecord(opts) {
+  try {
+    const raw = await readFile4(join44(opts.configDir, "sessions", `${opts.hostPid}.json`), "utf-8");
+    const parsed = JSON.parse(raw);
+    if (!parsed || typeof parsed !== "object")
+      return;
+    const rec = parsed;
+    if (rec.pid !== opts.hostPid)
+      return;
+    if (typeof rec.sessionId !== "string" || !CLAUDE_ID_RE.test(rec.sessionId))
+      return;
+    return { sessionId: rec.sessionId };
+  } catch {
+    return;
+  }
+}
+async function parentSessionForCall(opts) {
+  const env = opts.env ?? process.env;
+  const record = await readHostSessionRecord({
+    configDir: claudeConfigDir(env),
+    hostPid: opts.hostPid
+  });
+  return record?.sessionId ?? parentSessionIdFrom(env);
+}
+var CLAUDE_ID_RE;
+var init_parent_session = __esm(() => {
+  init_home_dir();
+  CLAUDE_ID_RE = /^[A-Za-z0-9_-]{8,128}$/;
+});
+
 // src/session/session-discovery.ts
 var exports_session_discovery = {};
 __export(exports_session_discovery, {
@@ -65320,7 +65143,8 @@ function findLatestSessionId(cwd = process.cwd(), sinceMs = 0) {
 }
 var ENTRYPOINT_BYTES = 8192, ACTIVE_WINDOW_MS = 120000, HEAD_BYTES, TAIL_BYTES, HARNESS_ENVELOPES, DEEP_TAIL_BYTES, RECENT_AI_TURNS = 5, RECENT_USER_TURNS = 1;
 var init_session_discovery = __esm(() => {
-  init_parent_proof();
+  init_home_dir();
+  init_parent_session();
   HEAD_BYTES = 64 * 1024;
   TAIL_BYTES = 128 * 1024;
   HARNESS_ENVELOPES = [
@@ -67625,7 +67449,7 @@ var init_session_manager = __esm(() => {
   init_team_orchestrator();
   init_team_stats();
   init_home_dir();
-  init_parent_proof();
+  init_parent_session();
   init_scrollback_buffer();
   TERMINAL_RETENTION_MS = 30 * 60000;
   EVENT_LOG_LIMIT = 4 * 1024 * 1024;
@@ -68638,8 +68462,7 @@ Use with: run_prompt(model="${suggested}", prompt="your prompt")`;
               requirePattern
             });
             setupSession(resolved, models, input);
-            const parentClaudeSessionId = await proveParentForCall({
-              toolUseId: ctx.toolUseId,
+            const parentClaudeSessionId = await parentSessionForCall({
               hostPid: sessionManager.hostPid
             });
             const monitorRecord = sessionManager.recordTeamRun({
@@ -68925,7 +68748,7 @@ Report manually at https://github.com/anthropics/claudish/issues${autoSendHint}`
       required: ["model"]
     },
     group: "channel",
-    handler: async (args, ctx) => {
+    handler: async (args) => {
       try {
         const claudishFlags = buildChildClaudeFlags(args.agent, args.claude_flags) ?? [];
         const flagCheck = checkChildFlags(claudishFlags);
@@ -68937,8 +68760,7 @@ Report manually at https://github.com/anthropics/claudish/issues${autoSendHint}`
         const plan = await prehydrateCredentialsForSpawn([requestedModel], {
           pin: workDir === undefined || resolve6(workDir) === process.cwd()
         });
-        const parentClaudeSessionId = await proveParentForCall({
-          toolUseId: ctx.toolUseId,
+        const parentClaudeSessionId = await parentSessionForCall({
           hostPid: sessionManager.hostPid
         });
         const sessionId = await sessionManager.createSession({
@@ -69251,10 +69073,8 @@ Call get_diagnostics with session_id: "${sessionId}" for the final screen, the u
       intervalMs: progressIntervalMs,
       send: (frame) => extra.sendNotification({ method: "notifications/progress", params: frame })
     }) : NOOP_HEARTBEAT;
-    const rawToolUseId = extra._meta?.[TOOL_USE_ID_META_KEY];
     const ctx = {
-      reportProgress: (message) => heartbeat.tick(message),
-      ...typeof rawToolUseId === "string" ? { toolUseId: rawToolUseId } : {}
+      reportProgress: (message) => heartbeat.tick(message)
     };
     try {
       return await tool.handler(args ?? {}, ctx);
@@ -69332,7 +69152,7 @@ var init_mcp_server = __esm(() => {
   init_prehydrate();
   init_diagnostics();
   init_channel();
-  init_parent_proof();
+  init_parent_session();
   init_remote_provider_types();
   init_progress_heartbeat();
   init_model_loader();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claudish",
-  "version": "10.4.0",
+  "version": "10.4.1",
   "description": "Run Claude Code with any model - OpenRouter, Ollama, LM Studio & local models",
   "type": "module",
   "main": "./dist/index.js",
@@ -60,10 +60,10 @@
     "ai"
   ],
   "optionalDependencies": {
-    "@claudish/magmux-darwin-arm64": "10.4.0",
-    "@claudish/magmux-darwin-x64": "10.4.0",
-    "@claudish/magmux-linux-arm64": "10.4.0",
-    "@claudish/magmux-linux-x64": "10.4.0"
+    "@claudish/magmux-darwin-arm64": "10.4.1",
+    "@claudish/magmux-darwin-x64": "10.4.1",
+    "@claudish/magmux-linux-arm64": "10.4.1",
+    "@claudish/magmux-linux-x64": "10.4.1"
   },
   "author": "Jack Rudenko <i@madappgang.com>",
   "license": "MIT",