@khalilgharbaoui/opencode-claude-code-plugin 0.53.4 → 0.54.0

package/dist/index.js

@@ -1,5 +1,5 @@
 // src/claude-code-language-model.ts
-import { join as join15 } from "path";
+import { join as join16 } from "path";
 
 // src/ids.ts
 import { randomInt } from "crypto";
@@ -5927,9 +5927,20 @@ function backgroundTaskIdsIn(text) {
   }
   return [...ids];
 }
+var BATCH_SECTION = /^## task \d+ of \d+: /m;
+function acceptedBackgroundTaskIds(result) {
+  if (result.kind !== "text") return [];
+  if (result.isError !== true) return backgroundTaskIdsIn(result.text);
+  const ids = /* @__PURE__ */ new Set();
+  for (const section of result.text.split(BATCH_SECTION).slice(1)) {
+    const body = section.slice(section.indexOf("\n") + 1);
+    if (body.startsWith("[error] ") || body.startsWith("[missing] ")) continue;
+    for (const id of backgroundTaskIdsIn(body)) ids.add(id);
+  }
+  return [...ids];
+}
 function noteBackgroundDispatchResult(sessionKey2, result, now = Date.now()) {
-  if (result.kind !== "text" || result.isError === true) return;
-  for (const taskId of backgroundTaskIdsIn(result.text)) {
+  for (const taskId of acceptedBackgroundTaskIds(result)) {
     started.delete(taskId);
     started.set(taskId, { sessionKey: sessionKey2, at: now });
     while (started.size > MAX_STARTED) {
@@ -6012,8 +6023,8 @@ async function countOtherRunningWithin(exclude, budgetMs) {
   }
 }
 async function withBackgroundRunningCount(result, budgetMs = BACKGROUND_COUNT_BUDGET_MS) {
-  if (result.kind !== "text" || result.isError === true) return result;
-  const dispatched = backgroundTaskIdsIn(result.text);
+  if (result.kind !== "text") return result;
+  const dispatched = acceptedBackgroundTaskIds(result);
   if (dispatched.length === 0) return result;
   const others = await countOtherRunningWithin(new Set(dispatched), budgetMs);
   if (others === void 0) {
@@ -12155,6 +12166,80 @@ function spawnInteractiveProcess(opts) {
   return ap;
 }
 
+// src/spawn-record-store.ts
+import { mkdirSync as mkdirSync6, readFileSync as readFileSync8, renameSync as renameSync4, statSync as statSync7, writeFileSync as writeFileSync7 } from "fs";
+import { homedir as homedir10 } from "os";
+import { join as join14 } from "path";
+var MAX_SPAWN_RECORDS = 256;
+var SPAWN_RECORD_MAX_AGE_MS = 7 * 24 * 60 * 60 * 1e3;
+var pathOverride3 = null;
+var lastWritten = /* @__PURE__ */ new Map();
+function spawnRecordStorePath() {
+  if (pathOverride3) return pathOverride3;
+  const stateRoot = process.env.XDG_STATE_HOME || join14(homedir10(), ".local", "state");
+  return join14(stateRoot, "opencode-claude-code-plugin", "session-spawns.json");
+}
+function isRecord5(value) {
+  const record = value;
+  if (!record || typeof record !== "object" || Array.isArray(record)) return false;
+  if (typeof record.at !== "number" || !Number.isFinite(record.at)) return false;
+  const ok = (field) => field === void 0 || typeof field === "string";
+  if (!ok(record.model) || !ok(record.effort) || !ok(record.account)) return false;
+  return !!record.model;
+}
+function readEntries(file) {
+  const out = /* @__PURE__ */ new Map();
+  try {
+    const parsed = JSON.parse(readFileSync8(file, "utf8"));
+    const entries = parsed && typeof parsed === "object" ? parsed.sessions : null;
+    if (!entries || typeof entries !== "object") return out;
+    const cutoff = Date.now() - SPAWN_RECORD_MAX_AGE_MS;
+    const valid = Object.entries(entries).filter((entry) => isRecord5(entry[1])).filter(([, record]) => record.at >= cutoff).sort((a, b) => a[1].at - b[1].at);
+    for (const [key, record] of valid) {
+      out.set(key, {
+        model: record.model,
+        ...record.effort ? { effort: record.effort } : {},
+        ...record.account ? { account: record.account } : {},
+        at: record.at
+      });
+    }
+  } catch {
+  }
+  return out;
+}
+function recordSessionSpawn(sessionID, spawn2, now = Date.now()) {
+  if (!sessionID || sessionID === "default" || !spawn2.model) return false;
+  const record = {
+    model: spawn2.model,
+    ...spawn2.effort ? { effort: spawn2.effort } : {},
+    ...spawn2.account ? { account: spawn2.account } : {},
+    at: now
+  };
+  const fingerprint = `${record.model}
+${record.effort ?? ""}
+${record.account ?? ""}`;
+  if (lastWritten.get(sessionID) === fingerprint) return false;
+  const file = spawnRecordStorePath();
+  const merged = readEntries(file);
+  merged.delete(sessionID);
+  merged.set(sessionID, record);
+  const cutoff = now - SPAWN_RECORD_MAX_AGE_MS;
+  const kept = [...merged.entries()].filter(([, entry]) => entry.at >= cutoff).sort((a, b) => a[1].at - b[1].at).slice(-MAX_SPAWN_RECORDS);
+  try {
+    mkdirSync6(join14(file, ".."), { recursive: true, mode: 448 });
+    const tmp = `${file}.${process.pid}.tmp`;
+    writeFileSync7(tmp, JSON.stringify({ version: 1, sessions: Object.fromEntries(kept) }), {
+      mode: 384
+    });
+    renameSync4(tmp, file);
+  } catch {
+    return false;
+  }
+  if (lastWritten.size >= MAX_SPAWN_RECORDS) lastWritten.clear();
+  lastWritten.set(sessionID, fingerprint);
+  return true;
+}
+
 // src/account-transcript.ts
 import { randomUUID as randomUUID6 } from "crypto";
 import { constants as fsConstants } from "fs";
@@ -12216,13 +12301,13 @@ function dedupe2(dirs) {
 }
 
 // src/prompts.ts
-import { readFileSync as readFileSync8, writeFileSync as writeFileSync7 } from "fs";
-import { homedir as homedir10 } from "os";
+import { readFileSync as readFileSync9, writeFileSync as writeFileSync8 } from "fs";
+import { homedir as homedir11 } from "os";
 import { randomUUID as randomUUID7 } from "crypto";
-import { basename as basename2, dirname as dirname6, isAbsolute as isAbsolute3, join as join14 } from "path";
+import { basename as basename2, dirname as dirname6, isAbsolute as isAbsolute3, join as join15 } from "path";
 function readPromptFileIfPresent(path15) {
   try {
-    const content = readFileSync8(path15, "utf8").trim();
+    const content = readFileSync9(path15, "utf8").trim();
     return content || void 0;
   } catch {
     return void 0;
@@ -12231,7 +12316,7 @@ function readPromptFileIfPresent(path15) {
 function nearestWorkspaceAgentsPrompt(cwd) {
   let dir = cwd;
   while (true) {
-    const content = readPromptFileIfPresent(join14(dir, "AGENTS.md"));
+    const content = readPromptFileIfPresent(join15(dir, "AGENTS.md"));
     if (content) return content;
     const parent = dirname6(dir);
     if (parent === dir) return void 0;
@@ -12342,7 +12427,7 @@ var CLAUDE_NATIVE_INSTRUCTION_FILES = /* @__PURE__ */ new Set(["CLAUDE.md", "CLA
 function userAuthoredInstructions(forwarded, opts = {}) {
   const readFile3 = opts.readFile ?? ((path15) => {
     try {
-      return readFileSync8(path15, "utf8");
+      return readFileSync9(path15, "utf8");
     } catch {
       return null;
     }
@@ -12383,8 +12468,8 @@ ${options.compressionSummary.trim()}`
   for (const s of extraSystemContent) {
     if (s.trim()) parts.push(s.trim());
   }
-  const configRoot = process.env.XDG_CONFIG_HOME ?? join14(homedir10(), ".config");
-  const globalAgents = readPromptFileIfPresent(join14(configRoot, "opencode", "AGENTS.md"));
+  const configRoot = process.env.XDG_CONFIG_HOME ?? join15(homedir11(), ".config");
+  const globalAgents = readPromptFileIfPresent(join15(configRoot, "opencode", "AGENTS.md"));
   const workspaceAgents = nearestWorkspaceAgentsPrompt(cwd);
   const forwarded = extraSystemContent.join("\n\n");
   const pushGlobal = !!globalAgents && !forwarded.includes(globalAgents);
@@ -12400,9 +12485,9 @@ ${options.compressionSummary.trim()}`
   if (includeMultiStepHint) parts.push(MULTI_STEP_TASK_HINT);
   const content = parts.join("\n\n");
   if (!content) return void 0;
-  const path15 = join14(pluginTmpDir(), `opencode-cc-sys-${randomUUID7()}.md`);
+  const path15 = join15(pluginTmpDir(), `opencode-cc-sys-${randomUUID7()}.md`);
   try {
-    writeFileSync7(path15, content, { encoding: "utf8", mode: 384 });
+    writeFileSync8(path15, content, { encoding: "utf8", mode: 384 });
     return path15;
   } catch (err) {
     log.warn("failed to write system prompt file", { error: String(err) });
@@ -15567,6 +15652,13 @@ var ClaudeCodeLanguageModel = class {
       return this.subagentDispatchReleaseStream(dispatchStep, sk, warnings);
     }
     if (!compactionMode) invalidateOtherEffortSessions(baseKey, reasoningEffort);
+    if (!compactionMode && affinity !== "default") {
+      recordSessionSpawn(affinity, {
+        model: stripAccountSuffix(failover.modelId),
+        effort: reasoningEffort,
+        account: (this.config.failoverAccounts?.length ?? 0) > 1 ? failover.target ?? sourceAccount : void 0
+      });
+    }
     const hasPriorConversation = options.prompt.filter((m) => m.role === "user" || m.role === "assistant").length > 1;
     if (!hasPriorConversation) {
       deleteClaudeSessionId(sk);
@@ -15770,7 +15862,7 @@ var ClaudeCodeLanguageModel = class {
     let replayReason = "no-session-for-key";
     if (this.config.resumeAfterRestart !== false && includeHistoryContext && !compactionMode && !forkFromClaudeSessionId && failoverAnswer?.kind !== "switch") {
       const configDir = resolveConfigDir(this.config.configDir);
-      const transcriptPath2 = (id, dir) => join15(dir ?? configDir, "projects", encodeCwd(cwd), `${id}.jsonl`);
+      const transcriptPath2 = (id, dir) => join16(dir ?? configDir, "projects", encodeCwd(cwd), `${id}.jsonl`);
       const resumePoint = findResumePoint({
         sessionKey: sk,
         prompt: options.prompt,
@@ -17126,7 +17218,7 @@ var ClaudeCodeLanguageModel = class {
 };
 
 // src/account-tier.ts
-import { readFileSync as readFileSync9 } from "fs";
+import { readFileSync as readFileSync10 } from "fs";
 import path13 from "path";
 var ORGANIZATION_TYPE_LABELS = {
   claude_max: "Max",
@@ -17169,7 +17261,7 @@ function readTierFromConfigDir(configDir, allowLegacyFallback) {
 function readOauthAccount(file) {
   let raw;
   try {
-    raw = readFileSync9(file, "utf8");
+    raw = readFileSync10(file, "utf8");
   } catch {
     return void 0;
   }
@@ -17197,14 +17289,14 @@ function tierLabel(oauthAccount) {
 // src/cleanup-stale.ts
 import {
   existsSync as existsSync5,
-  mkdirSync as mkdirSync6,
-  readFileSync as readFileSync10,
+  mkdirSync as mkdirSync7,
+  readFileSync as readFileSync11,
   realpathSync as realpathSync4,
   rmSync as rmSync3,
-  writeFileSync as writeFileSync8
+  writeFileSync as writeFileSync9
 } from "fs";
-import { homedir as homedir11 } from "os";
-import { dirname as dirname7, join as join16, resolve as resolve5 } from "path";
+import { homedir as homedir12 } from "os";
+import { dirname as dirname7, join as join17, resolve as resolve5 } from "path";
 import { fileURLToPath as fileURLToPath4 } from "url";
 var STALE_PACKAGE_NAME = "opencode-claude-code-plugin";
 var SUSPECT_DESCRIPTION_TOKEN = "Claude Code";
@@ -17212,20 +17304,20 @@ var alreadyRan = false;
 function candidateCacheRoots() {
   const xdg = process.env.XDG_CACHE_HOME;
   return [
-    xdg ? join16(xdg, "opencode") : null,
-    join16(homedir11(), ".cache", "opencode"),
-    join16(homedir11(), "Library", "Caches", "opencode")
+    xdg ? join17(xdg, "opencode") : null,
+    join17(homedir12(), ".cache", "opencode"),
+    join17(homedir12(), "Library", "Caches", "opencode")
   ].filter((p) => Boolean(p));
 }
 function userOpencodeJsonPath() {
-  const xdgConfig = process.env.XDG_CONFIG_HOME ?? join16(homedir11(), ".config");
-  return join16(xdgConfig, "opencode", "opencode.json");
+  const xdgConfig = process.env.XDG_CONFIG_HOME ?? join17(homedir12(), ".config");
+  return join17(xdgConfig, "opencode", "opencode.json");
 }
 function userIntendsToUseUnscoped() {
   const cfg = userOpencodeJsonPath();
   if (!existsSync5(cfg)) return false;
   try {
-    const json = JSON.parse(readFileSync10(cfg, "utf8"));
+    const json = JSON.parse(readFileSync11(cfg, "utf8"));
     const plugins = json.plugin;
     if (!Array.isArray(plugins)) return false;
     return plugins.some(
@@ -17246,19 +17338,19 @@ function ourLoadedDir() {
 function ourVersion(dir) {
   if (!dir) return null;
   try {
-    const pkg = JSON.parse(readFileSync10(join16(dir, "package.json"), "utf8"));
+    const pkg = JSON.parse(readFileSync11(join17(dir, "package.json"), "utf8"));
     return typeof pkg.version === "string" && pkg.version ? pkg.version : null;
   } catch {
     return null;
   }
 }
 function markerPath() {
-  const stateRoot = process.env.XDG_STATE_HOME ?? join16(homedir11(), ".local", "state");
-  return join16(stateRoot, "opencode-claude-code-plugin", "cleanup-stale.json");
+  const stateRoot = process.env.XDG_STATE_HOME ?? join17(homedir12(), ".local", "state");
+  return join17(stateRoot, "opencode-claude-code-plugin", "cleanup-stale.json");
 }
 function markerVersion() {
   try {
-    const marker = JSON.parse(readFileSync10(markerPath(), "utf8"));
+    const marker = JSON.parse(readFileSync11(markerPath(), "utf8"));
     return typeof marker.version === "string" ? marker.version : null;
   } catch {
     return null;
@@ -17267,8 +17359,8 @@ function markerVersion() {
 function writeMarker(version) {
   const file = markerPath();
   try {
-    mkdirSync6(dirname7(file), { recursive: true });
-    writeFileSync8(
+    mkdirSync7(dirname7(file), { recursive: true });
+    writeFileSync9(
       file,
       JSON.stringify({ version, at: (/* @__PURE__ */ new Date()).toISOString() }, null, 2) + "\n",
       "utf8"
@@ -17303,7 +17395,7 @@ function cleanupStaleUnscopedInstall() {
 }
 function cleanupOne(cacheRoot, ourDir) {
   if (!existsSync5(cacheRoot)) return;
-  const stalePath = join16(cacheRoot, "node_modules", STALE_PACKAGE_NAME);
+  const stalePath = join17(cacheRoot, "node_modules", STALE_PACKAGE_NAME);
   if (!existsSync5(stalePath)) return;
   let realStalePath = stalePath;
   try {
@@ -17311,11 +17403,11 @@ function cleanupOne(cacheRoot, ourDir) {
   } catch {
   }
   if (ourDir && realStalePath === ourDir) return;
-  const pkgJsonPath = join16(stalePath, "package.json");
+  const pkgJsonPath = join17(stalePath, "package.json");
   if (!existsSync5(pkgJsonPath)) return;
   let pkg = {};
   try {
-    pkg = JSON.parse(readFileSync10(pkgJsonPath, "utf8"));
+    pkg = JSON.parse(readFileSync11(pkgJsonPath, "utf8"));
   } catch {
     return;
   }
@@ -17331,13 +17423,13 @@ function cleanupOne(cacheRoot, ourDir) {
     });
     return;
   }
-  const cachePkgJson = join16(cacheRoot, "package.json");
+  const cachePkgJson = join17(cacheRoot, "package.json");
   if (!existsSync5(cachePkgJson)) return;
   try {
-    const cfg = JSON.parse(readFileSync10(cachePkgJson, "utf8"));
+    const cfg = JSON.parse(readFileSync11(cachePkgJson, "utf8"));
     if (cfg?.dependencies?.[STALE_PACKAGE_NAME]) {
       delete cfg.dependencies[STALE_PACKAGE_NAME];
-      writeFileSync8(cachePkgJson, JSON.stringify(cfg, null, 2) + "\n");
+      writeFileSync9(cachePkgJson, JSON.stringify(cfg, null, 2) + "\n");
       log.info("cleanup-stale: pruned dep from cache package.json");
     }
   } catch (err) {
@@ -18109,12 +18201,12 @@ function configModelsForProvider(providerModels, providerID, modelSuffix) {
   }
   return models;
 }
-function isRecord5(value) {
+function isRecord6(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function completeUserModel(id, entry, providerID) {
-  const record = isRecord5(entry) ? entry : {};
-  const runtimeShaped = isRecord5(record.capabilities) && isRecord5(record.capabilities.input) && isRecord5(record.capabilities.output) && isRecord5(record.cost) && isRecord5(record.cost.cache) && isRecord5(record.api);
+  const record = isRecord6(entry) ? entry : {};
+  const runtimeShaped = isRecord6(record.capabilities) && isRecord6(record.capabilities.input) && isRecord6(record.capabilities.output) && isRecord6(record.cost) && isRecord6(record.cost.cache) && isRecord6(record.api);
   if (runtimeShaped) {
     return toConfigModel({ ...record, providerID });
   }
@@ -18127,8 +18219,8 @@ function completeUserModel(id, entry, providerID) {
   const merged = { ...base, ...record, id };
   for (const key of ["cost", "limit", "variants"]) {
     merged[key] = {
-      ...isRecord5(base[key]) ? base[key] : {},
-      ...isRecord5(record[key]) ? record[key] : {}
+      ...isRecord6(base[key]) ? base[key] : {},
+      ...isRecord6(record[key]) ? record[key] : {}
     };
   }
   return merged;