oh-my-copilot 4.11.2 → 4.11.4

package/.claude-plugin/marketplace.json

@@ -4,16 +4,16 @@
   "description": "Copilot CLI native multi-agent orchestration - intelligent model routing, 18 agents, 32 skills",
   "owner": {
     "name": "Robin Norberg",
-    "email": "robin@norberg.dev"
+    "email": "github@platypus.se"
   },
   "plugins": [
     {
       "name": "oh-my-copilot",
       "description": "Copilot CLI native multi-agent orchestration with intelligent model routing, 18 agent variants, and 32 powerful skills. Zero learning curve. Maximum power.",
-      "version": "4.11.2",
+      "version": "4.11.4",
       "author": {
         "name": "Robin Norberg",
-        "email": "robin@norberg.dev"
+        "email": "github@platypus.se"
       },
       "source": "./",
       "category": "productivity",
@@ -27,5 +27,5 @@
       ]
     }
   ],
-  "version": "4.11.2"
+  "version": "4.11.4"
 }

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-my-copilot",
-  "version": "4.11.2",
+  "version": "4.11.4",
   "description": "Multi-agent orchestration system for Copilot CLI",
   "author": {
     "name": "Robin Norberg and oh-my-copilot contributors"

package/README.md

@@ -32,7 +32,7 @@
 ```bash
 # Step 1: Install
 /plugin marketplace add https://github.com/RobinNorberg/oh-my-copilot
-/plugin install oh-my-copilot
+/plugin install oh-my-copilot@omg
 # or
 npm i -g oh-my-copilot@latest
 

package/bridge/cli.cjs

@@ -4210,7 +4210,14 @@ function resolveTranscriptPath(transcriptPath, cwd2) {
       stdio: ["pipe", "pipe", "pipe"]
     }).trim();
     const absoluteCommonDir = (0, import_path17.resolve)(effectiveCwd, gitCommonDir);
-    const mainRepoRoot = (0, import_path17.dirname)(absoluteCommonDir);
+    let mainRepoRoot = (0, import_path17.dirname)(absoluteCommonDir);
+    if (mainRepoRoot.endsWith((0, import_path17.join)(".git", "worktrees"))) {
+      mainRepoRoot = (0, import_path17.dirname)((0, import_path17.dirname)(mainRepoRoot));
+    }
+    try {
+      mainRepoRoot = (0, import_fs11.realpathSync)(mainRepoRoot);
+    } catch {
+    }
     const worktreeTop = (0, import_child_process6.execSync)("git rev-parse --show-toplevel", {
       cwd: effectiveCwd,
       encoding: "utf-8",
@@ -5344,7 +5351,7 @@ function safeRealpathSync(filePath) {
 }
 function isWithinBoundary(realPath, boundary) {
   const normalizedReal = (0, import_path22.normalize)(realPath);
-  const normalizedBoundary = (0, import_path22.normalize)(boundary);
+  const normalizedBoundary = (0, import_path22.normalize)(safeRealpathSync(boundary));
   return normalizedReal === normalizedBoundary || normalizedReal.startsWith(normalizedBoundary + import_path22.sep);
 }
 function findSkillFiles(projectRoot, options) {
@@ -6787,6 +6794,14 @@ function getRuntimePackageVersion() {
     }
   } catch {
   }
+  try {
+    const __filename5 = (0, import_url8.fileURLToPath)(importMetaUrl);
+    const pathMatch = __filename5.match(/oh-my-copilot\/(\d+\.\d+\.\d+[^/]*)\//);
+    if (pathMatch?.[1]) {
+      return pathMatch[1];
+    }
+  } catch {
+  }
   return "unknown";
 }
 var import_fs28, import_path40, import_url8;
@@ -6800,10 +6815,10 @@ var init_version = __esm({
 });
 
 // src/utils/resolve-node.ts
+function isKnownEphemeralNodePath(nodePath) {
+  return EPHEMERAL_NODE_PATH_MARKERS.some((marker) => nodePath.includes(marker));
+}
 function resolveNodeBinary() {
-  if (process.execPath && (0, import_fs29.existsSync)(process.execPath)) {
-    return process.execPath;
-  }
   try {
     const cmd = process.platform === "win32" ? "where node" : "which node";
     const result = (0, import_child_process11.execSync)(cmd, { encoding: "utf-8", stdio: "pipe" }).trim().split("\n")[0].trim();
@@ -6812,6 +6827,9 @@ function resolveNodeBinary() {
     }
   } catch {
   }
+  if (process.execPath && (0, import_fs29.existsSync)(process.execPath) && !isKnownEphemeralNodePath(process.execPath)) {
+    return process.execPath;
+  }
   if (process.platform === "win32") {
     return "node";
   }
@@ -6861,7 +6879,7 @@ function pickLatestVersion(versions) {
     return 0;
   })[0];
 }
-var import_fs29, import_child_process11, import_path41, import_os9;
+var import_fs29, import_child_process11, import_path41, import_os9, EPHEMERAL_NODE_PATH_MARKERS;
 var init_resolve_node = __esm({
   "src/utils/resolve-node.ts"() {
     "use strict";
@@ -6869,6 +6887,7 @@ var init_resolve_node = __esm({
     import_child_process11 = require("child_process");
     import_path41 = require("path");
     import_os9 = require("os");
+    EPHEMERAL_NODE_PATH_MARKERS = ["hostedtoolcache", "/runner/", "\\runner\\"];
   }
 });
 
@@ -7080,12 +7099,12 @@ function isHudEnabledInConfig() {
 function isOmcStatusLine(statusLine) {
   if (!statusLine) return false;
   if (typeof statusLine === "string") {
-    return statusLine.includes("omc-hud");
+    return statusLine.includes("omc-hud") || statusLine.includes("copilot-hud.cmd") || statusLine.includes("oh-my-copilot");
   }
   if (typeof statusLine === "object") {
     const sl = statusLine;
     if (typeof sl.command === "string") {
-      return sl.command.includes("omc-hud");
+      return sl.command.includes("omc-hud") || sl.command.includes("copilot-hud.cmd") || sl.command.includes("oh-my-copilot");
     }
   }
   return false;
@@ -7187,16 +7206,20 @@ function hasEnabledOmcPlugin() {
   }
   try {
     const settings = JSON.parse((0, import_fs30.readFileSync)(SETTINGS_FILE, "utf-8"));
-    const plugins = settings.plugins;
-    if (Array.isArray(plugins)) {
-      return plugins.some(
-        (plugin) => typeof plugin === "string" && plugin.toLowerCase().includes("oh-my-copilot")
-      );
-    }
-    if (plugins && typeof plugins === "object") {
-      return Object.entries(plugins).some(
-        ([pluginId, value]) => pluginId.toLowerCase().includes("oh-my-copilot") && value !== false
-      );
+    for (const candidate of [settings.enabledPlugins, settings.plugins]) {
+      if (Array.isArray(candidate)) {
+        if (candidate.some(
+          (plugin) => typeof plugin === "string" && plugin.toLowerCase().includes("oh-my-copilot")
+        )) {
+          return true;
+        }
+      } else if (candidate && typeof candidate === "object") {
+        if (Object.entries(candidate).some(
+          ([pluginId, value]) => pluginId.toLowerCase().includes("oh-my-copilot") && value !== false
+        )) {
+          return true;
+        }
+      }
     }
   } catch {
   }
@@ -7702,9 +7725,17 @@ function install(options = {}) {
       }
       if (hudScriptPath) {
         const nodeBin = resolveNodeBinary();
-        const absoluteCommand = '"' + nodeBin + '" "' + hudScriptPath.replace(/\\/g, "/") + '"';
-        let statusLineCommand = absoluteCommand;
-        if (!isWindows()) {
+        let statusLineCommand;
+        if (isWindows()) {
+          const cmdWrapperPath = (0, import_path42.join)(COPILOT_CONFIG_DIR, "copilot-hud.cmd");
+          const hudPathNormalized = hudScriptPath.replace(/\//g, "\\");
+          const nodeBinNormalized = nodeBin.replace(/\//g, "\\");
+          (0, import_fs30.writeFileSync)(cmdWrapperPath, `@echo off\r
+"${nodeBinNormalized}" "${hudPathNormalized}"\r
+`);
+          statusLineCommand = cmdWrapperPath.replace(/\\/g, "/");
+          log3("  Created Windows HUD wrapper: copilot-hud.cmd");
+        } else {
           try {
             const findNodeSrc = (0, import_path42.join)(getPackageDir3(), "scripts", "find-node.sh");
             const findNodeDest = (0, import_path42.join)(HUD_DIR, "find-node.sh");
@@ -7715,23 +7746,33 @@ function install(options = {}) {
             statusLineCommand = "node ${COPILOT_CONFIG_DIR:-$HOME/.copilot}/hud/omc-hud.mjs";
           }
         }
-        const needsMigration = typeof existingSettings.statusLine === "string" && isOmcStatusLine(existingSettings.statusLine);
-        if (!existingSettings.statusLine || needsMigration) {
-          existingSettings.statusLine = {
-            type: "command",
-            command: statusLineCommand
-          };
-          log3(needsMigration ? "  Migrated statusLine from legacy string to object format" : "  Configured statusLine");
-        } else if (options.force && isOmcStatusLine(existingSettings.statusLine)) {
-          existingSettings.statusLine = {
-            type: "command",
-            command: statusLineCommand
-          };
-          log3("  Updated statusLine (--force)");
-        } else if (options.force) {
-          log3("  statusLine owned by another tool, preserving (use manual edit to override)");
-        } else {
-          log3("  statusLine already configured, skipping (use --force to override)");
+        try {
+          let copilotConfig = {};
+          if ((0, import_fs30.existsSync)(COPILOT_CONFIG_FILE)) {
+            copilotConfig = JSON.parse((0, import_fs30.readFileSync)(COPILOT_CONFIG_FILE, "utf-8"));
+          }
+          copilotConfig.experimental = true;
+          const existingStatusLine = copilotConfig.statusLine;
+          const needsMigration = typeof existingStatusLine === "string" && isOmcStatusLine(existingStatusLine);
+          if (!existingStatusLine || needsMigration) {
+            copilotConfig.statusLine = { type: "command", command: statusLineCommand };
+            (0, import_fs30.writeFileSync)(COPILOT_CONFIG_FILE, JSON.stringify(copilotConfig, null, 2));
+            log3(needsMigration ? "  Migrated statusLine to config.json" : "  Configured statusLine in config.json");
+          } else if (options.force && isOmcStatusLine(existingStatusLine)) {
+            copilotConfig.statusLine = { type: "command", command: statusLineCommand };
+            (0, import_fs30.writeFileSync)(COPILOT_CONFIG_FILE, JSON.stringify(copilotConfig, null, 2));
+            log3("  Updated statusLine in config.json (--force)");
+          } else if (options.force) {
+            log3("  statusLine owned by another tool, preserving (use manual edit to override)");
+          } else {
+            log3("  statusLine already configured in config.json, skipping");
+          }
+        } catch (error2) {
+          log3(`  Warning: Could not update config.json: ${error2 instanceof Error ? error2.message : error2}`);
+        }
+        if (existingSettings.statusLine && isOmcStatusLine(existingSettings.statusLine)) {
+          delete existingSettings.statusLine;
+          log3("  Removed legacy statusLine from settings.json");
         }
       }
       try {
@@ -7823,7 +7864,7 @@ function getInstallInfo() {
     return null;
   }
 }
-var import_fs30, import_path42, import_url9, import_os10, import_child_process12, COPILOT_CONFIG_DIR, AGENTS_DIR, COMMANDS_DIR, SKILLS_DIR, HOOKS_DIR, HUD_DIR, SETTINGS_FILE, VERSION_FILE, CORE_COMMANDS, VERSION, OMC_VERSION_MARKER_PATTERN, CC_NATIVE_COMMANDS, SKININTHEGAMEBROS_ONLY_SKILLS, OMC_HOOK_FILENAMES;
+var import_fs30, import_path42, import_url9, import_os10, import_child_process12, COPILOT_CONFIG_DIR, AGENTS_DIR, COMMANDS_DIR, SKILLS_DIR, HOOKS_DIR, HUD_DIR, SETTINGS_FILE, COPILOT_CONFIG_FILE, VERSION_FILE, CORE_COMMANDS, VERSION, OMC_VERSION_MARKER_PATTERN, CC_NATIVE_COMMANDS, SKININTHEGAMEBROS_ONLY_SKILLS, OMC_HOOK_FILENAMES;
 var init_installer = __esm({
   "src/installer/index.ts"() {
     "use strict";
@@ -7846,6 +7887,7 @@ var init_installer = __esm({
     HOOKS_DIR = (0, import_path42.join)(COPILOT_CONFIG_DIR, "hooks");
     HUD_DIR = (0, import_path42.join)(COPILOT_CONFIG_DIR, "hud");
     SETTINGS_FILE = (0, import_path42.join)(COPILOT_CONFIG_DIR, "settings.json");
+    COPILOT_CONFIG_FILE = (0, import_path42.join)(COPILOT_CONFIG_DIR, "config.json");
     VERSION_FILE = (0, import_path42.join)(COPILOT_CONFIG_DIR, ".omc-version.json");
     CORE_COMMANDS = [];
     VERSION = getRuntimePackageVersion();
@@ -15963,9 +16005,13 @@ async function checkRalplan(sessionId, directory, cancelInProgress) {
   const breakerCount = readStopBreaker(workingDir, "ralplan", sessionId, RALPLAN_STOP_BLOCKER_TTL_MS) + 1;
   if (breakerCount > RALPLAN_STOP_BLOCKER_MAX) {
     writeStopBreaker(workingDir, "ralplan", 0, sessionId);
+    state.active = false;
+    state.deactivated_reason = "stop_breaker_exhausted";
+    state.completed_at = (/* @__PURE__ */ new Date()).toISOString();
+    writeModeState("ralplan", state, workingDir, sessionId);
     return {
       shouldBlock: false,
-      message: `[RALPLAN CIRCUIT BREAKER] Stop enforcement exceeded ${RALPLAN_STOP_BLOCKER_MAX} reinforcements. Allowing stop to prevent infinite blocking.`,
+      message: `[RALPLAN CIRCUIT BREAKER] Stop enforcement exceeded ${RALPLAN_STOP_BLOCKER_MAX} reinforcements. Allowing stop and deactivating stale ralplan state to prevent infinite restart loops.`,
       mode: "ralplan"
     };
   }
@@ -23247,10 +23293,16 @@ function safeRealpath(p) {
   try {
     return (0, import_fs58.realpathSync)(p);
   } catch {
-    const parent = (0, import_path75.dirname)(p);
-    const name = (0, import_path75.basename)(p);
+    const segments = [];
+    let current = (0, import_path75.resolve)(p);
+    while (!(0, import_fs58.existsSync)(current)) {
+      segments.unshift((0, import_path75.basename)(current));
+      const parent = (0, import_path75.dirname)(current);
+      if (parent === current) break;
+      current = parent;
+    }
     try {
-      return (0, import_path75.resolve)((0, import_fs58.realpathSync)(parent), name);
+      return (0, import_path75.join)((0, import_fs58.realpathSync)(current), ...segments);
     } catch {
       return (0, import_path75.resolve)(p);
     }
@@ -34733,10 +34785,11 @@ function renderAgentsMultiLine(agents, maxLines = 5) {
     const durationMs = now - a.startTime.getTime();
     const duration3 = formatDurationPadded(durationMs);
     const durationColor = getDurationColor(durationMs);
+    const modelLabel = a.model ? a.model.charAt(0).toUpperCase() + a.model.slice(1).toLowerCase() : "Default";
     const desc = a.description || "...";
-    const truncatedDesc = truncateToWidth(desc, 45);
+    const truncatedDesc = truncateToWidth(desc, 40);
     detailLines.push(
-      `${dim(prefix)} ${color}${code}${RESET} ${dim(shortName)}${durationColor}${duration3}${RESET}  ${truncatedDesc}`
+      `${dim(prefix)} ${color}${code}${RESET} ${dim(shortName)}${durationColor}${duration3}${RESET}  ${dim(`(${modelLabel})`)} ${truncatedDesc}`
     );
   });
   if (running.length > maxLines) {
@@ -70711,6 +70764,33 @@ function isConsensusPlanningSkillInvocation(skillName, toolInput) {
   }
   return getSkillInvocationArgs(toolInput).toLowerCase().includes("--consensus");
 }
+function deactivateRalplanState(directory, sessionId) {
+  const state = readModeState("ralplan", directory, sessionId);
+  if (!state) {
+    return;
+  }
+  const currentPhase = typeof state.current_phase === "string" ? state.current_phase : void 0;
+  const terminalPhases = /* @__PURE__ */ new Set([
+    "complete",
+    "completed",
+    "failed",
+    "cancelled",
+    "done"
+  ]);
+  const completedAt = typeof state.completed_at === "string" ? state.completed_at : (/* @__PURE__ */ new Date()).toISOString();
+  writeModeState(
+    "ralplan",
+    {
+      ...state,
+      active: false,
+      current_phase: currentPhase && terminalPhases.has(currentPhase.toLowerCase()) ? currentPhase : "complete",
+      completed_at: completedAt,
+      deactivated_reason: typeof state.deactivated_reason === "string" ? state.deactivated_reason : "skill_completed"
+    },
+    directory,
+    sessionId
+  );
+}
 function activateRalplanState(directory, sessionId) {
   writeModeState(
     "ralplan",
@@ -71651,6 +71731,9 @@ async function processPostToolUse(input) {
     if (!currentState || !currentState.active || currentState.skill_name === completingSkill) {
       clearSkillActiveState2(directory, input.sessionId);
     }
+    if (isConsensusPlanningSkillInvocation(skillName, input.toolInput)) {
+      deactivateRalplanState(directory, input.sessionId);
+    }
   }
   const orchestratorResult = processOrchestratorPostTool(
     {
@@ -77947,10 +78030,14 @@ function parseEvaluatorResult(raw) {
   return result.score === void 0 ? { pass: result.pass } : { pass: result.pass, score: result.score };
 }
 async function loadAutoresearchMissionContract(missionDirArg) {
-  const missionDir = (0, import_path109.resolve)(missionDirArg);
+  let missionDir = (0, import_path109.resolve)(missionDirArg);
   if (!(0, import_fs91.existsSync)(missionDir)) {
     throw contractError(`mission-dir does not exist: ${missionDir}`);
   }
+  try {
+    missionDir = (0, import_fs91.realpathSync)(missionDir);
+  } catch {
+  }
   const repoRoot = readGit(missionDir, ["rev-parse", "--show-toplevel"]);
   ensurePathInside(repoRoot, missionDir);
   const missionFile = (0, import_path109.join)(missionDir, "mission.md");
@@ -79345,9 +79432,13 @@ function resolveMissionRepoRoot(missionDir) {
     stdio: ["ignore", "pipe", "pipe"]
   }).trim();
 }
+function tmuxEnv() {
+  const { TMUX: _, ...env2 } = process.env;
+  return env2;
+}
 function assertTmuxSessionAvailable(sessionName2) {
   try {
-    (0, import_child_process40.execFileSync)("tmux", ["has-session", "-t", sessionName2], { stdio: "ignore" });
+    (0, import_child_process40.execFileSync)("tmux", ["has-session", "-t", sessionName2], { stdio: "ignore", env: tmuxEnv() });
   } catch {
     throw new Error(
       `tmux session "${sessionName2}" did not stay available after launch. Check the mission command, login-shell environment, and tmux logs, then try again.`
@@ -79360,7 +79451,7 @@ function spawnAutoresearchTmux(missionDir, slug) {
   }
   const sessionName2 = `omc-autoresearch-${slug}`;
   try {
-    (0, import_child_process40.execFileSync)("tmux", ["has-session", "-t", sessionName2], { stdio: "ignore" });
+    (0, import_child_process40.execFileSync)("tmux", ["has-session", "-t", sessionName2], { stdio: "ignore", env: tmuxEnv() });
     throw new Error(
       `tmux session "${sessionName2}" already exists.
   Attach: tmux attach -t ${sessionName2}
@@ -79376,7 +79467,7 @@ function spawnAutoresearchTmux(missionDir, slug) {
   const omcPath = (0, import_path112.resolve)((0, import_path112.join)(__dirname, "..", "..", "bin", "omc.js"));
   const command = buildTmuxShellCommand(process.execPath, [omcPath, "autoresearch", missionDir]);
   const wrappedCommand = wrapWithLoginShell(command);
-  (0, import_child_process40.execFileSync)("tmux", ["new-session", "-d", "-s", sessionName2, "-c", repoRoot, wrappedCommand], { stdio: "ignore" });
+  (0, import_child_process40.execFileSync)("tmux", ["new-session", "-d", "-s", sessionName2, "-c", repoRoot, wrappedCommand], { stdio: "ignore", env: tmuxEnv() });
   assertTmuxSessionAvailable(sessionName2);
   console.log("\nAutoresearch launched in background tmux session.");
   console.log(`  Session:  ${sessionName2}`);
@@ -79426,12 +79517,12 @@ function spawnAutoresearchSetupTmux(repoRoot) {
   const paneId = (0, import_child_process40.execFileSync)(
     "tmux",
     ["new-session", "-d", "-P", "-F", "#{pane_id}", "-s", sessionName2, "-c", repoRoot, wrappedClaudeCommand],
-    { encoding: "utf-8" }
+    { encoding: "utf-8", env: tmuxEnv() }
   ).trim();
   assertTmuxSessionAvailable(sessionName2);
   if (paneId) {
-    (0, import_child_process40.execFileSync)("tmux", ["send-keys", "-t", paneId, "-l", buildAutoresearchSetupSlashCommand()], { stdio: "ignore" });
-    (0, import_child_process40.execFileSync)("tmux", ["send-keys", "-t", paneId, "Enter"], { stdio: "ignore" });
+    (0, import_child_process40.execFileSync)("tmux", ["send-keys", "-t", paneId, "-l", buildAutoresearchSetupSlashCommand()], { stdio: "ignore", env: tmuxEnv() });
+    (0, import_child_process40.execFileSync)("tmux", ["send-keys", "-t", paneId, "Enter"], { stdio: "ignore", env: tmuxEnv() });
   }
   console.log("\nAutoresearch setup launched in background Claude session.");
   console.log(`  Session:  ${sessionName2}`);

package/bridge/runtime-cli.cjs

@@ -1931,10 +1931,16 @@ function safeRealpath(p) {
   try {
     return (0, import_fs7.realpathSync)(p);
   } catch {
-    const parent = (0, import_path10.dirname)(p);
-    const name = (0, import_path10.basename)(p);
+    const segments = [];
+    let current = (0, import_path10.resolve)(p);
+    while (!(0, import_fs7.existsSync)(current)) {
+      segments.unshift((0, import_path10.basename)(current));
+      const parent = (0, import_path10.dirname)(current);
+      if (parent === current) break;
+      current = parent;
+    }
     try {
-      return (0, import_path10.resolve)((0, import_fs7.realpathSync)(parent), name);
+      return (0, import_path10.join)((0, import_fs7.realpathSync)(current), ...segments);
     } catch {
       return (0, import_path10.resolve)(p);
     }

package/bridge/team-bridge.cjs

@@ -103,10 +103,16 @@ function safeRealpath(p) {
   try {
     return (0, import_fs.realpathSync)(p);
   } catch {
-    const parent = (0, import_path.dirname)(p);
-    const name = (0, import_path.basename)(p);
+    const segments = [];
+    let current = (0, import_path.resolve)(p);
+    while (!(0, import_fs.existsSync)(current)) {
+      segments.unshift((0, import_path.basename)(current));
+      const parent = (0, import_path.dirname)(current);
+      if (parent === current) break;
+      current = parent;
+    }
     try {
-      return (0, import_path.resolve)((0, import_fs.realpathSync)(parent), name);
+      return (0, import_path.join)((0, import_fs.realpathSync)(current), ...segments);
     } catch {
       return (0, import_path.resolve)(p);
     }