oh-my-opencode 3.3.2 → 3.4.0

package/dist/index.js

@@ -4522,29 +4522,30 @@ var init_agent_category = () => {};
 // src/shared/migration/config-migration.ts
 import * as fs5 from "fs";
 function migrateConfigFile(configPath, rawConfig) {
+  const copy = structuredClone(rawConfig);
   let needsWrite = false;
-  const existingMigrations = Array.isArray(rawConfig._migrations) ? new Set(rawConfig._migrations) : new Set;
+  const existingMigrations = Array.isArray(copy._migrations) ? new Set(copy._migrations) : new Set;
   const allNewMigrations = [];
-  if (rawConfig.agents && typeof rawConfig.agents === "object") {
-    const { migrated, changed } = migrateAgentNames(rawConfig.agents);
+  if (copy.agents && typeof copy.agents === "object") {
+    const { migrated, changed } = migrateAgentNames(copy.agents);
     if (changed) {
-      rawConfig.agents = migrated;
+      copy.agents = migrated;
       needsWrite = true;
     }
   }
-  if (rawConfig.agents && typeof rawConfig.agents === "object") {
-    const { migrated, changed, newMigrations } = migrateModelVersions(rawConfig.agents, existingMigrations);
+  if (copy.agents && typeof copy.agents === "object") {
+    const { migrated, changed, newMigrations } = migrateModelVersions(copy.agents, existingMigrations);
     if (changed) {
-      rawConfig.agents = migrated;
+      copy.agents = migrated;
       needsWrite = true;
       log("Migrated model versions in agents config");
     }
     allNewMigrations.push(...newMigrations);
   }
-  if (rawConfig.categories && typeof rawConfig.categories === "object") {
-    const { migrated, changed, newMigrations } = migrateModelVersions(rawConfig.categories, existingMigrations);
+  if (copy.categories && typeof copy.categories === "object") {
+    const { migrated, changed, newMigrations } = migrateModelVersions(copy.categories, existingMigrations);
     if (changed) {
-      rawConfig.categories = migrated;
+      copy.categories = migrated;
       needsWrite = true;
       log("Migrated model versions in categories config");
     }
@@ -4553,18 +4554,18 @@ function migrateConfigFile(configPath, rawConfig) {
   if (allNewMigrations.length > 0) {
     const updatedMigrations = Array.from(existingMigrations);
     updatedMigrations.push(...allNewMigrations);
-    rawConfig._migrations = updatedMigrations;
+    copy._migrations = updatedMigrations;
     needsWrite = true;
   }
-  if (rawConfig.omo_agent) {
-    rawConfig.sisyphus_agent = rawConfig.omo_agent;
-    delete rawConfig.omo_agent;
+  if (copy.omo_agent) {
+    copy.sisyphus_agent = copy.omo_agent;
+    delete copy.omo_agent;
     needsWrite = true;
   }
-  if (rawConfig.disabled_agents && Array.isArray(rawConfig.disabled_agents)) {
+  if (copy.disabled_agents && Array.isArray(copy.disabled_agents)) {
     const migrated = [];
     let changed = false;
-    for (const agent of rawConfig.disabled_agents) {
+    for (const agent of copy.disabled_agents) {
       const newAgent = AGENT_NAME_MAP[agent.toLowerCase()] ?? AGENT_NAME_MAP[agent] ?? agent;
       if (newAgent !== agent) {
         changed = true;
@@ -4572,14 +4573,14 @@ function migrateConfigFile(configPath, rawConfig) {
       migrated.push(newAgent);
     }
     if (changed) {
-      rawConfig.disabled_agents = migrated;
+      copy.disabled_agents = migrated;
       needsWrite = true;
     }
   }
-  if (rawConfig.disabled_hooks && Array.isArray(rawConfig.disabled_hooks)) {
-    const { migrated, changed, removed } = migrateHookNames(rawConfig.disabled_hooks);
+  if (copy.disabled_hooks && Array.isArray(copy.disabled_hooks)) {
+    const { migrated, changed, removed } = migrateHookNames(copy.disabled_hooks);
     if (changed) {
-      rawConfig.disabled_hooks = migrated;
+      copy.disabled_hooks = migrated;
       needsWrite = true;
     }
     if (removed.length > 0) {
@@ -4590,13 +4591,20 @@ function migrateConfigFile(configPath, rawConfig) {
     try {
       const timestamp2 = new Date().toISOString().replace(/[:.]/g, "-");
       const backupPath = `${configPath}.bak.${timestamp2}`;
-      fs5.copyFileSync(configPath, backupPath);
-      fs5.writeFileSync(configPath, JSON.stringify(rawConfig, null, 2) + `
+      try {
+        fs5.copyFileSync(configPath, backupPath);
+      } catch {}
+      fs5.writeFileSync(configPath, JSON.stringify(copy, null, 2) + `
 `, "utf-8");
       log(`Migrated config file: ${configPath} (backup: ${backupPath})`);
     } catch (err) {
       log(`Failed to write migrated config to ${configPath}:`, err);
+      return false;
+    }
+    for (const key of Object.keys(rawConfig)) {
+      delete rawConfig[key];
     }
+    Object.assign(rawConfig, copy);
   }
   return needsWrite;
 }
@@ -5470,7 +5478,8 @@ async function fetchAvailableModels(client, options) {
       log("[fetchAvailableModels] provider-models cache empty, falling back to models.json");
     } else {
       log("[fetchAvailableModels] using provider-models cache (whitelist-filtered)");
-      for (const [providerId, modelIds] of Object.entries(providerModelsCache.models)) {
+      const modelsByProvider = providerModelsCache.models;
+      for (const [providerId, modelIds] of Object.entries(modelsByProvider)) {
         if (!connectedSet.has(providerId)) {
           continue;
         }
@@ -5643,7 +5652,7 @@ function resolveModelPipeline(request) {
         return { model: match, provenance: "category-default", attempted };
       }
     } else {
-      const connectedProviders = readConnectedProvidersCache();
+      const connectedProviders = constraints.connectedProviders ?? readConnectedProvidersCache();
       if (connectedProviders === null) {
         log("Model resolved via category default (no cache, first run)", {
           model: normalizedCategoryDefault
@@ -5667,7 +5676,7 @@ function resolveModelPipeline(request) {
   }
   if (fallbackChain && fallbackChain.length > 0) {
     if (availableModels.size === 0) {
-      const connectedProviders = readConnectedProvidersCache();
+      const connectedProviders = constraints.connectedProviders ?? readConnectedProvidersCache();
       const connectedSet = connectedProviders ? new Set(connectedProviders) : null;
       if (connectedSet === null) {
         log("Model fallback chain skipped (no connected providers cache) - falling through to system default");
@@ -6172,6 +6181,127 @@ function injectServerAuthIntoClient(client) {
 // src/shared/port-utils.ts
 var init_port_utils = () => {};
 
+// src/shared/git-worktree/parse-status-porcelain.ts
+function parseGitStatusPorcelain(output) {
+  const map2 = new Map;
+  if (!output)
+    return map2;
+  for (const line of output.split(`
+`)) {
+    if (!line)
+      continue;
+    const status = line.substring(0, 2).trim();
+    const filePath = line.substring(3);
+    if (!filePath)
+      continue;
+    if (status === "A" || status === "??") {
+      map2.set(filePath, "added");
+    } else if (status === "D") {
+      map2.set(filePath, "deleted");
+    } else {
+      map2.set(filePath, "modified");
+    }
+  }
+  return map2;
+}
+
+// src/shared/git-worktree/parse-diff-numstat.ts
+function parseGitDiffNumstat(output, statusMap) {
+  if (!output)
+    return [];
+  const stats = [];
+  for (const line of output.split(`
+`)) {
+    const parts = line.split("\t");
+    if (parts.length < 3)
+      continue;
+    const [addedStr, removedStr, path5] = parts;
+    const added = addedStr === "-" ? 0 : parseInt(addedStr, 10);
+    const removed = removedStr === "-" ? 0 : parseInt(removedStr, 10);
+    stats.push({
+      path: path5,
+      added,
+      removed,
+      status: statusMap.get(path5) ?? "modified"
+    });
+  }
+  return stats;
+}
+
+// src/shared/git-worktree/collect-git-diff-stats.ts
+import { execFileSync } from "child_process";
+function collectGitDiffStats(directory) {
+  try {
+    const diffOutput = execFileSync("git", ["diff", "--numstat", "HEAD"], {
+      cwd: directory,
+      encoding: "utf-8",
+      timeout: 5000,
+      stdio: ["pipe", "pipe", "pipe"]
+    }).trim();
+    if (!diffOutput)
+      return [];
+    const statusOutput = execFileSync("git", ["status", "--porcelain"], {
+      cwd: directory,
+      encoding: "utf-8",
+      timeout: 5000,
+      stdio: ["pipe", "pipe", "pipe"]
+    }).trim();
+    const statusMap = parseGitStatusPorcelain(statusOutput);
+    return parseGitDiffNumstat(diffOutput, statusMap);
+  } catch {
+    return [];
+  }
+}
+var init_collect_git_diff_stats = () => {};
+
+// src/shared/git-worktree/format-file-changes.ts
+function formatFileChanges(stats, notepadPath) {
+  if (stats.length === 0)
+    return `[FILE CHANGES SUMMARY]
+No file changes detected.
+`;
+  const modified = stats.filter((s) => s.status === "modified");
+  const added = stats.filter((s) => s.status === "added");
+  const deleted = stats.filter((s) => s.status === "deleted");
+  const lines = ["[FILE CHANGES SUMMARY]"];
+  if (modified.length > 0) {
+    lines.push("Modified files:");
+    for (const f of modified) {
+      lines.push(`  ${f.path}  (+${f.added}, -${f.removed})`);
+    }
+    lines.push("");
+  }
+  if (added.length > 0) {
+    lines.push("Created files:");
+    for (const f of added) {
+      lines.push(`  ${f.path}  (+${f.added})`);
+    }
+    lines.push("");
+  }
+  if (deleted.length > 0) {
+    lines.push("Deleted files:");
+    for (const f of deleted) {
+      lines.push(`  ${f.path}  (-${f.removed})`);
+    }
+    lines.push("");
+  }
+  if (notepadPath) {
+    const notepadStat = stats.find((s) => s.path.includes("notepad") || s.path.includes(".sisyphus"));
+    if (notepadStat) {
+      lines.push("[NOTEPAD UPDATED]");
+      lines.push(`  ${notepadStat.path}  (+${notepadStat.added})`);
+      lines.push("");
+    }
+  }
+  return lines.join(`
+`);
+}
+
+// src/shared/git-worktree/index.ts
+var init_git_worktree = __esm(() => {
+  init_collect_git_diff_stats();
+});
+
 // src/shared/safe-create-hook.ts
 function safeCreateHook(name, factory, options) {
   const enabled = options?.enabled ?? true;
@@ -6234,6 +6364,7 @@ var init_shared = __esm(() => {
   init_tmux();
   init_model_suggestion_retry();
   init_port_utils();
+  init_git_worktree();
   init_safe_create_hook();
 });
 
@@ -11599,6 +11730,12 @@ function isPlanAgent(agentName) {
   const lowerName = agentName.toLowerCase().trim();
   return PLAN_AGENT_NAMES.some((name) => lowerName === name || lowerName.includes(name));
 }
+function isPlanFamily(agentName) {
+  if (!agentName)
+    return false;
+  const lowerName = agentName.toLowerCase().trim();
+  return PLAN_FAMILY_NAMES.some((name) => lowerName === name || lowerName.includes(name));
+}
 var VISUAL_CATEGORY_PROMPT_APPEND = `<Category_Context>
 You are working on VISUAL/UI tasks.
 
@@ -12016,7 +12153,7 @@ WHY THIS FORMAT IS MANDATORY:
 - QA criteria ensure verifiable completion
 </FINAL_OUTPUT_FOR_CALLER>
 
-`, PLAN_AGENT_NAMES;
+`, PLAN_AGENT_NAMES, PLAN_FAMILY_NAMES;
 var init_constants4 = __esm(() => {
   DEFAULT_CATEGORIES = {
     "visual-engineering": { model: "google/gemini-3-pro" },
@@ -12048,7 +12185,8 @@ var init_constants4 = __esm(() => {
     "unspecified-high": "Tasks that don't fit other categories, high effort required",
     writing: "Documentation, prose, technical writing"
   };
-  PLAN_AGENT_NAMES = ["plan", "prometheus", "planner"];
+  PLAN_AGENT_NAMES = ["plan"];
+  PLAN_FAMILY_NAMES = ["plan", "prometheus"];
 });
 
 // node_modules/ajv/dist/compile/codegen/code.js
@@ -12429,11 +12567,11 @@ var require_codegen = __commonJS((exports) => {
       const rhs = this.rhs === undefined ? "" : ` = ${this.rhs}`;
       return `${varKind} ${this.name}${rhs};` + _n;
     }
-    optimizeNames(names, constants17) {
+    optimizeNames(names, constants18) {
       if (!names[this.name.str])
         return;
       if (this.rhs)
-        this.rhs = optimizeExpr(this.rhs, names, constants17);
+        this.rhs = optimizeExpr(this.rhs, names, constants18);
       return this;
     }
     get names() {
@@ -12451,10 +12589,10 @@ var require_codegen = __commonJS((exports) => {
     render({ _n }) {
       return `${this.lhs} = ${this.rhs};` + _n;
     }
-    optimizeNames(names, constants17) {
+    optimizeNames(names, constants18) {
       if (this.lhs instanceof code_1.Name && !names[this.lhs.str] && !this.sideEffects)
         return;
-      this.rhs = optimizeExpr(this.rhs, names, constants17);
+      this.rhs = optimizeExpr(this.rhs, names, constants18);
       return this;
     }
     get names() {
@@ -12520,8 +12658,8 @@ var require_codegen = __commonJS((exports) => {
     optimizeNodes() {
       return `${this.code}` ? this : undefined;
     }
-    optimizeNames(names, constants17) {
-      this.code = optimizeExpr(this.code, names, constants17);
+    optimizeNames(names, constants18) {
+      this.code = optimizeExpr(this.code, names, constants18);
       return this;
     }
     get names() {
@@ -12551,12 +12689,12 @@ var require_codegen = __commonJS((exports) => {
       }
       return nodes.length > 0 ? this : undefined;
     }
-    optimizeNames(names, constants17) {
+    optimizeNames(names, constants18) {
       const { nodes } = this;
       let i2 = nodes.length;
       while (i2--) {
         const n = nodes[i2];
-        if (n.optimizeNames(names, constants17))
+        if (n.optimizeNames(names, constants18))
           continue;
         subtractNames(names, n.names);
         nodes.splice(i2, 1);
@@ -12613,12 +12751,12 @@ var require_codegen = __commonJS((exports) => {
         return;
       return this;
     }
-    optimizeNames(names, constants17) {
+    optimizeNames(names, constants18) {
       var _a;
-      this.else = (_a = this.else) === null || _a === undefined ? undefined : _a.optimizeNames(names, constants17);
-      if (!(super.optimizeNames(names, constants17) || this.else))
+      this.else = (_a = this.else) === null || _a === undefined ? undefined : _a.optimizeNames(names, constants18);
+      if (!(super.optimizeNames(names, constants18) || this.else))
         return;
-      this.condition = optimizeExpr(this.condition, names, constants17);
+      this.condition = optimizeExpr(this.condition, names, constants18);
       return this;
     }
     get names() {
@@ -12643,10 +12781,10 @@ var require_codegen = __commonJS((exports) => {
     render(opts) {
       return `for(${this.iteration})` + super.render(opts);
     }
-    optimizeNames(names, constants17) {
-      if (!super.optimizeNames(names, constants17))
+    optimizeNames(names, constants18) {
+      if (!super.optimizeNames(names, constants18))
         return;
-      this.iteration = optimizeExpr(this.iteration, names, constants17);
+      this.iteration = optimizeExpr(this.iteration, names, constants18);
       return this;
     }
     get names() {
@@ -12684,10 +12822,10 @@ var require_codegen = __commonJS((exports) => {
     render(opts) {
       return `for(${this.varKind} ${this.name} ${this.loop} ${this.iterable})` + super.render(opts);
     }
-    optimizeNames(names, constants17) {
-      if (!super.optimizeNames(names, constants17))
+    optimizeNames(names, constants18) {
+      if (!super.optimizeNames(names, constants18))
         return;
-      this.iterable = optimizeExpr(this.iterable, names, constants17);
+      this.iterable = optimizeExpr(this.iterable, names, constants18);
       return this;
     }
     get names() {
@@ -12732,11 +12870,11 @@ var require_codegen = __commonJS((exports) => {
       (_b = this.finally) === null || _b === undefined || _b.optimizeNodes();
       return this;
     }
-    optimizeNames(names, constants17) {
+    optimizeNames(names, constants18) {
       var _a, _b;
-      super.optimizeNames(names, constants17);
-      (_a = this.catch) === null || _a === undefined || _a.optimizeNames(names, constants17);
-      (_b = this.finally) === null || _b === undefined || _b.optimizeNames(names, constants17);
+      super.optimizeNames(names, constants18);
+      (_a = this.catch) === null || _a === undefined || _a.optimizeNames(names, constants18);
+      (_b = this.finally) === null || _b === undefined || _b.optimizeNames(names, constants18);
       return this;
     }
     get names() {
@@ -13010,7 +13148,7 @@ var require_codegen = __commonJS((exports) => {
   function addExprNames(names, from) {
     return from instanceof code_1._CodeOrName ? addNames(names, from.names) : names;
   }
-  function optimizeExpr(expr, names, constants17) {
+  function optimizeExpr(expr, names, constants18) {
     if (expr instanceof code_1.Name)
       return replaceName(expr);
     if (!canOptimize(expr))
@@ -13025,14 +13163,14 @@ var require_codegen = __commonJS((exports) => {
       return items;
     }, []));
     function replaceName(n) {
-      const c = constants17[n.str];
+      const c = constants18[n.str];
       if (c === undefined || names[n.str] !== 1)
         return n;
       delete names[n.str];
       return c;
     }
     function canOptimize(e) {
-      return e instanceof code_1._Code && e._items.some((c) => c instanceof code_1.Name && names[c.str] === 1 && constants17[c.str] !== undefined);
+      return e instanceof code_1._Code && e._items.some((c) => c instanceof code_1.Name && names[c.str] === 1 && constants18[c.str] !== undefined);
     }
   }
   function subtractNames(names, from) {
@@ -13479,37 +13617,37 @@ var require_dataType = __commonJS((exports) => {
     DataType2[DataType2["Wrong"] = 1] = "Wrong";
   })(DataType || (exports.DataType = DataType = {}));
   function getSchemaTypes(schema2) {
-    const types21 = getJSONTypes(schema2.type);
-    const hasNull = types21.includes("null");
+    const types22 = getJSONTypes(schema2.type);
+    const hasNull = types22.includes("null");
     if (hasNull) {
       if (schema2.nullable === false)
         throw new Error("type: null contradicts nullable: false");
     } else {
-      if (!types21.length && schema2.nullable !== undefined) {
+      if (!types22.length && schema2.nullable !== undefined) {
         throw new Error('"nullable" cannot be used without "type"');
       }
       if (schema2.nullable === true)
-        types21.push("null");
+        types22.push("null");
     }
-    return types21;
+    return types22;
   }
   exports.getSchemaTypes = getSchemaTypes;
   function getJSONTypes(ts) {
-    const types21 = Array.isArray(ts) ? ts : ts ? [ts] : [];
-    if (types21.every(rules_1.isJSONType))
-      return types21;
-    throw new Error("type must be JSONType or JSONType[]: " + types21.join(","));
+    const types22 = Array.isArray(ts) ? ts : ts ? [ts] : [];
+    if (types22.every(rules_1.isJSONType))
+      return types22;
+    throw new Error("type must be JSONType or JSONType[]: " + types22.join(","));
   }
   exports.getJSONTypes = getJSONTypes;
-  function coerceAndCheckDataType(it, types21) {
+  function coerceAndCheckDataType(it, types22) {
     const { gen, data, opts } = it;
-    const coerceTo = coerceToTypes(types21, opts.coerceTypes);
-    const checkTypes = types21.length > 0 && !(coerceTo.length === 0 && types21.length === 1 && (0, applicability_1.schemaHasRulesForType)(it, types21[0]));
+    const coerceTo = coerceToTypes(types22, opts.coerceTypes);
+    const checkTypes = types22.length > 0 && !(coerceTo.length === 0 && types22.length === 1 && (0, applicability_1.schemaHasRulesForType)(it, types22[0]));
     if (checkTypes) {
-      const wrongType = checkDataTypes(types21, data, opts.strictNumbers, DataType.Wrong);
+      const wrongType = checkDataTypes(types22, data, opts.strictNumbers, DataType.Wrong);
       gen.if(wrongType, () => {
         if (coerceTo.length)
-          coerceData(it, types21, coerceTo);
+          coerceData(it, types22, coerceTo);
         else
           reportTypeError(it);
       });
@@ -13518,15 +13656,15 @@ var require_dataType = __commonJS((exports) => {
   }
   exports.coerceAndCheckDataType = coerceAndCheckDataType;
   var COERCIBLE = new Set(["string", "number", "integer", "boolean", "null"]);
-  function coerceToTypes(types21, coerceTypes) {
-    return coerceTypes ? types21.filter((t) => COERCIBLE.has(t) || coerceTypes === "array" && t === "array") : [];
+  function coerceToTypes(types22, coerceTypes) {
+    return coerceTypes ? types22.filter((t) => COERCIBLE.has(t) || coerceTypes === "array" && t === "array") : [];
   }
-  function coerceData(it, types21, coerceTo) {
+  function coerceData(it, types22, coerceTo) {
     const { gen, data, opts } = it;
     const dataType = gen.let("dataType", (0, codegen_1._)`typeof ${data}`);
     const coerced = gen.let("coerced", (0, codegen_1._)`undefined`);
     if (opts.coerceTypes === "array") {
-      gen.if((0, codegen_1._)`${dataType} == 'object' && Array.isArray(${data}) && ${data}.length == 1`, () => gen.assign(data, (0, codegen_1._)`${data}[0]`).assign(dataType, (0, codegen_1._)`typeof ${data}`).if(checkDataTypes(types21, data, opts.strictNumbers), () => gen.assign(coerced, data)));
+      gen.if((0, codegen_1._)`${dataType} == 'object' && Array.isArray(${data}) && ${data}.length == 1`, () => gen.assign(data, (0, codegen_1._)`${data}[0]`).assign(dataType, (0, codegen_1._)`typeof ${data}`).if(checkDataTypes(types22, data, opts.strictNumbers), () => gen.assign(coerced, data)));
     }
     gen.if((0, codegen_1._)`${coerced} !== undefined`);
     for (const t of coerceTo) {
@@ -13602,19 +13740,19 @@ var require_dataType = __commonJS((exports) => {
       return checkDataType(dataTypes[0], data, strictNums, correct);
     }
     let cond;
-    const types21 = (0, util_1.toHash)(dataTypes);
-    if (types21.array && types21.object) {
+    const types22 = (0, util_1.toHash)(dataTypes);
+    if (types22.array && types22.object) {
       const notObj = (0, codegen_1._)`typeof ${data} != "object"`;
-      cond = types21.null ? notObj : (0, codegen_1._)`!${data} || ${notObj}`;
-      delete types21.null;
-      delete types21.array;
-      delete types21.object;
+      cond = types22.null ? notObj : (0, codegen_1._)`!${data} || ${notObj}`;
+      delete types22.null;
+      delete types22.array;
+      delete types22.object;
     } else {
       cond = codegen_1.nil;
     }
-    if (types21.number)
-      delete types21.integer;
-    for (const t in types21)
+    if (types22.number)
+      delete types22.integer;
+    for (const t in types22)
       cond = (0, codegen_1.and)(cond, checkDataType(t, data, strictNums, correct));
     return cond;
   }
@@ -14402,9 +14540,9 @@ var require_validate = __commonJS((exports) => {
   function typeAndKeywords(it, errsCount) {
     if (it.opts.jtd)
       return schemaKeywords(it, [], false, errsCount);
-    const types21 = (0, dataType_1.getSchemaTypes)(it.schema);
-    const checkedTypes = (0, dataType_1.coerceAndCheckDataType)(it, types21);
-    schemaKeywords(it, types21, !checkedTypes, errsCount);
+    const types22 = (0, dataType_1.getSchemaTypes)(it.schema);
+    const checkedTypes = (0, dataType_1.coerceAndCheckDataType)(it, types22);
+    schemaKeywords(it, types22, !checkedTypes, errsCount);
   }
   function checkRefsAndKeywords(it) {
     const { schema: schema2, errSchemaPath, opts, self } = it;
@@ -14454,7 +14592,7 @@ var require_validate = __commonJS((exports) => {
     if (items instanceof codegen_1.Name)
       gen.assign((0, codegen_1._)`${evaluated}.items`, items);
   }
-  function schemaKeywords(it, types21, typeErrors, errsCount) {
+  function schemaKeywords(it, types22, typeErrors, errsCount) {
     const { gen, schema: schema2, data, allErrors, opts, self } = it;
     const { RULES } = self;
     if (schema2.$ref && (opts.ignoreKeywordsWithRef || !(0, util_1.schemaHasRulesButRef)(schema2, RULES))) {
@@ -14462,7 +14600,7 @@ var require_validate = __commonJS((exports) => {
       return;
     }
     if (!opts.jtd)
-      checkStrictTypes(it, types21);
+      checkStrictTypes(it, types22);
     gen.block(() => {
       for (const group of RULES.rules)
         groupKeywords(group);
@@ -14474,7 +14612,7 @@ var require_validate = __commonJS((exports) => {
       if (group.type) {
         gen.if((0, dataType_2.checkDataType)(group.type, data, opts.strictNumbers));
         iterateKeywords(it, group);
-        if (types21.length === 1 && types21[0] === group.type && typeErrors) {
+        if (types22.length === 1 && types22[0] === group.type && typeErrors) {
           gen.else();
           (0, dataType_2.reportTypeError)(it);
         }
@@ -14498,27 +14636,27 @@ var require_validate = __commonJS((exports) => {
       }
     });
   }
-  function checkStrictTypes(it, types21) {
+  function checkStrictTypes(it, types22) {
     if (it.schemaEnv.meta || !it.opts.strictTypes)
       return;
-    checkContextTypes(it, types21);
+    checkContextTypes(it, types22);
     if (!it.opts.allowUnionTypes)
-      checkMultipleTypes(it, types21);
+      checkMultipleTypes(it, types22);
     checkKeywordTypes(it, it.dataTypes);
   }
-  function checkContextTypes(it, types21) {
-    if (!types21.length)
+  function checkContextTypes(it, types22) {
+    if (!types22.length)
       return;
     if (!it.dataTypes.length) {
-      it.dataTypes = types21;
+      it.dataTypes = types22;
       return;
     }
-    types21.forEach((t) => {
+    types22.forEach((t) => {
       if (!includesType(it.dataTypes, t)) {
         strictTypesError(it, `type "${t}" not allowed by context "${it.dataTypes.join(",")}"`);
       }
     });
-    narrowSchemaTypes(it, types21);
+    narrowSchemaTypes(it, types22);
   }
   function checkMultipleTypes(it, ts) {
     if (ts.length > 1 && !(ts.length === 2 && ts.includes("null"))) {
@@ -20108,6 +20246,9 @@ function extractMessageIndex(error) {
 }
 function detectErrorType(error) {
   const message = getErrorMessage(error);
+  if (message.includes("assistant message prefill") || message.includes("conversation must end with a user message")) {
+    return "assistant_prefill_unsupported";
+  }
   if (message.includes("thinking") && (message.includes("first block") || message.includes("must start with") || message.includes("preceeding") || message.includes("final block") || message.includes("cannot be thinking") || message.includes("expected") && message.includes("found"))) {
     return "thinking_block_order";
   }
@@ -20229,12 +20370,14 @@ function createSessionRecoveryHook(ctx, options) {
       const toastTitles = {
         tool_result_missing: "Tool Crash Recovery",
         thinking_block_order: "Thinking Block Recovery",
-        thinking_disabled_violation: "Thinking Strip Recovery"
+        thinking_disabled_violation: "Thinking Strip Recovery",
+        assistant_prefill_unsupported: "Prefill Error Recovery"
       };
       const toastMessages = {
         tool_result_missing: "Injecting cancelled tool results...",
         thinking_block_order: "Fixing message structure...",
-        thinking_disabled_violation: "Stripping thinking blocks..."
+        thinking_disabled_violation: "Stripping thinking blocks...",
+        assistant_prefill_unsupported: "Sending 'Continue' to recover..."
       };
       await ctx.client.tui.showToast({
         body: {
@@ -20261,6 +20404,8 @@ function createSessionRecoveryHook(ctx, options) {
           const resumeConfig = extractResumeConfig(lastUser, sessionID);
           await resumeSession(ctx.client, resumeConfig);
         }
+      } else if (errorType === "assistant_prefill_unsupported") {
+        success = true;
       }
       return success;
     } catch (err) {
@@ -24082,9 +24227,9 @@ You ARE the planner. Your job: create bulletproof work plans.
 ### Research Protocol
 1. **Fire parallel background agents** for comprehensive context:
    \`\`\`
-   task(agent="explore", prompt="Find existing patterns for [topic] in codebase", background=true)
-   task(agent="explore", prompt="Find test infrastructure and conventions", background=true)
-   task(agent="librarian", prompt="Find official docs and best practices for [technology]", background=true)
+   task(subagent_type="explore", load_skills=[], prompt="Find existing patterns for [topic] in codebase", run_in_background=true)
+   task(subagent_type="explore", load_skills=[], prompt="Find test infrastructure and conventions", run_in_background=true)
+   task(subagent_type="librarian", load_skills=[], prompt="Find official docs and best practices for [technology]", run_in_background=true)
    \`\`\`
 2. **Wait for results** before planning - rushed plans fail
 3. **Synthesize findings** into informed requirements
@@ -24245,10 +24390,10 @@ Use these when they provide clear value based on the decision framework above:
 
 | Resource | When to Use | How to Use |
 |----------|-------------|------------|
-| explore agent | Need codebase patterns you don't have | \`task(subagent_type="explore", run_in_background=true, ...)\` |
-| librarian agent | External library docs, OSS examples | \`task(subagent_type="librarian", run_in_background=true, ...)\` |
-| oracle agent | Stuck on architecture/debugging after 2+ attempts | \`task(subagent_type="oracle", ...)\` |
-| plan agent | Complex multi-step with dependencies (5+ steps) | \`task(subagent_type="plan", ...)\` |
+| explore agent | Need codebase patterns you don't have | \`task(subagent_type="explore", load_skills=[], run_in_background=true, ...)\` |
+| librarian agent | External library docs, OSS examples | \`task(subagent_type="librarian", load_skills=[], run_in_background=true, ...)\` |
+| oracle agent | Stuck on architecture/debugging after 2+ attempts | \`task(subagent_type="oracle", load_skills=[], ...)\` |
+| plan agent | Complex multi-step with dependencies (5+ steps) | \`task(subagent_type="plan", load_skills=[], ...)\` |
 | task category | Specialized work matching a category | \`task(category="...", load_skills=[...])\` |
 
 <tool_usage_rules>
@@ -24418,7 +24563,7 @@ TELL THE USER WHAT AGENTS YOU WILL LEVERAGE NOW TO SATISFY USER'S REQUEST.
 | Architecture decision needed | MUST call plan agent |
 
 \`\`\`
-task(subagent_type="plan", prompt="<gathered context + user request>")
+task(subagent_type="plan", load_skills=[], prompt="<gathered context + user request>")
 \`\`\`
 
 **WHY PLAN AGENT IS MANDATORY:**
@@ -24433,9 +24578,9 @@ task(subagent_type="plan", prompt="<gathered context + user request>")
 
 | Scenario | Action |
 |----------|--------|
-| Plan agent asks clarifying questions | \`task(session_id="{returned_session_id}", prompt="<your answer>")\` |
-| Need to refine the plan | \`task(session_id="{returned_session_id}", prompt="Please adjust: <feedback>")\` |
-| Plan needs more detail | \`task(session_id="{returned_session_id}", prompt="Add more detail to Task N")\` |
+| Plan agent asks clarifying questions | \`task(session_id="{returned_session_id}", load_skills=[], prompt="<your answer>")\` |
+| Need to refine the plan | \`task(session_id="{returned_session_id}", load_skills=[], prompt="Please adjust: <feedback>")\` |
+| Plan needs more detail | \`task(session_id="{returned_session_id}", load_skills=[], prompt="Add more detail to Task N")\` |
 
 **WHY SESSION_ID IS CRITICAL:**
 - Plan agent retains FULL conversation context
@@ -24445,10 +24590,10 @@ task(subagent_type="plan", prompt="<gathered context + user request>")
 
 \`\`\`
 // WRONG: Starting fresh loses all context
-task(subagent_type="plan", prompt="Here's more info...")
+task(subagent_type="plan", load_skills=[], prompt="Here's more info...")
 
 // CORRECT: Resume preserves everything
-task(session_id="ses_abc123", prompt="Here's my answer to your question: ...")
+task(session_id="ses_abc123", load_skills=[], prompt="Here's my answer to your question: ...")
 \`\`\`
 
 **FAILURE TO CALL PLAN AGENT = INCOMPLETE WORK.**
@@ -24461,10 +24606,10 @@ task(session_id="ses_abc123", prompt="Here's my answer to your question: ...")
 
 | Task Type | Action | Why |
 |-----------|--------|-----|
-| Codebase exploration | task(subagent_type="explore", run_in_background=true) | Parallel, context-efficient |
-| Documentation lookup | task(subagent_type="librarian", run_in_background=true) | Specialized knowledge |
-| Planning | task(subagent_type="plan") | Parallel task graph + structured TODO list |
-| Hard problem (conventional) | task(subagent_type="oracle") | Architecture, debugging, complex logic |
+| Codebase exploration | task(subagent_type="explore", load_skills=[], run_in_background=true) | Parallel, context-efficient |
+| Documentation lookup | task(subagent_type="librarian", load_skills=[], run_in_background=true) | Specialized knowledge |
+| Planning | task(subagent_type="plan", load_skills=[]) | Parallel task graph + structured TODO list |
+| Hard problem (conventional) | task(subagent_type="oracle", load_skills=[]) | Architecture, debugging, complex logic |
 | Hard problem (non-conventional) | task(category="artistry", load_skills=[...]) | Different approach needed |
 | Implementation | task(category="...", load_skills=[...]) | Domain-optimized models |
 
@@ -24898,7 +25043,7 @@ function clearInteractiveBashSessionState(sessionID) {
   }
 }
 
-// src/hooks/interactive-bash-session/index.ts
+// src/hooks/interactive-bash-session/parser.ts
 function tokenizeCommand(cmd) {
   const tokens = [];
   let current = "";
@@ -24980,33 +25125,44 @@ function findSubcommand(tokens) {
   }
   return "";
 }
+
+// src/hooks/interactive-bash-session/state-manager.ts
+function getOrCreateState(sessionID, sessionStates) {
+  if (!sessionStates.has(sessionID)) {
+    const persisted = loadInteractiveBashSessionState(sessionID);
+    const state2 = persisted ?? {
+      sessionID,
+      tmuxSessions: new Set,
+      updatedAt: Date.now()
+    };
+    sessionStates.set(sessionID, state2);
+  }
+  return sessionStates.get(sessionID);
+}
+function isOmoSession(sessionName) {
+  return sessionName !== null && sessionName.startsWith(OMO_SESSION_PREFIX);
+}
+async function killAllTrackedSessions(state2) {
+  for (const sessionName of state2.tmuxSessions) {
+    try {
+      const proc = Bun.spawn(["tmux", "kill-session", "-t", sessionName], {
+        stdout: "ignore",
+        stderr: "ignore"
+      });
+      await proc.exited;
+    } catch {}
+  }
+  for (const sessionId of subagentSessions) {}
+}
+
+// src/hooks/interactive-bash-session/hook.ts
 function createInteractiveBashSessionHook(ctx) {
   const sessionStates = new Map;
-  function getOrCreateState(sessionID) {
-    if (!sessionStates.has(sessionID)) {
-      const persisted = loadInteractiveBashSessionState(sessionID);
-      const state2 = persisted ?? {
-        sessionID,
-        tmuxSessions: new Set,
-        updatedAt: Date.now()
-      };
-      sessionStates.set(sessionID, state2);
-    }
-    return sessionStates.get(sessionID);
-  }
-  function isOmoSession(sessionName) {
-    return sessionName !== null && sessionName.startsWith(OMO_SESSION_PREFIX);
+  function getOrCreateStateLocal(sessionID) {
+    return getOrCreateState(sessionID, sessionStates);
   }
-  async function killAllTrackedSessions(state2) {
-    for (const sessionName of state2.tmuxSessions) {
-      try {
-        const proc = Bun.spawn(["tmux", "kill-session", "-t", sessionName], {
-          stdout: "ignore",
-          stderr: "ignore"
-        });
-        await proc.exited;
-      } catch {}
-    }
+  async function killAllTrackedSessionsLocal(state2) {
+    await killAllTrackedSessions(state2);
     for (const sessionId of subagentSessions) {
       ctx.client.session.abort({ path: { id: sessionId } }).catch(() => {});
     }
@@ -25023,7 +25179,7 @@ function createInteractiveBashSessionHook(ctx) {
     const tmuxCommand = args.tmux_command;
     const tokens = tokenizeCommand(tmuxCommand);
     const subCommand = findSubcommand(tokens);
-    const state2 = getOrCreateState(sessionID);
+    const state2 = getOrCreateStateLocal(sessionID);
     let stateChanged = false;
     const toolOutput = output?.output ?? "";
     if (toolOutput.startsWith("Error:")) {
@@ -25061,8 +25217,8 @@ function createInteractiveBashSessionHook(ctx) {
       const sessionInfo = props?.info;
       const sessionID = sessionInfo?.id;
       if (sessionID) {
-        const state2 = getOrCreateState(sessionID);
-        await killAllTrackedSessions(state2);
+        const state2 = getOrCreateStateLocal(sessionID);
+        await killAllTrackedSessionsLocal(state2);
         sessionStates.delete(sessionID);
         clearInteractiveBashSessionState(sessionID);
       }
@@ -25210,7 +25366,7 @@ function buildReminderMessage(availableSkills) {
 function createCategorySkillReminderHook(_ctx, availableSkills = []) {
   const sessionStates = new Map;
   const reminderMessage = buildReminderMessage(availableSkills);
-  function getOrCreateState(sessionID) {
+  function getOrCreateState2(sessionID) {
     if (!sessionStates.has(sessionID)) {
       sessionStates.set(sessionID, {
         delegationUsed: false,
@@ -25233,7 +25389,7 @@ function createCategorySkillReminderHook(_ctx, availableSkills = []) {
     if (!isTargetAgent(sessionID, input.agent)) {
       return;
     }
-    const state2 = getOrCreateState(sessionID);
+    const state2 = getOrCreateState2(sessionID);
     if (DELEGATION_TOOLS.has(toolLower)) {
       state2.delegationUsed = true;
       log("[category-skill-reminder] Delegation tool used", { sessionID, tool });
@@ -25404,7 +25560,7 @@ IMPORTANT:
 
 Original task:
 {{PROMPT}}`;
-var DEFAULT_API_TIMEOUT = 3000;
+var DEFAULT_API_TIMEOUT = 5000;
 function createRalphLoopHook(ctx, options) {
   const sessions = new Map;
   const config = options?.config;
@@ -25412,6 +25568,21 @@ function createRalphLoopHook(ctx, options) {
   const getTranscriptPath2 = options?.getTranscriptPath ?? getTranscriptPath;
   const apiTimeout = options?.apiTimeout ?? DEFAULT_API_TIMEOUT;
   const checkSessionExists = options?.checkSessionExists;
+  async function withTimeout(promise, timeoutMs) {
+    let timeoutId;
+    const timeoutPromise = new Promise((_, reject) => {
+      timeoutId = setTimeout(() => {
+        reject(new Error("API timeout"));
+      }, timeoutMs);
+    });
+    try {
+      return await Promise.race([promise, timeoutPromise]);
+    } finally {
+      if (timeoutId !== undefined) {
+        clearTimeout(timeoutId);
+      }
+    }
+  }
   function getSessionState(sessionID) {
     let state2 = sessions.get(sessionID);
     if (!state2) {
@@ -25451,26 +25622,35 @@ function createRalphLoopHook(ctx, options) {
   }
   async function detectCompletionInSessionMessages(sessionID, promise) {
     try {
-      const response = await Promise.race([
-        ctx.client.session.messages({
-          path: { id: sessionID },
-          query: { directory: ctx.directory }
-        }),
-        new Promise((_, reject) => setTimeout(() => reject(new Error("API timeout")), apiTimeout))
-      ]);
+      const response = await withTimeout(ctx.client.session.messages({
+        path: { id: sessionID },
+        query: { directory: ctx.directory }
+      }), apiTimeout);
       const messages = response.data ?? [];
       if (!Array.isArray(messages))
         return false;
       const assistantMessages = messages.filter((msg) => msg.info?.role === "assistant");
-      const lastAssistant = assistantMessages[assistantMessages.length - 1];
-      if (!lastAssistant?.parts)
+      if (assistantMessages.length === 0)
         return false;
       const pattern = new RegExp(`<promise>\\s*${escapeRegex(promise)}\\s*</promise>`, "is");
-      const responseText = lastAssistant.parts.filter((p) => p.type === "text").map((p) => p.text ?? "").join(`
+      const recentAssistants = assistantMessages.slice(-3);
+      for (const assistant of recentAssistants) {
+        if (!assistant.parts)
+          continue;
+        const responseText = assistant.parts.filter((p) => p.type === "text" || p.type === "reasoning").map((p) => p.text ?? "").join(`
 `);
-      return pattern.test(responseText);
+        if (pattern.test(responseText)) {
+          return true;
+        }
+      }
+      return false;
     } catch (err) {
-      log(`[${HOOK_NAME3}] Session messages check failed`, { sessionID, error: String(err) });
+      setTimeout(() => {
+        log(`[${HOOK_NAME3}] Session messages check failed`, {
+          sessionID,
+          error: String(err)
+        });
+      }, 0);
       return false;
     }
   }
@@ -25611,7 +25791,7 @@ function createRalphLoopHook(ctx, options) {
         let agent;
         let model;
         try {
-          const messagesResp = await ctx.client.session.messages({ path: { id: sessionID } });
+          const messagesResp = await withTimeout(ctx.client.session.messages({ path: { id: sessionID } }), apiTimeout);
           const messages = messagesResp.data ?? [];
           for (let i2 = messages.length - 1;i2 >= 0; i2--) {
             const info = messages[i2].info;
@@ -26817,6 +26997,185 @@ Reading plan and beginning execution...
 - Read the FULL plan file before delegating any tasks
 - Follow atlas delegation protocols (7-section format)`;
 
+// src/features/builtin-commands/templates/handoff.ts
+var HANDOFF_TEMPLATE = `# Handoff Command
+
+## Purpose
+
+Use /handoff when:
+- The current session context is getting too long and quality is degrading
+- You want to start fresh while preserving essential context from this session
+- The context window is approaching capacity
+
+This creates a detailed context summary that can be used to continue work in a new session.
+
+---
+
+# PHASE 0: VALIDATE REQUEST
+
+Before proceeding, confirm:
+- [ ] There is meaningful work or context in this session to preserve
+- [ ] The user wants to create a handoff summary (not just asking about it)
+
+If the session is nearly empty or has no meaningful context, inform the user there is nothing substantial to hand off.
+
+---
+
+# PHASE 1: GATHER PROGRAMMATIC CONTEXT
+
+Execute these tools to gather concrete data:
+
+1. session_read({ session_id: "$SESSION_ID" }) \u2014 full session history
+2. todoread() \u2014 current task progress
+3. Bash({ command: "git diff --stat HEAD~10..HEAD" }) \u2014 recent file changes
+4. Bash({ command: "git status --porcelain" }) \u2014 uncommitted changes
+
+Suggested execution order:
+
+\`\`\`
+session_read({ session_id: "$SESSION_ID" })
+todoread()
+Bash({ command: "git diff --stat HEAD~10..HEAD" })
+Bash({ command: "git status --porcelain" })
+\`\`\`
+
+Analyze the gathered outputs to understand:
+- What the user asked for (exact wording)
+- What work was completed
+- What tasks remain incomplete (include todo state)
+- What decisions were made
+- What files were modified or discussed (include git diff/stat + status)
+- What patterns, constraints, or preferences were established
+
+---
+
+# PHASE 2: EXTRACT CONTEXT
+
+Write the context summary from first person perspective ("I did...", "I told you...").
+
+Focus on:
+- Capabilities and behavior, not file-by-file implementation details
+- What matters for continuing the work
+- Avoiding excessive implementation details (variable names, storage keys, constants) unless critical
+- USER REQUESTS (AS-IS) must be verbatim (do not paraphrase)
+- EXPLICIT CONSTRAINTS must be verbatim only (do not invent)
+
+Questions to consider when extracting:
+- What did I just do or implement?
+- What instructions did I already give which are still relevant (e.g. follow patterns in the codebase)?
+- What files did I tell you are important or that I am working on?
+- Did I provide a plan or spec that should be included?
+- What did I already tell you that is important (libraries, patterns, constraints, preferences)?
+- What important technical details did I discover (APIs, methods, patterns)?
+- What caveats, limitations, or open questions did I find?
+
+---
+
+# PHASE 3: FORMAT OUTPUT
+
+Generate a handoff summary using this exact format:
+
+\`\`\`
+HANDOFF CONTEXT
+===============
+
+USER REQUESTS (AS-IS)
+---------------------
+- [Exact verbatim user requests - NOT paraphrased]
+
+GOAL
+----
+[One sentence describing what should be done next]
+
+WORK COMPLETED
+--------------
+- [First person bullet points of what was done]
+- [Include specific file paths when relevant]
+- [Note key implementation decisions]
+
+CURRENT STATE
+-------------
+- [Current state of the codebase or task]
+- [Build/test status if applicable]
+- [Any environment or configuration state]
+
+PENDING TASKS
+-------------
+- [Tasks that were planned but not completed]
+- [Next logical steps to take]
+- [Any blockers or issues encountered]
+- [Include current todo state from todoread()]
+
+KEY FILES
+---------
+- [path/to/file1] - [brief role description]
+- [path/to/file2] - [brief role description]
+(Maximum 10 files, prioritized by importance)
+- (Include files from git diff/stat and git status)
+
+IMPORTANT DECISIONS
+-------------------
+- [Technical decisions that were made and why]
+- [Trade-offs that were considered]
+- [Patterns or conventions established]
+
+EXPLICIT CONSTRAINTS
+--------------------
+- [Verbatim constraints only - from user or existing AGENTS.md]
+- If none, write: None
+
+CONTEXT FOR CONTINUATION
+------------------------
+- [What the next session needs to know to continue]
+- [Warnings or gotchas to be aware of]
+- [References to documentation if relevant]
+\`\`\`
+
+Rules for the summary:
+- Plain text with bullets
+- No markdown headers with # (use the format above with dashes)
+- No bold, italic, or code fences within content
+- Use workspace-relative paths for files
+- Keep it focused - only include what matters for continuation
+- Pick an appropriate length based on complexity
+- USER REQUESTS (AS-IS) and EXPLICIT CONSTRAINTS must be verbatim only
+
+---
+
+# PHASE 4: PROVIDE INSTRUCTIONS
+
+After generating the summary, instruct the user:
+
+\`\`\`
+---
+
+TO CONTINUE IN A NEW SESSION:
+
+1. Press 'n' in OpenCode TUI to open a new session, or run 'opencode' in a new terminal
+2. Paste the HANDOFF CONTEXT above as your first message
+3. Add your request: "Continue from the handoff context above. [Your next task]"
+
+The new session will have all context needed to continue seamlessly.
+\`\`\`
+
+---
+
+# IMPORTANT CONSTRAINTS
+
+- DO NOT attempt to programmatically create new sessions (no API available to agents)
+- DO provide a self-contained summary that works without access to this session
+- DO include workspace-relative file paths
+- DO NOT include sensitive information (API keys, credentials, secrets)
+- DO NOT exceed 10 files in the KEY FILES section
+- DO keep the GOAL section to a single sentence or short paragraph
+
+---
+
+# EXECUTE NOW
+
+Begin by gathering programmatic context, then synthesize the handoff summary.
+`;
+
 // src/features/builtin-commands/commands.ts
 var BUILTIN_COMMAND_DEFINITIONS = {
   "init-deep": {
@@ -26887,6 +27246,22 @@ $ARGUMENTS
     template: `<command-instruction>
 ${STOP_CONTINUATION_TEMPLATE}
 </command-instruction>`
+  },
+  handoff: {
+    description: "(builtin) Create a detailed context summary for continuing work in a new session",
+    template: `<command-instruction>
+${HANDOFF_TEMPLATE}
+</command-instruction>
+
+<session-context>
+Session ID: $SESSION_ID
+Timestamp: $TIMESTAMP
+</session-context>
+
+<user-request>
+$ARGUMENTS
+</user-request>`,
+    argumentHint: "[goal]"
   }
 };
 function loadBuiltinCommands(disabledCommands) {
@@ -30128,11 +30503,11 @@ ${contextInfo}`;
   };
 }
 // src/hooks/atlas/index.ts
-import { execSync as execSync2 } from "child_process";
 init_hook_message_injector();
 init_logger();
 init_system_directive();
 init_session_utils();
+init_git_worktree();
 var HOOK_NAME7 = "atlas";
 function isSisyphusPath(filePath) {
   return /\.sisyphus[/\\]/.test(filePath);
@@ -30372,99 +30747,6 @@ function extractSessionIdFromOutput(output) {
   const match = output.match(/Session ID:\s*(ses_[a-zA-Z0-9]+)/);
   return match?.[1] ?? "<session_id>";
 }
-function getGitDiffStats(directory) {
-  try {
-    const output = execSync2("git diff --numstat HEAD", {
-      cwd: directory,
-      encoding: "utf-8",
-      timeout: 5000,
-      stdio: ["pipe", "pipe", "pipe"]
-    }).trim();
-    if (!output)
-      return [];
-    const statusOutput = execSync2("git status --porcelain", {
-      cwd: directory,
-      encoding: "utf-8",
-      timeout: 5000,
-      stdio: ["pipe", "pipe", "pipe"]
-    }).trim();
-    const statusMap = new Map;
-    for (const line of statusOutput.split(`
-`)) {
-      if (!line)
-        continue;
-      const status = line.substring(0, 2).trim();
-      const filePath = line.substring(3);
-      if (status === "A" || status === "??") {
-        statusMap.set(filePath, "added");
-      } else if (status === "D") {
-        statusMap.set(filePath, "deleted");
-      } else {
-        statusMap.set(filePath, "modified");
-      }
-    }
-    const stats = [];
-    for (const line of output.split(`
-`)) {
-      const parts = line.split("\t");
-      if (parts.length < 3)
-        continue;
-      const [addedStr, removedStr, path8] = parts;
-      const added = addedStr === "-" ? 0 : parseInt(addedStr, 10);
-      const removed = removedStr === "-" ? 0 : parseInt(removedStr, 10);
-      stats.push({
-        path: path8,
-        added,
-        removed,
-        status: statusMap.get(path8) ?? "modified"
-      });
-    }
-    return stats;
-  } catch {
-    return [];
-  }
-}
-function formatFileChanges(stats, notepadPath) {
-  if (stats.length === 0)
-    return `[FILE CHANGES SUMMARY]
-No file changes detected.
-`;
-  const modified = stats.filter((s) => s.status === "modified");
-  const added = stats.filter((s) => s.status === "added");
-  const deleted = stats.filter((s) => s.status === "deleted");
-  const lines = ["[FILE CHANGES SUMMARY]"];
-  if (modified.length > 0) {
-    lines.push("Modified files:");
-    for (const f of modified) {
-      lines.push(`  ${f.path}  (+${f.added}, -${f.removed})`);
-    }
-    lines.push("");
-  }
-  if (added.length > 0) {
-    lines.push("Created files:");
-    for (const f of added) {
-      lines.push(`  ${f.path}  (+${f.added})`);
-    }
-    lines.push("");
-  }
-  if (deleted.length > 0) {
-    lines.push("Deleted files:");
-    for (const f of deleted) {
-      lines.push(`  ${f.path}  (-${f.removed})`);
-    }
-    lines.push("");
-  }
-  if (notepadPath) {
-    const notepadStat = stats.find((s) => s.path.includes("notepad") || s.path.includes(".sisyphus"));
-    if (notepadStat) {
-      lines.push("[NOTEPAD UPDATED]");
-      lines.push(`  ${notepadStat.path}  (+${notepadStat.added})`);
-      lines.push("");
-    }
-  }
-  return lines.join(`
-`);
-}
 var CONTINUATION_COOLDOWN_MS = 5000;
 function isAbortError(error) {
   if (!error)
@@ -30744,7 +31026,7 @@ function createAtlasHook(ctx, options) {
         return;
       }
       if (output.output && typeof output.output === "string") {
-        const gitStats = getGitDiffStats(ctx.directory);
+        const gitStats = collectGitDiffStats(ctx.directory);
         const fileChanges = formatFileChanges(gitStats);
         const subagentSessionId = extractSessionIdFromOutput(output.output);
         const boulderState = readBoulderState(ctx.directory);
@@ -32577,6 +32859,7 @@ class LSPServerManager {
   clients = new Map;
   cleanupInterval = null;
   IDLE_TIMEOUT = 5 * 60 * 1000;
+  INIT_TIMEOUT = 60 * 1000;
   constructor() {
     this.startCleanupTimer();
     this.registerProcessCleanup();
@@ -32641,35 +32924,68 @@ class LSPServerManager {
   async getClient(root, server) {
     const key = this.getKey(root, server.id);
     let managed = this.clients.get(key);
+    if (managed) {
+      const now = Date.now();
+      if (managed.isInitializing && managed.initializingSince !== undefined && now - managed.initializingSince >= this.INIT_TIMEOUT) {
+        try {
+          await managed.client.stop();
+        } catch {}
+        this.clients.delete(key);
+        managed = undefined;
+      }
+    }
     if (managed) {
       if (managed.initPromise) {
-        await managed.initPromise;
+        try {
+          await managed.initPromise;
+        } catch {
+          try {
+            await managed.client.stop();
+          } catch {}
+          this.clients.delete(key);
+          managed = undefined;
+        }
       }
-      if (managed.client.isAlive()) {
-        managed.refCount++;
-        managed.lastUsedAt = Date.now();
-        return managed.client;
+      if (managed) {
+        if (managed.client.isAlive()) {
+          managed.refCount++;
+          managed.lastUsedAt = Date.now();
+          return managed.client;
+        }
+        try {
+          await managed.client.stop();
+        } catch {}
+        this.clients.delete(key);
       }
-      await managed.client.stop();
-      this.clients.delete(key);
     }
     const client = new LSPClient(root, server);
     const initPromise3 = (async () => {
       await client.start();
       await client.initialize();
     })();
+    const initStartedAt = Date.now();
     this.clients.set(key, {
       client,
-      lastUsedAt: Date.now(),
+      lastUsedAt: initStartedAt,
       refCount: 1,
       initPromise: initPromise3,
-      isInitializing: true
+      isInitializing: true,
+      initializingSince: initStartedAt
     });
-    await initPromise3;
+    try {
+      await initPromise3;
+    } catch (error) {
+      this.clients.delete(key);
+      try {
+        await client.stop();
+      } catch {}
+      throw error;
+    }
     const m = this.clients.get(key);
     if (m) {
       m.initPromise = undefined;
       m.isInitializing = false;
+      m.initializingSince = undefined;
     }
     return client;
   }
@@ -32682,19 +32998,25 @@ class LSPServerManager {
       await client.start();
       await client.initialize();
     })();
+    const initStartedAt = Date.now();
     this.clients.set(key, {
       client,
-      lastUsedAt: Date.now(),
+      lastUsedAt: initStartedAt,
       refCount: 0,
       initPromise: initPromise3,
-      isInitializing: true
+      isInitializing: true,
+      initializingSince: initStartedAt
     });
     initPromise3.then(() => {
       const m = this.clients.get(key);
       if (m) {
         m.initPromise = undefined;
         m.isInitializing = false;
+        m.initializingSince = undefined;
       }
+    }).catch(() => {
+      this.clients.delete(key);
+      client.stop().catch(() => {});
     });
   }
   releaseClient(root, serverId) {
@@ -43454,10 +43776,10 @@ function _property(property, schema2, params) {
     ...normalizeParams(params)
   });
 }
-function _mime(types13, params) {
+function _mime(types14, params) {
   return new $ZodCheckMimeType({
     check: "mime_type",
-    mime: types13,
+    mime: types14,
     ...normalizeParams(params)
   });
 }
@@ -45367,7 +45689,7 @@ var ZodFile = /* @__PURE__ */ $constructor("ZodFile", (inst, def) => {
   ZodType.init(inst, def);
   inst.min = (size, params) => inst.check(_minSize(size, params));
   inst.max = (size, params) => inst.check(_maxSize(size, params));
-  inst.mime = (types13, params) => inst.check(_mime(Array.isArray(types13) ? types13 : [types13], params));
+  inst.mime = (types14, params) => inst.check(_mime(Array.isArray(types14) ? types14 : [types14], params));
 });
 function file(params) {
   return _file(ZodFile, params);
@@ -48280,10 +48602,9 @@ function createSkillMcpTool(options) {
 var BACKGROUND_OUTPUT_DESCRIPTION = `Get output from background task. Use full_session=true to fetch session messages with filters. System notifies on completion, so block=true rarely needed.`;
 var BACKGROUND_CANCEL_DESCRIPTION = `Cancel running background task(s). Use all=true to cancel ALL before final answer.`;
 
-// src/tools/background-task/tools.ts
+// src/tools/background-task/modules/background-task.ts
 init_hook_message_injector();
 init_logger();
-init_session_cursor();
 
 // src/features/tool-metadata-store/index.ts
 var pendingStore = new Map;
@@ -48314,9 +48635,8 @@ function consumeToolMetadata(sessionID, callID) {
   return;
 }
 
-// src/tools/background-task/tools.ts
-var MAX_MESSAGE_LIMIT = 100;
-var THINKING_MAX_CHARS = 2000;
+// src/tools/background-task/modules/utils.ts
+init_hook_message_injector();
 function formatDuration(start, end) {
   const duration3 = (end ?? new Date).getTime() - start.getTime();
   const seconds = Math.floor(duration3 / 1000);
@@ -48330,14 +48650,70 @@ function formatDuration(start, end) {
     return `${seconds}s`;
   }
 }
-function delay(ms) {
-  return new Promise((resolve11) => setTimeout(resolve11, ms));
-}
 function truncateText(text, maxLength) {
   if (text.length <= maxLength)
     return text;
   return text.slice(0, maxLength) + "...";
 }
+function delay(ms) {
+  return new Promise((resolve11) => setTimeout(resolve11, ms));
+}
+function formatMessageTime(value) {
+  if (typeof value === "string") {
+    const date5 = new Date(value);
+    return Number.isNaN(date5.getTime()) ? value : date5.toISOString();
+  }
+  if (typeof value === "object" && value !== null) {
+    if ("created" in value) {
+      const created = value.created;
+      if (typeof created === "number") {
+        return new Date(created).toISOString();
+      }
+    }
+  }
+  return "Unknown time";
+}
+// src/tools/background-task/modules/message-processing.ts
+function getErrorMessage2(value) {
+  if (Array.isArray(value))
+    return null;
+  if (value.error === undefined || value.error === null)
+    return null;
+  if (typeof value.error === "string" && value.error.length > 0)
+    return value.error;
+  return String(value.error);
+}
+function isSessionMessage(value) {
+  return typeof value === "object" && value !== null;
+}
+function extractMessages2(value) {
+  if (Array.isArray(value)) {
+    return value.filter(isSessionMessage);
+  }
+  if (Array.isArray(value.data)) {
+    return value.data.filter(isSessionMessage);
+  }
+  return [];
+}
+function extractToolResultText(part) {
+  if (typeof part.content === "string" && part.content.length > 0) {
+    return [part.content];
+  }
+  if (Array.isArray(part.content)) {
+    const blocks = part.content.filter((block) => (block.type === "text" || block.type === "reasoning") && block.text).map((block) => block.text);
+    if (blocks.length > 0)
+      return blocks;
+  }
+  if (part.output && part.output.length > 0) {
+    return [part.output];
+  }
+  return [];
+}
+
+// src/tools/background-task/modules/formatters.ts
+init_session_cursor();
+var MAX_MESSAGE_LIMIT = 100;
+var THINKING_MAX_CHARS = 2000;
 function formatTaskStatus(task) {
   let duration3;
   if (task.status === "pending" && task.queuedAt) {
@@ -48397,27 +48773,6 @@ ${statusNote}
 ${promptPreview}
 \`\`\`${lastMessageSection}`;
 }
-function getErrorMessage2(value) {
-  if (Array.isArray(value))
-    return null;
-  if (value.error === undefined || value.error === null)
-    return null;
-  if (typeof value.error === "string" && value.error.length > 0)
-    return value.error;
-  return String(value.error);
-}
-function isSessionMessage(value) {
-  return typeof value === "object" && value !== null;
-}
-function extractMessages2(value) {
-  if (Array.isArray(value)) {
-    return value.filter(isSessionMessage);
-  }
-  if (Array.isArray(value.data)) {
-    return value.data.filter(isSessionMessage);
-  }
-  return [];
-}
 async function formatTaskResult(task, client2) {
   if (!task.sessionID) {
     return `Error: Task has no sessionID`;
@@ -48508,20 +48863,6 @@ Session ID: ${task.sessionID}
 
 ${textContent || "(No text output)"}`;
 }
-function extractToolResultText(part) {
-  if (typeof part.content === "string" && part.content.length > 0) {
-    return [part.content];
-  }
-  if (Array.isArray(part.content)) {
-    const blocks = part.content.filter((block) => (block.type === "text" || block.type === "reasoning") && block.text).map((block) => block.text);
-    if (blocks.length > 0)
-      return blocks;
-  }
-  if (part.output && part.output.length > 0) {
-    return [part.output];
-  }
-  return [];
-}
 async function formatFullSession(task, client2, options) {
   if (!task.sessionID) {
     return formatTaskStatus(task);
@@ -48615,6 +48956,25 @@ async function formatFullSession(task, client2, options) {
   return lines.join(`
 `);
 }
+
+// src/tools/background-task/modules/background-output.ts
+var SISYPHUS_JUNIOR_AGENT = "sisyphus-junior";
+function resolveToolCallID(ctx) {
+  if (typeof ctx.callID === "string" && ctx.callID.trim() !== "") {
+    return ctx.callID;
+  }
+  if (typeof ctx.callId === "string" && ctx.callId.trim() !== "") {
+    return ctx.callId;
+  }
+  if (typeof ctx.call_id === "string" && ctx.call_id.trim() !== "") {
+    return ctx.call_id;
+  }
+  return;
+}
+function formatResolvedTitle(task) {
+  const label = task.agent === SISYPHUS_JUNIOR_AGENT && task.category ? task.category : task.agent;
+  return `${label} - ${task.description}`;
+}
 function createBackgroundOutput(manager, client2) {
   return tool({
     description: BACKGROUND_OUTPUT_DESCRIPTION,
@@ -48629,12 +48989,29 @@ function createBackgroundOutput(manager, client2) {
       include_tool_results: tool.schema.boolean().optional().describe("Include tool results in full_session output (default: false)"),
       thinking_max_chars: tool.schema.number().optional().describe("Max characters for thinking content (default: 2000)")
     },
-    async execute(args) {
+    async execute(args, toolContext) {
       try {
+        const ctx = toolContext;
         const task = manager.getTask(args.task_id);
         if (!task) {
           return `Task not found: ${args.task_id}`;
         }
+        const resolvedTitle = formatResolvedTitle(task);
+        const meta = {
+          title: resolvedTitle,
+          metadata: {
+            task_id: task.id,
+            agent: task.agent,
+            category: task.category,
+            description: task.description,
+            sessionId: task.sessionID ?? "pending"
+          }
+        };
+        await ctx.metadata?.(meta);
+        const callID = resolveToolCallID(ctx);
+        if (callID) {
+          storeToolMetadata(ctx.sessionID, callID, meta);
+        }
         if (args.full_session === true) {
           return await formatFullSession(task, client2, {
             includeThinking: args.include_thinking === true,
@@ -48682,6 +49059,7 @@ ${formatTaskStatus(finalTask)}`;
     }
   });
 }
+// src/tools/background-task/modules/background-cancel.ts
 function createBackgroundCancel(manager, client2) {
   return tool({
     description: BACKGROUND_CANCEL_DESCRIPTION,
@@ -48774,21 +49152,6 @@ Status: ${task.status}`;
     }
   });
 }
-function formatMessageTime(value) {
-  if (typeof value === "string") {
-    const date5 = new Date(value);
-    return Number.isNaN(date5.getTime()) ? value : date5.toISOString();
-  }
-  if (typeof value === "object" && value !== null) {
-    if ("created" in value) {
-      const created = value.created;
-      if (typeof created === "number") {
-        return new Date(created).toISOString();
-      }
-    }
-  }
-  return "Unknown time";
-}
 // src/tools/call-omo-agent/constants.ts
 var ALLOWED_AGENTS = [
   "explore",
@@ -48805,12 +49168,17 @@ Available: {agents}
 
 Pass \`session_id=<id>\` to continue previous agent with full context. Prompts MUST be in English. Use \`background_output\` for async results.`;
 // src/tools/call-omo-agent/tools.ts
-import { existsSync as existsSync49, readdirSync as readdirSync16 } from "fs";
-import { join as join57 } from "path";
 init_shared();
-init_session_cursor();
+
+// src/tools/call-omo-agent/background-executor.ts
+init_shared();
+init_hook_message_injector();
+
+// src/tools/call-omo-agent/message-dir.ts
 init_hook_message_injector();
-function getMessageDir10(sessionID) {
+import { existsSync as existsSync49, readdirSync as readdirSync16 } from "fs";
+import { join as join57 } from "path";
+function getMessageDir11(sessionID) {
   if (!sessionID.startsWith("ses_"))
     return null;
   if (!existsSync49(MESSAGE_STORAGE))
@@ -48825,40 +49193,11 @@ function getMessageDir10(sessionID) {
   }
   return null;
 }
-function createCallOmoAgent(ctx, backgroundManager) {
-  const agentDescriptions = ALLOWED_AGENTS.map((name) => `- ${name}: Specialized agent for ${name} tasks`).join(`
-`);
-  const description = CALL_OMO_AGENT_DESCRIPTION.replace("{agents}", agentDescriptions);
-  return tool({
-    description,
-    args: {
-      description: tool.schema.string().describe("A short (3-5 words) description of the task"),
-      prompt: tool.schema.string().describe("The task for the agent to perform"),
-      subagent_type: tool.schema.string().describe("The type of specialized agent to use for this task (explore or librarian only)"),
-      run_in_background: tool.schema.boolean().describe("REQUIRED. true: run asynchronously (use background_output to get results), false: run synchronously and wait for completion"),
-      session_id: tool.schema.string().describe("Existing Task session to continue").optional()
-    },
-    async execute(args, toolContext) {
-      const toolCtx = toolContext;
-      log(`[call_omo_agent] Starting with agent: ${args.subagent_type}, background: ${args.run_in_background}`);
-      if (![...ALLOWED_AGENTS].some((name) => name.toLowerCase() === args.subagent_type.toLowerCase())) {
-        return `Error: Invalid agent type "${args.subagent_type}". Only ${ALLOWED_AGENTS.join(", ")} are allowed.`;
-      }
-      const normalizedAgent = args.subagent_type.toLowerCase();
-      args = { ...args, subagent_type: normalizedAgent };
-      if (args.run_in_background) {
-        if (args.session_id) {
-          return `Error: session_id is not supported in background mode. Use run_in_background=false to continue an existing session.`;
-        }
-        return await executeBackground(args, toolCtx, backgroundManager);
-      }
-      return await executeSync(args, toolCtx, ctx);
-    }
-  });
-}
+
+// src/tools/call-omo-agent/background-executor.ts
 async function executeBackground(args, toolContext, manager) {
   try {
-    const messageDir = getMessageDir10(toolContext.sessionID);
+    const messageDir = getMessageDir11(toolContext.sessionID);
     const prevMessage = messageDir ? findNearestMessageWithFields(messageDir) : null;
     const firstMessageAgent = messageDir ? findFirstMessageWithAgent(messageDir) : null;
     const sessionAgent = getSessionAgent(toolContext.sessionID);
@@ -48920,8 +49259,14 @@ Use \`background_output\` tool with task_id="${task.id}" to check progress:
     return `Failed to launch background agent task: ${message}`;
   }
 }
-async function executeSync(args, toolContext, ctx) {
-  let sessionID;
+
+// src/tools/call-omo-agent/sync-executor.ts
+init_shared();
+init_shared();
+
+// src/tools/call-omo-agent/session-creator.ts
+init_shared();
+async function createOrGetSession(args, toolContext, ctx) {
   if (args.session_id) {
     log(`[call_omo_agent] Using existing session: ${args.session_id}`);
     const sessionResult = await ctx.client.session.get({
@@ -48929,9 +49274,9 @@ async function executeSync(args, toolContext, ctx) {
     });
     if (sessionResult.error) {
       log(`[call_omo_agent] Session get error:`, sessionResult.error);
-      return `Error: Failed to get existing session: ${sessionResult.error}`;
+      throw new Error(`Failed to get existing session: ${sessionResult.error}`);
     }
-    sessionID = args.session_id;
+    return { sessionID: args.session_id, isNew: false };
   } else {
     log(`[call_omo_agent] Creating new session with parent: ${toolContext.sessionID}`);
     const parentSession = await ctx.client.session.get({
@@ -48958,55 +49303,27 @@ async function executeSync(args, toolContext, ctx) {
       log(`[call_omo_agent] Session create error:`, createResult.error);
       const errorStr = String(createResult.error);
       if (errorStr.toLowerCase().includes("unauthorized")) {
-        return `Error: Failed to create session (Unauthorized). This may be due to:
+        throw new Error(`Failed to create session (Unauthorized). This may be due to:
 1. OAuth token restrictions (e.g., Claude Code credentials are restricted to Claude Code only)
 2. Provider authentication issues
 3. Session permission inheritance problems
 
 Try using a different provider or API key authentication.
 
-Original error: ${createResult.error}`;
+Original error: ${createResult.error}`);
       }
-      return `Error: Failed to create session: ${createResult.error}`;
+      throw new Error(`Failed to create session: ${createResult.error}`);
     }
-    sessionID = createResult.data.id;
+    const sessionID = createResult.data.id;
     log(`[call_omo_agent] Created session: ${sessionID}`);
+    return { sessionID, isNew: true };
   }
-  await toolContext.metadata?.({
-    title: args.description,
-    metadata: { sessionId: sessionID }
-  });
-  log(`[call_omo_agent] Sending prompt to session ${sessionID}`);
-  log(`[call_omo_agent] Prompt text:`, args.prompt.substring(0, 100));
-  try {
-    await ctx.client.session.promptAsync({
-      path: { id: sessionID },
-      body: {
-        agent: args.subagent_type,
-        tools: {
-          ...getAgentToolRestrictions(args.subagent_type),
-          task: false
-        },
-        parts: [{ type: "text", text: args.prompt }]
-      }
-    });
-  } catch (error45) {
-    const errorMessage = error45 instanceof Error ? error45.message : String(error45);
-    log(`[call_omo_agent] Prompt error:`, errorMessage);
-    if (errorMessage.includes("agent.name") || errorMessage.includes("undefined")) {
-      return `Error: Agent "${args.subagent_type}" not found. Make sure the agent is registered in your opencode.json or provided by a plugin.
-
-<task_metadata>
-session_id: ${sessionID}
-</task_metadata>`;
-    }
-    return `Error: Failed to send prompt: ${errorMessage}
+}
 
-<task_metadata>
-session_id: ${sessionID}
-</task_metadata>`;
-  }
-  log(`[call_omo_agent] Prompt sent, polling for completion...`);
+// src/tools/call-omo-agent/completion-poller.ts
+init_shared();
+async function waitForCompletion(sessionID, toolContext, ctx) {
+  log(`[call_omo_agent] Polling for completion...`);
   const POLL_INTERVAL_MS = 500;
   const MAX_POLL_TIME_MS = 5 * 60 * 1000;
   const pollStart = Date.now();
@@ -49016,11 +49333,7 @@ session_id: ${sessionID}
   while (Date.now() - pollStart < MAX_POLL_TIME_MS) {
     if (toolContext.abort?.aborted) {
       log(`[call_omo_agent] Aborted by user`);
-      return `Task aborted.
-
-<task_metadata>
-session_id: ${sessionID}
-</task_metadata>`;
+      throw new Error("Task aborted.");
     }
     await new Promise((resolve11) => setTimeout(resolve11, POLL_INTERVAL_MS));
     const statusResult = await ctx.client.session.status();
@@ -49047,18 +49360,20 @@ session_id: ${sessionID}
   }
   if (Date.now() - pollStart >= MAX_POLL_TIME_MS) {
     log(`[call_omo_agent] Timeout reached`);
-    return `Error: Agent task timed out after 5 minutes.
-
-<task_metadata>
-session_id: ${sessionID}
-</task_metadata>`;
+    throw new Error("Agent task timed out after 5 minutes.");
   }
+}
+
+// src/tools/call-omo-agent/message-processor.ts
+init_shared();
+init_session_cursor();
+async function processMessages(sessionID, ctx) {
   const messagesResult = await ctx.client.session.messages({
     path: { id: sessionID }
   });
   if (messagesResult.error) {
     log(`[call_omo_agent] Messages error:`, messagesResult.error);
-    return `Error: Failed to get messages: ${messagesResult.error}`;
+    throw new Error(`Failed to get messages: ${messagesResult.error}`);
   }
   const messages = messagesResult.data;
   log(`[call_omo_agent] Got ${messages.length} messages`);
@@ -49066,11 +49381,7 @@ session_id: ${sessionID}
   if (relevantMessages.length === 0) {
     log(`[call_omo_agent] No assistant or tool messages found`);
     log(`[call_omo_agent] All messages:`, JSON.stringify(messages, null, 2));
-    return `Error: No assistant or tool response found
-
-<task_metadata>
-session_id: ${sessionID}
-</task_metadata>`;
+    throw new Error("No assistant or tool response found");
   }
   log(`[call_omo_agent] Found ${relevantMessages.length} relevant messages`);
   const sortedMessages = [...relevantMessages].sort((a, b) => {
@@ -49080,11 +49391,7 @@ session_id: ${sessionID}
   });
   const newMessages = consumeNewMessages(sessionID, sortedMessages);
   if (newMessages.length === 0) {
-    return `No new output since last check.
-
-<task_metadata>
-session_id: ${sessionID}
-</task_metadata>`;
+    return "No new output since last check.";
   }
   const extractedContent = [];
   for (const message of newMessages) {
@@ -49109,12 +49416,87 @@ session_id: ${sessionID}
 
 `);
   log(`[call_omo_agent] Got response, length: ${responseText.length}`);
+  return responseText;
+}
+
+// src/tools/call-omo-agent/sync-executor.ts
+async function executeSync(args, toolContext, ctx) {
+  const { sessionID } = await createOrGetSession(args, toolContext, ctx);
+  await toolContext.metadata?.({
+    title: args.description,
+    metadata: { sessionId: sessionID }
+  });
+  log(`[call_omo_agent] Sending prompt to session ${sessionID}`);
+  log(`[call_omo_agent] Prompt text:`, args.prompt.substring(0, 100));
+  try {
+    await ctx.client.session.promptAsync({
+      path: { id: sessionID },
+      body: {
+        agent: args.subagent_type,
+        tools: {
+          ...getAgentToolRestrictions(args.subagent_type),
+          task: false
+        },
+        parts: [{ type: "text", text: args.prompt }]
+      }
+    });
+  } catch (error45) {
+    const errorMessage = error45 instanceof Error ? error45.message : String(error45);
+    log(`[call_omo_agent] Prompt error:`, errorMessage);
+    if (errorMessage.includes("agent.name") || errorMessage.includes("undefined")) {
+      return `Error: Agent "${args.subagent_type}" not found. Make sure the agent is registered in your opencode.json or provided by a plugin.
+
+<task_metadata>
+session_id: ${sessionID}
+</task_metadata>`;
+    }
+    return `Error: Failed to send prompt: ${errorMessage}
+
+<task_metadata>
+session_id: ${sessionID}
+</task_metadata>`;
+  }
+  await waitForCompletion(sessionID, toolContext, ctx);
+  const responseText = await processMessages(sessionID, ctx);
   const output = responseText + `
 
 ` + ["<task_metadata>", `session_id: ${sessionID}`, "</task_metadata>"].join(`
 `);
   return output;
 }
+
+// src/tools/call-omo-agent/tools.ts
+function createCallOmoAgent(ctx, backgroundManager) {
+  const agentDescriptions = ALLOWED_AGENTS.map((name) => `- ${name}: Specialized agent for ${name} tasks`).join(`
+`);
+  const description = CALL_OMO_AGENT_DESCRIPTION.replace("{agents}", agentDescriptions);
+  return tool({
+    description,
+    args: {
+      description: tool.schema.string().describe("A short (3-5 words) description of the task"),
+      prompt: tool.schema.string().describe("The task for the agent to perform"),
+      subagent_type: tool.schema.string().describe("The type of specialized agent to use for this task (explore or librarian only)"),
+      run_in_background: tool.schema.boolean().describe("REQUIRED. true: run asynchronously (use background_output to get results), false: run synchronously and wait for completion"),
+      session_id: tool.schema.string().describe("Existing Task session to continue").optional()
+    },
+    async execute(args, toolContext) {
+      const toolCtx = toolContext;
+      log(`[call_omo_agent] Starting with agent: ${args.subagent_type}, background: ${args.run_in_background}`);
+      if (![...ALLOWED_AGENTS].some((name) => name.toLowerCase() === args.subagent_type.toLowerCase())) {
+        return `Error: Invalid agent type "${args.subagent_type}". Only ${ALLOWED_AGENTS.join(", ")} are allowed.`;
+      }
+      const normalizedAgent = args.subagent_type.toLowerCase();
+      args = { ...args, subagent_type: normalizedAgent };
+      if (args.run_in_background) {
+        if (args.session_id) {
+          return `Error: session_id is not supported in background mode. Use run_in_background=false to continue an existing session.`;
+        }
+        return await executeBackground(args, toolCtx, backgroundManager);
+      }
+      return await executeSync(args, toolCtx, ctx);
+    }
+  });
+}
 // src/tools/look-at/constants.ts
 var MULTIMODAL_LOOKER_AGENT = "multimodal-looker";
 var LOOK_AT_DESCRIPTION = `Analyze media files (PDFs, images, diagrams) that require interpretation beyond raw text. Extracts specific information or summaries from documents, describes visual content. Use when you need analyzed/extracted data rather than literal file contents.`;
@@ -49426,7 +49808,7 @@ function parseModelString(model) {
   }
   return;
 }
-function getMessageDir11(sessionID) {
+function getMessageDir12(sessionID) {
   if (!sessionID.startsWith("ses_"))
     return null;
   if (!existsSync50(MESSAGE_STORAGE))
@@ -49692,7 +50074,19 @@ init_shared();
 init_model_availability();
 init_connected_providers_cache();
 init_model_requirements();
-var SISYPHUS_JUNIOR_AGENT = "sisyphus-junior";
+var SISYPHUS_JUNIOR_AGENT2 = "sisyphus-junior";
+function resolveToolCallID2(ctx) {
+  if (typeof ctx.callID === "string" && ctx.callID.trim() !== "") {
+    return ctx.callID;
+  }
+  if (typeof ctx.callId === "string" && ctx.callId.trim() !== "") {
+    return ctx.callId;
+  }
+  if (typeof ctx.call_id === "string" && ctx.call_id.trim() !== "") {
+    return ctx.call_id;
+  }
+  return;
+}
 async function resolveSkillContent(skills, options) {
   if (skills.length === 0) {
     return { content: undefined, error: null };
@@ -49708,7 +50102,7 @@ async function resolveSkillContent(skills, options) {
 `), error: null };
 }
 function resolveParentContext(ctx) {
-  const messageDir = getMessageDir11(ctx.sessionID);
+  const messageDir = getMessageDir12(ctx.sessionID);
   const prevMessage = messageDir ? findNearestMessageWithFields(messageDir) : null;
   const firstMessageAgent = messageDir ? findFirstMessageWithAgent(messageDir) : null;
   const sessionAgent = getSessionAgent(ctx.sessionID);
@@ -49758,9 +50152,9 @@ async function executeBackgroundContinuation(args, ctx, executorCtx, parentConte
       }
     };
     await ctx.metadata?.(bgContMeta);
-    if (ctx.callID) {
-      storeToolMetadata(ctx.sessionID, ctx.callID, bgContMeta);
-    }
+    const bgContCallID = resolveToolCallID2(ctx);
+    if (bgContCallID)
+      storeToolMetadata(ctx.sessionID, bgContCallID, bgContMeta);
     return `Background task continued.
 
 Task ID: ${task.id}
@@ -49808,12 +50202,13 @@ async function executeSyncContinuation(args, ctx, executorCtx) {
     }
   };
   await ctx.metadata?.(syncContMeta);
-  if (ctx.callID) {
-    storeToolMetadata(ctx.sessionID, ctx.callID, syncContMeta);
-  }
+  const syncContCallID = resolveToolCallID2(ctx);
+  if (syncContCallID)
+    storeToolMetadata(ctx.sessionID, syncContCallID, syncContMeta);
   try {
     let resumeAgent;
     let resumeModel;
+    let resumeVariant;
     try {
       const messagesResp = await client2.session.messages({ path: { id: args.session_id } });
       const messages2 = messagesResp.data ?? [];
@@ -49822,20 +50217,23 @@ async function executeSyncContinuation(args, ctx, executorCtx) {
         if (info?.agent || info?.model || info?.modelID && info?.providerID) {
           resumeAgent = info.agent;
           resumeModel = info.model ?? (info.providerID && info.modelID ? { providerID: info.providerID, modelID: info.modelID } : undefined);
+          resumeVariant = info.variant;
           break;
         }
       }
     } catch {
-      const resumeMessageDir = getMessageDir11(args.session_id);
+      const resumeMessageDir = getMessageDir12(args.session_id);
       const resumeMessage = resumeMessageDir ? findNearestMessageWithFields(resumeMessageDir) : null;
       resumeAgent = resumeMessage?.agent;
       resumeModel = resumeMessage?.model?.providerID && resumeMessage?.model?.modelID ? { providerID: resumeMessage.model.providerID, modelID: resumeMessage.model.modelID } : undefined;
+      resumeVariant = resumeMessage?.model?.variant;
     }
-    await client2.session.promptAsync({
+    await promptSyncWithModelSuggestionRetry(client2, {
       path: { id: args.session_id },
       body: {
         ...resumeAgent !== undefined ? { agent: resumeAgent } : {},
         ...resumeModel !== undefined ? { model: resumeModel } : {},
+        ...resumeVariant !== undefined ? { variant: resumeVariant } : {},
         tools: {
           ...resumeAgent ? getAgentToolRestrictions(resumeAgent) : {},
           task: false,
@@ -49854,27 +50252,6 @@ async function executeSyncContinuation(args, ctx, executorCtx) {
 
 Session ID: ${args.session_id}`;
   }
-  const timing = getTimingConfig();
-  const pollStart = Date.now();
-  let lastMsgCount = 0;
-  let stablePolls = 0;
-  while (Date.now() - pollStart < 60000) {
-    await new Promise((resolve11) => setTimeout(resolve11, timing.POLL_INTERVAL_MS));
-    const elapsed = Date.now() - pollStart;
-    if (elapsed < timing.SESSION_CONTINUATION_STABILITY_MS)
-      continue;
-    const messagesCheck = await client2.session.messages({ path: { id: args.session_id } });
-    const msgs = messagesCheck.data ?? messagesCheck;
-    const currentMsgCount = msgs.length;
-    if (currentMsgCount > 0 && currentMsgCount === lastMsgCount) {
-      stablePolls++;
-      if (stablePolls >= timing.STABILITY_POLLS_REQUIRED)
-        break;
-    } else {
-      stablePolls = 0;
-      lastMsgCount = currentMsgCount;
-    }
-  }
   const messagesResult = await client2.session.messages({
     path: { id: args.session_id }
   });
@@ -49962,9 +50339,9 @@ Task ID: ${task.id}`;
       }
     };
     await ctx.metadata?.(bgTaskMeta);
-    if (ctx.callID) {
-      storeToolMetadata(ctx.sessionID, ctx.callID, bgTaskMeta);
-    }
+    const bgTaskCallID = resolveToolCallID2(ctx);
+    if (bgTaskCallID)
+      storeToolMetadata(ctx.sessionID, bgTaskCallID, bgTaskMeta);
     const startTime = new Date;
     const timingCfg = getTimingConfig();
     const pollStart = Date.now();
@@ -50087,9 +50464,9 @@ Task ID: ${task.id}`;
       }
     };
     await ctx.metadata?.(unstableMeta);
-    if (ctx.callID) {
-      storeToolMetadata(ctx.sessionID, ctx.callID, unstableMeta);
-    }
+    const unstableCallID = resolveToolCallID2(ctx);
+    if (unstableCallID)
+      storeToolMetadata(ctx.sessionID, unstableCallID, unstableMeta);
     return `Background task launched.
 
 Task ID: ${task.id}
@@ -50176,12 +50553,12 @@ async function executeSyncTask(args, ctx, executorCtx, parentContext, agentToUse
       }
     };
     await ctx.metadata?.(syncTaskMeta);
-    if (ctx.callID) {
-      storeToolMetadata(ctx.sessionID, ctx.callID, syncTaskMeta);
-    }
+    const syncTaskCallID = resolveToolCallID2(ctx);
+    if (syncTaskCallID)
+      storeToolMetadata(ctx.sessionID, syncTaskCallID, syncTaskMeta);
     try {
-      const allowTask = isPlanAgent(agentToUse);
-      await promptWithModelSuggestionRetry(client2, {
+      const allowTask = isPlanFamily(agentToUse);
+      await promptSyncWithModelSuggestionRetry(client2, {
         path: { id: sessionID },
         body: {
           agent: agentToUse,
@@ -50218,62 +50595,6 @@ async function executeSyncTask(args, ctx, executorCtx, parentContext, agentToUse
         category: args.category
       });
     }
-    const syncTiming = getTimingConfig();
-    const pollStart = Date.now();
-    let lastMsgCount = 0;
-    let stablePolls = 0;
-    let pollCount = 0;
-    log("[task] Starting poll loop", { sessionID, agentToUse });
-    while (Date.now() - pollStart < syncTiming.MAX_POLL_TIME_MS) {
-      if (ctx.abort?.aborted) {
-        log("[task] Aborted by user", { sessionID });
-        if (toastManager && taskId)
-          toastManager.removeTask(taskId);
-        return `Task aborted.
-
-Session ID: ${sessionID}`;
-      }
-      await new Promise((resolve11) => setTimeout(resolve11, syncTiming.POLL_INTERVAL_MS));
-      pollCount++;
-      const statusResult = await client2.session.status();
-      const allStatuses = statusResult.data ?? {};
-      const sessionStatus = allStatuses[sessionID];
-      if (pollCount % 10 === 0) {
-        log("[task] Poll status", {
-          sessionID,
-          pollCount,
-          elapsed: Math.floor((Date.now() - pollStart) / 1000) + "s",
-          sessionStatus: sessionStatus?.type ?? "not_in_status",
-          stablePolls,
-          lastMsgCount
-        });
-      }
-      if (sessionStatus && sessionStatus.type !== "idle") {
-        stablePolls = 0;
-        lastMsgCount = 0;
-        continue;
-      }
-      const elapsed = Date.now() - pollStart;
-      if (elapsed < syncTiming.MIN_STABILITY_TIME_MS) {
-        continue;
-      }
-      const messagesCheck = await client2.session.messages({ path: { id: sessionID } });
-      const msgs = messagesCheck.data ?? messagesCheck;
-      const currentMsgCount = msgs.length;
-      if (currentMsgCount === lastMsgCount) {
-        stablePolls++;
-        if (stablePolls >= syncTiming.STABILITY_POLLS_REQUIRED) {
-          log("[task] Poll complete - messages stable", { sessionID, pollCount, currentMsgCount });
-          break;
-        }
-      } else {
-        stablePolls = 0;
-        lastMsgCount = currentMsgCount;
-      }
-    }
-    if (Date.now() - pollStart >= syncTiming.MAX_POLL_TIME_MS) {
-      log("[task] Poll timeout reached", { sessionID, pollCount, lastMsgCount, stablePolls });
-    }
     const messagesResult = await client2.session.messages({
       path: { id: sessionID }
     });
@@ -50327,8 +50648,8 @@ session_id: ${sessionID}
 }
 async function resolveCategoryExecution(args, executorCtx, inheritedModel, systemDefaultModel) {
   const { client: client2, userCategories, sisyphusJuniorModel } = executorCtx;
-  const connectedProviders = readConnectedProvidersCache();
-  const availableModels = await fetchAvailableModels(client2, {
+  const connectedProviders = executorCtx.connectedProvidersOverride !== undefined ? executorCtx.connectedProvidersOverride : readConnectedProvidersCache();
+  const availableModels = executorCtx.availableModelsOverride !== undefined ? executorCtx.availableModelsOverride : await fetchAvailableModels(client2, {
     connectedProviders: connectedProviders ?? undefined
   });
   const resolved = resolveCategoryConfig(args.category, {
@@ -50365,7 +50686,7 @@ async function resolveCategoryExecution(args, executorCtx, inheritedModel, syste
         userModel: explicitCategoryModel ?? overrideModel,
         categoryDefaultModel: resolved.model
       },
-      constraints: { availableModels },
+      constraints: { availableModels, connectedProviders },
       policy: {
         fallbackChain: requirement.fallbackChain,
         systemDefaultModel
@@ -50433,7 +50754,7 @@ Available categories: ${categoryNames.join(", ")}`
   const unstableModel = actualModel?.toLowerCase();
   const isUnstableAgent = resolved.config.is_unstable_agent === true || (unstableModel ? unstableModel.includes("gemini") || unstableModel.includes("minimax") : false);
   return {
-    agentToUse: SISYPHUS_JUNIOR_AGENT,
+    agentToUse: SISYPHUS_JUNIOR_AGENT2,
     categoryModel,
     categoryPromptAppend,
     modelInfo,
@@ -50442,25 +50763,25 @@ Available categories: ${categoryNames.join(", ")}`
   };
 }
 async function resolveSubagentExecution(args, executorCtx, parentAgent, categoryExamples) {
-  const { client: client2 } = executorCtx;
+  const { client: client2, agentOverrides } = executorCtx;
   if (!args.subagent_type?.trim()) {
     return { agentToUse: "", categoryModel: undefined, error: `Agent name cannot be empty.` };
   }
   const agentName = args.subagent_type.trim();
-  if (agentName.toLowerCase() === SISYPHUS_JUNIOR_AGENT.toLowerCase()) {
+  if (agentName.toLowerCase() === SISYPHUS_JUNIOR_AGENT2.toLowerCase()) {
     return {
       agentToUse: "",
       categoryModel: undefined,
-      error: `Cannot use subagent_type="${SISYPHUS_JUNIOR_AGENT}" directly. Use category parameter instead (e.g., ${categoryExamples}).
+      error: `Cannot use subagent_type="${SISYPHUS_JUNIOR_AGENT2}" directly. Use category parameter instead (e.g., ${categoryExamples}).
 
 Sisyphus-Junior is spawned automatically when you specify a category. Pick the appropriate category for your task domain.`
     };
   }
-  if (isPlanAgent(agentName) && isPlanAgent(parentAgent)) {
+  if (isPlanFamily(agentName) && isPlanFamily(parentAgent)) {
     return {
       agentToUse: "",
       categoryModel: undefined,
-      error: `You are prometheus. You cannot delegate to prometheus via task.
+      error: `You are a plan-family agent (plan/prometheus). You cannot delegate to other plan-family agents via task.
 
 Create the work plan directly - that's your job as the planning agent.`
     };
@@ -50489,7 +50810,34 @@ Create the work plan directly - that's your job as the planning agent.`
       };
     }
     agentToUse = matchedAgent.name;
-    if (matchedAgent.model) {
+    const agentNameLower = agentToUse.toLowerCase();
+    const agentOverride = agentOverrides?.[agentNameLower] ?? (agentOverrides ? Object.entries(agentOverrides).find(([key]) => key.toLowerCase() === agentNameLower)?.[1] : undefined);
+    const agentRequirement = AGENT_MODEL_REQUIREMENTS[agentNameLower];
+    if (agentOverride?.model || agentRequirement) {
+      const connectedProviders = executorCtx.connectedProvidersOverride !== undefined ? executorCtx.connectedProvidersOverride : readConnectedProvidersCache();
+      const availableModels = executorCtx.availableModelsOverride !== undefined ? executorCtx.availableModelsOverride : await fetchAvailableModels(client2, {
+        connectedProviders: connectedProviders ?? undefined
+      });
+      const matchedAgentModelStr = matchedAgent.model ? `${matchedAgent.model.providerID}/${matchedAgent.model.modelID}` : undefined;
+      const resolution = resolveModelPipeline({
+        intent: {
+          userModel: agentOverride?.model,
+          categoryDefaultModel: matchedAgentModelStr
+        },
+        constraints: { availableModels, connectedProviders },
+        policy: {
+          fallbackChain: agentRequirement?.fallbackChain,
+          systemDefaultModel: undefined
+        }
+      });
+      if (resolution) {
+        const parsed = parseModelString(resolution.model);
+        if (parsed) {
+          const variantToUse = agentOverride?.variant ?? resolution.variant;
+          categoryModel = variantToUse ? { ...parsed, variant: variantToUse } : parsed;
+        }
+      }
+    } else if (matchedAgent.model) {
       categoryModel = matchedAgent.model;
     }
   } catch {}
@@ -50736,6 +51084,9 @@ function resolveTaskListId(config3 = {}) {
   const envId = process.env.ULTRAWORK_TASK_LIST_ID?.trim();
   if (envId)
     return sanitizePathSegment(envId);
+  const claudeEnvId = process.env.CLAUDE_CODE_TASK_LIST_ID?.trim();
+  if (claudeEnvId)
+    return sanitizePathSegment(claudeEnvId);
   const configId = config3.sisyphus?.tasks?.task_list_id?.trim();
   if (configId)
     return sanitizePathSegment(configId);
@@ -51345,6 +51696,7 @@ class BackgroundManager {
   processingKeys = new Set;
   completionTimers = new Map;
   idleDeferralTimers = new Map;
+  notificationQueueByParent = new Map;
   constructor(ctx, config3, options) {
     this.tasks = new Map;
     this.notifications = new Map;
@@ -51452,13 +51804,14 @@ class BackgroundManager {
     });
     const parentDirectory = parentSession?.data?.directory ?? this.directory;
     log(`[background-agent] Parent dir: ${parentSession?.data?.directory}, using: ${parentDirectory}`);
+    const inheritedPermission = parentSession?.data?.permission;
+    const permissionRules = Array.isArray(inheritedPermission) ? inheritedPermission.filter((r) => r?.permission !== "question") : [];
+    permissionRules.push({ permission: "question", action: "deny", pattern: "*" });
     const createResult = await this.client.session.create({
       body: {
         parentID: input.parentSessionID,
         title: `${input.description} (@${input.agent} subagent)`,
-        permission: [
-          { permission: "question", action: "deny", pattern: "*" }
-        ]
+        permission: permissionRules
       },
       query: {
         directory: parentDirectory
@@ -51553,7 +51906,7 @@ class BackgroundManager {
         }).catch(() => {});
         this.markForNotification(existingTask);
         this.cleanupPendingByParent(existingTask);
-        this.notifyParentSession(existingTask).catch((err) => {
+        this.enqueueNotificationForParent(existingTask.parentSessionID, () => this.notifyParentSession(existingTask)).catch((err) => {
           log("[background-agent] Failed to notify on error:", err);
         });
       }
@@ -51747,7 +52100,7 @@ class BackgroundManager {
       }
       this.markForNotification(existingTask);
       this.cleanupPendingByParent(existingTask);
-      this.notifyParentSession(existingTask).catch((err) => {
+      this.enqueueNotificationForParent(existingTask.parentSessionID, () => this.notifyParentSession(existingTask)).catch((err) => {
         log("[background-agent] Failed to notify on resume error:", err);
       });
     });
@@ -52000,7 +52353,7 @@ class BackgroundManager {
     }
     this.markForNotification(task);
     try {
-      await this.notifyParentSession(task);
+      await this.enqueueNotificationForParent(task.parentSessionID, () => this.notifyParentSession(task));
       log(`[background-agent] Task cancelled via ${source}:`, task.id);
     } catch (err) {
       log("[background-agent] Error in notifyParentSession for cancelled task:", { taskId: task.id, error: err });
@@ -52095,7 +52448,7 @@ class BackgroundManager {
       }).catch(() => {});
     }
     try {
-      await this.notifyParentSession(task);
+      await this.enqueueNotificationForParent(task.parentSessionID, () => this.notifyParentSession(task));
       log(`[background-agent] Task completed via ${source}:`, task.id);
     } catch (err) {
       log("[background-agent] Error in notifyParentSession:", { taskId: task.id, error: err });
@@ -52114,14 +52467,18 @@ class BackgroundManager {
       });
     }
     const pendingSet = this.pendingByParent.get(task.parentSessionID);
+    let allComplete = false;
+    let remainingCount = 0;
     if (pendingSet) {
       pendingSet.delete(task.id);
-      if (pendingSet.size === 0) {
+      remainingCount = pendingSet.size;
+      allComplete = remainingCount === 0;
+      if (allComplete) {
         this.pendingByParent.delete(task.parentSessionID);
       }
+    } else {
+      allComplete = true;
     }
-    const allComplete = !pendingSet || pendingSet.size === 0;
-    const remainingCount = pendingSet?.size ?? 0;
     const statusText = task.status === "completed" ? "COMPLETED" : "CANCELLED";
     const errorInfo = task.error ? `
 **Error:** ${task.error}` : "";
@@ -52173,7 +52530,7 @@ Use \`background_output(task_id="${task.id}")\` to retrieve this result when rea
         });
         return;
       }
-      const messageDir = getMessageDir12(task.parentSessionID);
+      const messageDir = getMessageDir13(task.parentSessionID);
       const currentMessage = messageDir ? findNearestMessageWithFields(messageDir) : null;
       agent = currentMessage?.agent ?? task.parentAgent;
       model = currentMessage?.model?.providerID && currentMessage?.model?.modelID ? { providerID: currentMessage.model.providerID, modelID: currentMessage.model.modelID } : undefined;
@@ -52346,7 +52703,7 @@ Use \`background_output(task_id="${task.id}")\` to retrieve this result when rea
       }).catch(() => {});
       log(`[background-agent] Task ${task.id} interrupted: stale timeout`);
       try {
-        await this.notifyParentSession(task);
+        await this.enqueueNotificationForParent(task.parentSessionID, () => this.notifyParentSession(task));
       } catch (err) {
         log("[background-agent] Error in notifyParentSession for stale task:", { taskId: task.id, error: err });
       }
@@ -52497,11 +52854,26 @@ Use \`background_output(task_id="${task.id}")\` to retrieve this result when rea
     this.tasks.clear();
     this.notifications.clear();
     this.pendingByParent.clear();
+    this.notificationQueueByParent.clear();
     this.queuesByKey.clear();
     this.processingKeys.clear();
     this.unregisterProcessCleanup();
     log("[background-agent] Shutdown complete");
   }
+  enqueueNotificationForParent(parentSessionID, operation) {
+    if (!parentSessionID) {
+      return operation();
+    }
+    const previous = this.notificationQueueByParent.get(parentSessionID) ?? Promise.resolve();
+    const current = previous.catch(() => {}).then(operation);
+    this.notificationQueueByParent.set(parentSessionID, current);
+    current.finally(() => {
+      if (this.notificationQueueByParent.get(parentSessionID) === current) {
+        this.notificationQueueByParent.delete(parentSessionID);
+      }
+    }).catch(() => {});
+    return current;
+  }
 }
 function registerProcessSignal(signal, handler, exitAfter) {
   const listener = () => {
@@ -52514,7 +52886,7 @@ function registerProcessSignal(signal, handler, exitAfter) {
   process.on(signal, listener);
   return listener;
 }
-function getMessageDir12(sessionID) {
+function getMessageDir13(sessionID) {
   if (!existsSync53(MESSAGE_STORAGE))
     return null;
   const directPath = join64(MESSAGE_STORAGE, sessionID);
@@ -57914,15 +58286,130 @@ async function executeActions(actions, ctx) {
   return { success: true, spawnedPaneId, results };
 }
 
+// src/features/tmux-subagent/polling-manager.ts
+init_tmux();
+init_tmux();
+init_shared();
+var SESSION_TIMEOUT_MS2 = 10 * 60 * 1000;
+var MIN_STABILITY_TIME_MS3 = 10 * 1000;
+var STABLE_POLLS_REQUIRED = 3;
+
+class TmuxPollingManager {
+  client;
+  sessions;
+  closeSessionById;
+  pollInterval;
+  constructor(client2, sessions, closeSessionById) {
+    this.client = client2;
+    this.sessions = sessions;
+    this.closeSessionById = closeSessionById;
+  }
+  startPolling() {
+    if (this.pollInterval)
+      return;
+    this.pollInterval = setInterval(() => this.pollSessions(), POLL_INTERVAL_BACKGROUND_MS);
+    log("[tmux-session-manager] polling started");
+  }
+  stopPolling() {
+    if (this.pollInterval) {
+      clearInterval(this.pollInterval);
+      this.pollInterval = undefined;
+      log("[tmux-session-manager] polling stopped");
+    }
+  }
+  async pollSessions() {
+    if (this.sessions.size === 0) {
+      this.stopPolling();
+      return;
+    }
+    try {
+      const statusResult = await this.client.session.status({ path: undefined });
+      const allStatuses = statusResult.data ?? {};
+      log("[tmux-session-manager] pollSessions", {
+        trackedSessions: Array.from(this.sessions.keys()),
+        allStatusKeys: Object.keys(allStatuses)
+      });
+      const now = Date.now();
+      const sessionsToClose = [];
+      for (const [sessionId, tracked] of this.sessions.entries()) {
+        const status = allStatuses[sessionId];
+        const isIdle = status?.type === "idle";
+        if (status) {
+          tracked.lastSeenAt = new Date(now);
+        }
+        const missingSince = !status ? now - tracked.lastSeenAt.getTime() : 0;
+        const missingTooLong = missingSince >= SESSION_MISSING_GRACE_MS;
+        const isTimedOut = now - tracked.createdAt.getTime() > SESSION_TIMEOUT_MS2;
+        const elapsedMs = now - tracked.createdAt.getTime();
+        let shouldCloseViaStability = false;
+        if (isIdle && elapsedMs >= MIN_STABILITY_TIME_MS3) {
+          try {
+            const messagesResult = await this.client.session.messages({
+              path: { id: sessionId }
+            });
+            const currentMsgCount = Array.isArray(messagesResult.data) ? messagesResult.data.length : 0;
+            if (tracked.lastMessageCount === currentMsgCount) {
+              tracked.stableIdlePolls = (tracked.stableIdlePolls ?? 0) + 1;
+              if (tracked.stableIdlePolls >= STABLE_POLLS_REQUIRED) {
+                const recheckResult = await this.client.session.status({ path: undefined });
+                const recheckStatuses = recheckResult.data ?? {};
+                const recheckStatus = recheckStatuses[sessionId];
+                if (recheckStatus?.type === "idle") {
+                  shouldCloseViaStability = true;
+                } else {
+                  tracked.stableIdlePolls = 0;
+                  log("[tmux-session-manager] stability reached but session not idle on recheck, resetting", {
+                    sessionId,
+                    recheckStatus: recheckStatus?.type
+                  });
+                }
+              }
+            } else {
+              tracked.stableIdlePolls = 0;
+            }
+            tracked.lastMessageCount = currentMsgCount;
+          } catch (msgErr) {
+            log("[tmux-session-manager] failed to fetch messages for stability check", {
+              sessionId,
+              error: String(msgErr)
+            });
+          }
+        } else if (!isIdle) {
+          tracked.stableIdlePolls = 0;
+        }
+        log("[tmux-session-manager] session check", {
+          sessionId,
+          statusType: status?.type,
+          isIdle,
+          elapsedMs,
+          stableIdlePolls: tracked.stableIdlePolls,
+          lastMessageCount: tracked.lastMessageCount,
+          missingSince,
+          missingTooLong,
+          isTimedOut,
+          shouldCloseViaStability
+        });
+        if (shouldCloseViaStability || missingTooLong || isTimedOut) {
+          sessionsToClose.push(sessionId);
+        }
+      }
+      for (const sessionId of sessionsToClose) {
+        log("[tmux-session-manager] closing session due to poll", { sessionId });
+        await this.closeSessionById(sessionId);
+      }
+    } catch (err) {
+      log("[tmux-session-manager] poll error", { error: String(err) });
+    }
+  }
+}
+
 // src/features/tmux-subagent/manager.ts
 var defaultTmuxDeps = {
   isInsideTmux,
   getCurrentPaneId
 };
-var SESSION_TIMEOUT_MS2 = 10 * 60 * 1000;
-var MIN_STABILITY_TIME_MS3 = 10 * 1000;
-var STABLE_POLLS_REQUIRED = 3;
-
+var SESSION_TIMEOUT_MS3 = 10 * 60 * 1000;
+var MIN_STABILITY_TIME_MS4 = 10 * 1000;
 class TmuxSessionManager {
   client;
   tmuxConfig;
@@ -57930,8 +58417,8 @@ class TmuxSessionManager {
   sourcePaneId;
   sessions = new Map;
   pendingSessions = new Set;
-  pollInterval;
   deps;
+  pollingManager;
   constructor(ctx, tmuxConfig, deps = defaultTmuxDeps) {
     this.client = ctx.client;
     this.tmuxConfig = tmuxConfig;
@@ -57939,6 +58426,7 @@ class TmuxSessionManager {
     const defaultPort = process.env.OPENCODE_PORT ?? "4096";
     this.serverUrl = ctx.serverUrl?.toString() ?? `http://localhost:${defaultPort}`;
     this.sourcePaneId = deps.getCurrentPaneId();
+    this.pollingManager = new TmuxPollingManager(this.client, this.sessions, this.closeSessionById.bind(this));
     log("[tmux-session-manager] initialized", {
       configEnabled: this.tmuxConfig.enabled,
       tmuxConfig: this.tmuxConfig,
@@ -57987,6 +58475,9 @@ class TmuxSessionManager {
     });
     return false;
   }
+  async pollSessions() {
+    await this.pollingManager.pollSessions();
+  }
   async onSessionCreated(event) {
     const enabled = this.isEnabled();
     log("[tmux-session-manager] onSessionCreated called", {
@@ -58081,7 +58572,7 @@ class TmuxSessionManager {
           paneId: result.spawnedPaneId,
           sessionReady
         });
-        this.startPolling();
+        this.pollingManager.startPolling();
       } else {
         log("[tmux-session-manager] spawn failed", {
           success: result.success,
@@ -58116,104 +58607,7 @@ class TmuxSessionManager {
     }
     this.sessions.delete(event.sessionID);
     if (this.sessions.size === 0) {
-      this.stopPolling();
-    }
-  }
-  startPolling() {
-    if (this.pollInterval)
-      return;
-    this.pollInterval = setInterval(() => this.pollSessions(), POLL_INTERVAL_BACKGROUND_MS);
-    log("[tmux-session-manager] polling started");
-  }
-  stopPolling() {
-    if (this.pollInterval) {
-      clearInterval(this.pollInterval);
-      this.pollInterval = undefined;
-      log("[tmux-session-manager] polling stopped");
-    }
-  }
-  async pollSessions() {
-    if (this.sessions.size === 0) {
-      this.stopPolling();
-      return;
-    }
-    try {
-      const statusResult = await this.client.session.status({ path: undefined });
-      const allStatuses = statusResult.data ?? {};
-      log("[tmux-session-manager] pollSessions", {
-        trackedSessions: Array.from(this.sessions.keys()),
-        allStatusKeys: Object.keys(allStatuses)
-      });
-      const now = Date.now();
-      const sessionsToClose = [];
-      for (const [sessionId, tracked] of this.sessions.entries()) {
-        const status = allStatuses[sessionId];
-        const isIdle = status?.type === "idle";
-        if (status) {
-          tracked.lastSeenAt = new Date(now);
-        }
-        const missingSince = !status ? now - tracked.lastSeenAt.getTime() : 0;
-        const missingTooLong = missingSince >= SESSION_MISSING_GRACE_MS;
-        const isTimedOut = now - tracked.createdAt.getTime() > SESSION_TIMEOUT_MS2;
-        const elapsedMs = now - tracked.createdAt.getTime();
-        let shouldCloseViaStability = false;
-        if (isIdle && elapsedMs >= MIN_STABILITY_TIME_MS3) {
-          try {
-            const messagesResult = await this.client.session.messages({
-              path: { id: sessionId }
-            });
-            const currentMsgCount = Array.isArray(messagesResult.data) ? messagesResult.data.length : 0;
-            if (tracked.lastMessageCount === currentMsgCount) {
-              tracked.stableIdlePolls = (tracked.stableIdlePolls ?? 0) + 1;
-              if (tracked.stableIdlePolls >= STABLE_POLLS_REQUIRED) {
-                const recheckResult = await this.client.session.status({ path: undefined });
-                const recheckStatuses = recheckResult.data ?? {};
-                const recheckStatus = recheckStatuses[sessionId];
-                if (recheckStatus?.type === "idle") {
-                  shouldCloseViaStability = true;
-                } else {
-                  tracked.stableIdlePolls = 0;
-                  log("[tmux-session-manager] stability reached but session not idle on recheck, resetting", {
-                    sessionId,
-                    recheckStatus: recheckStatus?.type
-                  });
-                }
-              }
-            } else {
-              tracked.stableIdlePolls = 0;
-            }
-            tracked.lastMessageCount = currentMsgCount;
-          } catch (msgErr) {
-            log("[tmux-session-manager] failed to fetch messages for stability check", {
-              sessionId,
-              error: String(msgErr)
-            });
-          }
-        } else if (!isIdle) {
-          tracked.stableIdlePolls = 0;
-        }
-        log("[tmux-session-manager] session check", {
-          sessionId,
-          statusType: status?.type,
-          isIdle,
-          elapsedMs,
-          stableIdlePolls: tracked.stableIdlePolls,
-          lastMessageCount: tracked.lastMessageCount,
-          missingSince,
-          missingTooLong,
-          isTimedOut,
-          shouldCloseViaStability
-        });
-        if (shouldCloseViaStability || missingTooLong || isTimedOut) {
-          sessionsToClose.push(sessionId);
-        }
-      }
-      for (const sessionId of sessionsToClose) {
-        log("[tmux-session-manager] closing session due to poll", { sessionId });
-        await this.closeSessionById(sessionId);
-      }
-    } catch (err) {
-      log("[tmux-session-manager] poll error", { error: String(err) });
+      this.pollingManager.stopPolling();
     }
   }
   async closeSessionById(sessionId) {
@@ -58230,7 +58624,7 @@ class TmuxSessionManager {
     }
     this.sessions.delete(sessionId);
     if (this.sessions.size === 0) {
-      this.stopPolling();
+      this.pollingManager.stopPolling();
     }
   }
   createEventHandler() {
@@ -58239,7 +58633,7 @@ class TmuxSessionManager {
     };
   }
   async cleanup() {
-    this.stopPolling();
+    this.pollingManager.stopPolling();
     if (this.sessions.size > 0) {
       log("[tmux-session-manager] closing all panes", { count: this.sessions.size });
       const state2 = this.sourcePaneId ? await queryWindowState(this.sourcePaneId) : null;
@@ -60766,13 +61160,13 @@ ACCUMULATED WISDOM:
 
 **For exploration (explore/librarian)**: ALWAYS background
 \`\`\`typescript
-task(subagent_type="explore", run_in_background=true, ...)
-task(subagent_type="librarian", run_in_background=true, ...)
+task(subagent_type="explore", load_skills=[], run_in_background=true, ...)
+task(subagent_type="librarian", load_skills=[], run_in_background=true, ...)
 \`\`\`
 
 **For task execution**: NEVER background
 \`\`\`typescript
-task(category="...", run_in_background=false, ...)
+task(category="...", load_skills=[...], run_in_background=false, ...)
 \`\`\`
 
 **Parallel task groups**: Invoke multiple in ONE message
@@ -61096,12 +61490,12 @@ ACCUMULATED WISDOM: [from notepad]
 <parallel_execution>
 **Exploration (explore/librarian)**: ALWAYS background
 \`\`\`typescript
-task(subagent_type="explore", run_in_background=true, ...)
+task(subagent_type="explore", load_skills=[], run_in_background=true, ...)
 \`\`\`
 
 **Task execution**: NEVER background
 \`\`\`typescript
-task(category="...", run_in_background=false, ...)
+task(category="...", load_skills=[...], run_in_background=false, ...)
 \`\`\`
 
 **Parallel task groups**: Invoke multiple in ONE message
@@ -62200,6 +62594,50 @@ var agentMetadata = {
 function isFactory(source) {
   return typeof source === "function";
 }
+function sanitizeMarkdownTableCell(value) {
+  return value.replace(/\r?\n/g, " ").replace(/\|/g, "\\|").replace(/\s+/g, " ").trim();
+}
+function isRecord3(value) {
+  return typeof value === "object" && value !== null;
+}
+function parseRegisteredAgentSummaries(input) {
+  if (!Array.isArray(input))
+    return [];
+  const result = [];
+  for (const item of input) {
+    if (!isRecord3(item))
+      continue;
+    const name = typeof item.name === "string" ? item.name : undefined;
+    if (!name)
+      continue;
+    const hidden = item.hidden;
+    if (hidden === true)
+      continue;
+    const disabled = item.disabled;
+    if (disabled === true)
+      continue;
+    const enabled = item.enabled;
+    if (enabled === false)
+      continue;
+    const description = typeof item.description === "string" ? item.description : "";
+    result.push({ name, description: sanitizeMarkdownTableCell(description) });
+  }
+  return result;
+}
+function buildCustomAgentMetadata(agentName, description) {
+  const shortDescription = sanitizeMarkdownTableCell(truncateDescription(description));
+  const safeAgentName = sanitizeMarkdownTableCell(agentName);
+  return {
+    category: "specialist",
+    cost: "CHEAP",
+    triggers: [
+      {
+        domain: `Custom agent: ${safeAgentName}`,
+        trigger: shortDescription || "Use when this agent's description matches the task"
+      }
+    ]
+  };
+}
 function buildAgent(source, model, categories, gitMasterConfig, browserProvider, disabledSkills) {
   const base = isFactory(source) ? source(model) : source;
   const categoryConfigs = categories ? { ...DEFAULT_CATEGORIES, ...categories } : DEFAULT_CATEGORIES;
@@ -62330,7 +62768,7 @@ function mapScopeToLocation(scope) {
     return "project";
   return "plugin";
 }
-async function createBuiltinAgents(disabledAgents = [], agentOverrides = {}, directory, systemDefaultModel, categories, gitMasterConfig, discoveredSkills = [], client2, browserProvider, uiSelectedModel, disabledSkills) {
+async function createBuiltinAgents(disabledAgents = [], agentOverrides = {}, directory, systemDefaultModel, categories, gitMasterConfig, discoveredSkills = [], customAgentSummaries, browserProvider, uiSelectedModel, disabledSkills) {
   const connectedProviders = readConnectedProvidersCache();
   const availableModels = await fetchAvailableModels(undefined, {
     connectedProviders: connectedProviders ?? undefined
@@ -62356,6 +62794,9 @@ async function createBuiltinAgents(disabledAgents = [], agentOverrides = {}, dir
     location: mapScopeToLocation(skill2.scope)
   }));
   const availableSkills = [...builtinAvailable, ...discoveredAvailable];
+  const registeredAgents = parseRegisteredAgentSummaries(customAgentSummaries);
+  const builtinAgentNames = new Set(Object.keys(agentSources).map((n) => n.toLowerCase()));
+  const disabledAgentNames = new Set(disabledAgents.map((n) => n.toLowerCase()));
   const pendingAgentConfigs = new Map;
   for (const [name, source] of Object.entries(agentSources)) {
     const agentName = name;
@@ -62407,6 +62848,20 @@ async function createBuiltinAgents(disabledAgents = [], agentOverrides = {}, dir
       });
     }
   }
+  for (const agent of registeredAgents) {
+    const lowerName = agent.name.toLowerCase();
+    if (builtinAgentNames.has(lowerName))
+      continue;
+    if (disabledAgentNames.has(lowerName))
+      continue;
+    if (availableAgents.some((a) => a.name.toLowerCase() === lowerName))
+      continue;
+    availableAgents.push({
+      name: agent.name,
+      description: agent.description,
+      metadata: buildCustomAgentMetadata(agent.name, agent.description)
+    });
+  }
   const sisyphusOverride = agentOverrides["sisyphus"];
   const sisyphusRequirement = AGENT_MODEL_REQUIREMENTS["sisyphus"];
   const hasSisyphusExplicitConfig = sisyphusOverride !== undefined;
@@ -62451,7 +62906,9 @@ async function createBuiltinAgents(disabledAgents = [], agentOverrides = {}, dir
       if (hephaestusResolution) {
         const { model: hephaestusModel, variant: hephaestusResolvedVariant } = hephaestusResolution;
         let hephaestusConfig = createHephaestusAgent(hephaestusModel, availableAgents, undefined, availableSkills, availableCategories);
-        hephaestusConfig = { ...hephaestusConfig, variant: hephaestusResolvedVariant ?? "medium" };
+        if (!hephaestusOverride?.variant) {
+          hephaestusConfig = { ...hephaestusConfig, variant: hephaestusResolvedVariant ?? "medium" };
+        }
         const hepOverrideCategory = hephaestusOverride?.category;
         if (hepOverrideCategory) {
           hephaestusConfig = applyCategoryOverride(hephaestusConfig, hepOverrideCategory, mergedCategories);
@@ -62862,8 +63319,8 @@ Or should I just note down this single fix?"
 **Research First:**
 \`\`\`typescript
 // Prompt structure: CONTEXT (what I'm doing) + GOAL (what I'm trying to achieve) + QUESTION (what I need to know) + REQUEST (what to find)
-task(subagent_type="explore", prompt="I'm refactoring [target] and need to understand its impact scope before making changes. Find all usages via lsp_find_references - show calling code, patterns of use, and potential breaking points.", run_in_background=true)
-task(subagent_type="explore", prompt="I'm about to modify [affected code] and need to ensure behavior preservation. Find existing test coverage - which tests exercise this code, what assertions exist, and any gaps in coverage.", run_in_background=true)
+task(subagent_type="explore", load_skills=[], prompt="I'm refactoring [target] and need to understand its impact scope before making changes. Find all usages via lsp_find_references - show calling code, patterns of use, and potential breaking points.", run_in_background=true)
+task(subagent_type="explore", load_skills=[], prompt="I'm about to modify [affected code] and need to ensure behavior preservation. Find existing test coverage - which tests exercise this code, what assertions exist, and any gaps in coverage.", run_in_background=true)
 \`\`\`
 
 **Interview Focus:**
@@ -62887,9 +63344,9 @@ task(subagent_type="explore", prompt="I'm about to modify [affected code] and ne
 \`\`\`typescript
 // Launch BEFORE asking user questions
 // Prompt structure: CONTEXT + GOAL + QUESTION + REQUEST
-task(subagent_type="explore", prompt="I'm building a new [feature] and want to maintain codebase consistency. Find similar implementations in this project - their structure, patterns used, and conventions to follow.", run_in_background=true)
-task(subagent_type="explore", prompt="I'm adding [feature type] to the project and need to understand existing conventions. Find how similar features are organized - file structure, naming patterns, and architectural approach.", run_in_background=true)
-task(subagent_type="librarian", prompt="I'm implementing [technology] and want to follow established best practices. Find official documentation and community recommendations - setup patterns, common pitfalls, and production-ready examples.", run_in_background=true)
+task(subagent_type="explore", load_skills=[], prompt="I'm building a new [feature] and want to maintain codebase consistency. Find similar implementations in this project - their structure, patterns used, and conventions to follow.", run_in_background=true)
+task(subagent_type="explore", load_skills=[], prompt="I'm adding [feature type] to the project and need to understand existing conventions. Find how similar features are organized - file structure, naming patterns, and architectural approach.", run_in_background=true)
+task(subagent_type="librarian", load_skills=[], prompt="I'm implementing [technology] and want to follow established best practices. Find official documentation and community recommendations - setup patterns, common pitfalls, and production-ready examples.", run_in_background=true)
 \`\`\`
 
 **Interview Focus** (AFTER research):
@@ -62928,7 +63385,7 @@ Based on your stack, I'd recommend NextAuth.js - it integrates well with Next.js
 
 Run this check:
 \`\`\`typescript
-task(subagent_type="explore", prompt="I'm assessing this project's test setup before planning work that may require TDD. I need to understand what testing capabilities exist. Find test infrastructure: package.json test scripts, config files (jest.config, vitest.config, pytest.ini), and existing test files. Report: 1) Does test infra exist? 2) What framework? 3) Example test patterns.", run_in_background=true)
+task(subagent_type="explore", load_skills=[], prompt="I'm assessing this project's test setup before planning work that may require TDD. I need to understand what testing capabilities exist. Find test infrastructure: package.json test scripts, config files (jest.config, vitest.config, pytest.ini), and existing test files. Report: 1) Does test infra exist? 2) What framework? 3) Example test patterns.", run_in_background=true)
 \`\`\`
 
 #### Step 2: Ask the Test Question (MANDATORY)
@@ -63026,13 +63483,13 @@ Add to draft immediately:
 
 **Research First:**
 \`\`\`typescript
-task(subagent_type="explore", prompt="I'm planning architectural changes and need to understand the current system design. Find existing architecture: module boundaries, dependency patterns, data flow, and key abstractions used.", run_in_background=true)
-task(subagent_type="librarian", prompt="I'm designing architecture for [domain] and want to make informed decisions. Find architectural best practices - proven patterns, trade-offs, and lessons learned from similar systems.", run_in_background=true)
+task(subagent_type="explore", load_skills=[], prompt="I'm planning architectural changes and need to understand the current system design. Find existing architecture: module boundaries, dependency patterns, data flow, and key abstractions used.", run_in_background=true)
+task(subagent_type="librarian", load_skills=[], prompt="I'm designing architecture for [domain] and want to make informed decisions. Find architectural best practices - proven patterns, trade-offs, and lessons learned from similar systems.", run_in_background=true)
 \`\`\`
 
 **Oracle Consultation** (recommend when stakes are high):
 \`\`\`typescript
-task(subagent_type="oracle", prompt="Architecture consultation needed: [context]...", run_in_background=false)
+task(subagent_type="oracle", load_skills=[], prompt="Architecture consultation needed: [context]...", run_in_background=false)
 \`\`\`
 
 **Interview Focus:**
@@ -63049,9 +63506,9 @@ task(subagent_type="oracle", prompt="Architecture consultation needed: [context]
 
 **Parallel Investigation:**
 \`\`\`typescript
-task(subagent_type="explore", prompt="I'm researching how to implement [feature] and need to understand current approach. Find how X is currently handled in this codebase - implementation details, edge cases covered, and any known limitations.", run_in_background=true)
-task(subagent_type="librarian", prompt="I'm implementing Y and need authoritative guidance. Find official documentation - API reference, configuration options, and recommended usage patterns.", run_in_background=true)
-task(subagent_type="librarian", prompt="I'm looking for battle-tested implementations of Z. Find open source projects that solve this - focus on production-quality code, how they handle edge cases, and any gotchas documented.", run_in_background=true)
+task(subagent_type="explore", load_skills=[], prompt="I'm researching how to implement [feature] and need to understand current approach. Find how X is currently handled in this codebase - implementation details, edge cases covered, and any known limitations.", run_in_background=true)
+task(subagent_type="librarian", load_skills=[], prompt="I'm implementing Y and need authoritative guidance. Find official documentation - API reference, configuration options, and recommended usage patterns.", run_in_background=true)
+task(subagent_type="librarian", load_skills=[], prompt="I'm looking for battle-tested implementations of Z. Find open source projects that solve this - focus on production-quality code, how they handle edge cases, and any gotchas documented.", run_in_background=true)
 \`\`\`
 
 **Interview Focus:**
@@ -63077,17 +63534,17 @@ task(subagent_type="librarian", prompt="I'm looking for battle-tested implementa
 
 **For Understanding Codebase:**
 \`\`\`typescript
-task(subagent_type="explore", prompt="I'm working on [topic] and need to understand how it's organized in this project. Find all related files - show the structure, patterns used, and conventions I should follow.", run_in_background=true)
+task(subagent_type="explore", load_skills=[], prompt="I'm working on [topic] and need to understand how it's organized in this project. Find all related files - show the structure, patterns used, and conventions I should follow.", run_in_background=true)
 \`\`\`
 
 **For External Knowledge:**
 \`\`\`typescript
-task(subagent_type="librarian", prompt="I'm integrating [library] and need to understand [specific feature]. Find official documentation - API details, configuration options, and recommended best practices.", run_in_background=true)
+task(subagent_type="librarian", load_skills=[], prompt="I'm integrating [library] and need to understand [specific feature]. Find official documentation - API details, configuration options, and recommended best practices.", run_in_background=true)
 \`\`\`
 
 **For Implementation Examples:**
 \`\`\`typescript
-task(subagent_type="librarian", prompt="I'm implementing [feature] and want to learn from existing solutions. Find open source implementations - focus on production-quality code, architecture decisions, and common patterns.", run_in_background=true)
+task(subagent_type="librarian", load_skills=[], prompt="I'm implementing [feature] and want to learn from existing solutions. Find open source implementations - focus on production-quality code, architecture decisions, and common patterns.", run_in_background=true)
 \`\`\`
 
 ## Interview Mode Anti-Patterns
@@ -63192,6 +63649,7 @@ todoWrite([
 \`\`\`typescript
 task(
   subagent_type="metis",
+  load_skills=[],
   prompt=\`Review this planning session before I generate the work plan:
 
   **User's Goal**: {summarize what user wants}
@@ -63364,6 +63822,7 @@ var PROMETHEUS_HIGH_ACCURACY_MODE = `# PHASE 3: PLAN GENERATION
 while (true) {
   const result = task(
     subagent_type="momus",
+    load_skills=[],
     prompt=".sisyphus/plans/{name}.md",
     run_in_background=false
   )
@@ -64735,9 +65194,8 @@ function createWebsearchConfig(config3) {
   }
   return {
     type: "remote",
-    url: "https://mcp.exa.ai/mcp?tools=web_search_exa",
+    url: process.env.EXA_API_KEY ? `https://mcp.exa.ai/mcp?tools=web_search_exa&exaApiKey=${encodeURIComponent(process.env.EXA_API_KEY)}` : "https://mcp.exa.ai/mcp?tools=web_search_exa",
     enabled: true,
-    headers: process.env.EXA_API_KEY ? { "x-api-key": process.env.EXA_API_KEY } : undefined,
     oauth: false
   };
 }
@@ -64780,6 +65238,31 @@ init_shared();
 init_migration();
 init_model_requirements();
 init_constants4();
+
+// src/plugin-handlers/plan-model-inheritance.ts
+var MODEL_SETTINGS_KEYS = [
+  "model",
+  "variant",
+  "temperature",
+  "top_p",
+  "maxTokens",
+  "thinking",
+  "reasoningEffort",
+  "textVerbosity",
+  "providerOptions"
+];
+function buildPlanDemoteConfig(prometheusConfig, planOverride) {
+  const modelSettings = {};
+  for (const key of MODEL_SETTINGS_KEYS) {
+    const value = planOverride?.[key] ?? prometheusConfig?.[key];
+    if (value !== undefined) {
+      modelSettings[key] = value;
+    }
+  }
+  return { mode: "subagent", ...modelSettings };
+}
+
+// src/plugin-handlers/config-handler.ts
 function resolveCategoryConfig2(categoryName, userCategories) {
   return userCategories?.[categoryName] ?? DEFAULT_CATEGORIES[categoryName];
 }
@@ -64884,7 +65367,24 @@ function createConfigHandler(deps) {
     const browserProvider = pluginConfig.browser_automation_engine?.provider ?? "playwright";
     const currentModel = config3.model;
     const disabledSkills = new Set(pluginConfig.disabled_skills ?? []);
-    const builtinAgents = await createBuiltinAgents(migratedDisabledAgents, pluginConfig.agents, ctx.directory, undefined, pluginConfig.categories, pluginConfig.git_master, allDiscoveredSkills, ctx.client, browserProvider, currentModel, disabledSkills);
+    const configAgent = config3.agent;
+    function isRecord4(value) {
+      return typeof value === "object" && value !== null;
+    }
+    function buildCustomAgentSummaryInput(agents) {
+      if (!agents)
+        return [];
+      const result = [];
+      for (const [name, value] of Object.entries(agents)) {
+        if (!isRecord4(value))
+          continue;
+        const description = typeof value.description === "string" ? value.description : "";
+        const hidden = value.hidden === true;
+        const disabled = value.disabled === true || value.enabled === false;
+        result.push({ name, description, hidden, disabled });
+      }
+      return result;
+    }
     const userAgents = pluginConfig.claude_code?.agents ?? true ? loadUserAgents() : {};
     const projectAgents = pluginConfig.claude_code?.agents ?? true ? loadProjectAgents() : {};
     const rawPluginAgents = pluginComponents.agents;
@@ -64892,12 +65392,18 @@ function createConfigHandler(deps) {
       k,
       v ? migrateAgentConfig(v) : v
     ]));
+    const customAgentSummaries = [
+      ...buildCustomAgentSummaryInput(configAgent),
+      ...buildCustomAgentSummaryInput(userAgents),
+      ...buildCustomAgentSummaryInput(projectAgents),
+      ...buildCustomAgentSummaryInput(pluginAgents)
+    ];
+    const builtinAgents = await createBuiltinAgents(migratedDisabledAgents, pluginConfig.agents, ctx.directory, undefined, pluginConfig.categories, pluginConfig.git_master, allDiscoveredSkills, customAgentSummaries, browserProvider, currentModel, disabledSkills);
     const isSisyphusEnabled = pluginConfig.sisyphus_agent?.disabled !== true;
     const builderEnabled = pluginConfig.sisyphus_agent?.default_builder_enabled ?? false;
     const plannerEnabled = pluginConfig.sisyphus_agent?.planner_enabled ?? true;
     const replacePlan = pluginConfig.sisyphus_agent?.replace_plan ?? true;
     const shouldDemotePlan = plannerEnabled && replacePlan;
-    const configAgent = config3.agent;
     if (isSisyphusEnabled && builtinAgents.sisyphus) {
       config3.default_agent = "sisyphus";
       const agentConfig = {
@@ -64984,9 +65490,7 @@ function createConfigHandler(deps) {
         value ? migrateAgentConfig(value) : value
       ])) : {};
       const migratedBuild = configAgent?.build ? migrateAgentConfig(configAgent.build) : {};
-      const planDemoteConfig = shouldDemotePlan ? {
-        mode: "subagent"
-      } : undefined;
+      const planDemoteConfig = shouldDemotePlan ? buildPlanDemoteConfig(agentConfig["prometheus"], pluginConfig.agents?.plan) : undefined;
       config3.agent = {
         ...agentConfig,
         ...Object.fromEntries(Object.entries(builtinAgents).filter(([k]) => k !== "sisyphus")),
@@ -65022,6 +65526,7 @@ function createConfigHandler(deps) {
     };
     const isCliRunMode = process.env.OPENCODE_CLI_RUN_MODE === "true";
     const questionPermission = isCliRunMode ? "deny" : "allow";
+    const todoPermission = pluginConfig.experimental?.task_system ? { todowrite: "deny", todoread: "deny" } : {};
     if (agentResult.librarian) {
       const agent = agentResult.librarian;
       agent.permission = { ...agent.permission, "grep_app_*": "allow" };
@@ -65032,23 +65537,23 @@ function createConfigHandler(deps) {
     }
     if (agentResult["atlas"]) {
       const agent = agentResult["atlas"];
-      agent.permission = { ...agent.permission, task: "allow", call_omo_agent: "deny", "task_*": "allow", teammate: "allow" };
+      agent.permission = { ...agent.permission, ...todoPermission, task: "allow", call_omo_agent: "deny", "task_*": "allow", teammate: "allow" };
     }
     if (agentResult.sisyphus) {
       const agent = agentResult.sisyphus;
-      agent.permission = { ...agent.permission, call_omo_agent: "deny", task: "allow", question: questionPermission, "task_*": "allow", teammate: "allow" };
+      agent.permission = { ...agent.permission, ...todoPermission, call_omo_agent: "deny", task: "allow", question: questionPermission, "task_*": "allow", teammate: "allow" };
     }
     if (agentResult.hephaestus) {
       const agent = agentResult.hephaestus;
-      agent.permission = { ...agent.permission, call_omo_agent: "deny", task: "allow", question: questionPermission };
+      agent.permission = { ...agent.permission, ...todoPermission, call_omo_agent: "deny", task: "allow", question: questionPermission };
     }
     if (agentResult["prometheus"]) {
       const agent = agentResult["prometheus"];
-      agent.permission = { ...agent.permission, call_omo_agent: "deny", task: "allow", question: questionPermission, "task_*": "allow", teammate: "allow" };
+      agent.permission = { ...agent.permission, ...todoPermission, call_omo_agent: "deny", task: "allow", question: questionPermission, "task_*": "allow", teammate: "allow" };
     }
     if (agentResult["sisyphus-junior"]) {
       const agent = agentResult["sisyphus-junior"];
-      agent.permission = { ...agent.permission, task: "allow", "task_*": "allow", teammate: "allow" };
+      agent.permission = { ...agent.permission, ...todoPermission, task: "allow", "task_*": "allow", teammate: "allow" };
     }
     config3.permission = {
       ...config3.permission,
@@ -65264,10 +65769,6 @@ var OhMyOpenCodePlugin = async (ctx) => {
     backgroundManager,
     config: pluginConfig.babysitting
   }), { enabled: safeHookEnabled }) : null;
-  if (sessionRecovery && todoContinuationEnforcer) {
-    sessionRecovery.setOnAbortCallback(todoContinuationEnforcer.markRecovering);
-    sessionRecovery.setOnRecoveryCompleteCallback(todoContinuationEnforcer.markRecoveryComplete);
-  }
   const backgroundNotificationHook = isHookEnabled("background-notification") ? safeCreateHook("background-notification", () => createBackgroundNotificationHook(backgroundManager), { enabled: safeHookEnabled }) : null;
   const backgroundTools = createBackgroundTools(backgroundManager, ctx.client);
   const callOmoAgent = createCallOmoAgent(ctx, backgroundManager);
@@ -65322,6 +65823,7 @@ var OhMyOpenCodePlugin = async (ctx) => {
     disabledSkills,
     availableCategories,
     availableSkills,
+    agentOverrides: pluginConfig.agents,
     onSyncSessionCreated: async (event) => {
       log("[index] onSyncSessionCreated callback", {
         sessionID: event.sessionID,
@@ -65367,6 +65869,14 @@ var OhMyOpenCodePlugin = async (ctx) => {
     modelCacheState
   });
   const taskSystemEnabled = pluginConfig.experimental?.task_system ?? false;
+  if (sessionRecovery && todoContinuationEnforcer) {
+    sessionRecovery.setOnAbortCallback((sessionID) => {
+      todoContinuationEnforcer?.markRecovering(sessionID);
+    });
+    sessionRecovery.setOnRecoveryCompleteCallback((sessionID) => {
+      todoContinuationEnforcer?.markRecoveryComplete(sessionID);
+    });
+  }
   const taskToolsRecord = taskSystemEnabled ? {
     task_create: createTaskCreateTool(pluginConfig, ctx),
     task_get: createTaskGetTool(pluginConfig),