@iislee/opencodex 2.11.0

package/src/cli/system-command.ts

@@ -0,0 +1,112 @@
+import {
+  CliUsageError,
+  printData,
+  rejectArgs,
+  runCliAction,
+  runtimeRequest,
+  summaryLines,
+  takeBooleanOption,
+  takeFlag,
+  takeOption,
+  type RuntimeApiDeps,
+} from "./runtime-api";
+
+const USAGE = `Usage:
+  ocx system [status] [--json]
+  ocx system settings [--auto-start <on|off>] [--stream-mode <auto|legacy-tee|eager-relay>] [--json]
+  ocx system startup <health|install-service|install-shim> [--json]
+  ocx system diagnostics [--json]
+  ocx system sync [--json]
+  ocx system update check [--channel <latest|preview>] [--json]
+  ocx system update run [--channel <latest|preview>] [--restart <on|off>] --yes [--json]
+  ocx system update status <job-id> [--json]`;
+
+async function status(argv: string[], deps: RuntimeApiDeps): Promise<void> {
+  const args = [...argv];
+  const wantsJson = takeFlag(args, "--json");
+  rejectArgs(args, USAGE);
+  const [settings, startup, memory] = await Promise.all([
+    runtimeRequest("/api/settings", {}, deps),
+    runtimeRequest("/api/startup-health", {}, deps),
+    runtimeRequest("/api/system/memory", {}, deps),
+  ]);
+  const result = { settings, startup, memory };
+  printData(result, wantsJson, summaryLines(result));
+}
+
+async function settings(argv: string[], deps: RuntimeApiDeps): Promise<void> {
+  const args = [...argv];
+  const wantsJson = takeFlag(args, "--json");
+  const autoStart = takeBooleanOption(args, "--auto-start");
+  const streamMode = takeOption(args, "--stream-mode");
+  rejectArgs(args, USAGE);
+  if (autoStart === undefined && streamMode === undefined) {
+    const result = await runtimeRequest("/api/settings", {}, deps);
+    printData(result, wantsJson, summaryLines(result));
+    return;
+  }
+  const body = { ...(autoStart !== undefined ? { codexAutoStart: autoStart } : {}), ...(streamMode !== undefined ? { streamMode } : {}) };
+  const result = await runtimeRequest("/api/settings", { method: "PUT", body: JSON.stringify(body) }, deps);
+  printData(result, wantsJson, ["System settings updated."]);
+}
+
+async function startup(argv: string[], deps: RuntimeApiDeps): Promise<void> {
+  const args = [...argv];
+  const action = (args.shift() ?? "health").toLowerCase();
+  const wantsJson = takeFlag(args, "--json");
+  rejectArgs(args, USAGE);
+  if (action === "health" || action === "status") {
+    const result = await runtimeRequest("/api/startup-health", {}, deps);
+    printData(result, wantsJson, summaryLines(result));
+    return;
+  }
+  if (action !== "install-service" && action !== "install-shim") throw new CliUsageError("startup action must be health, install-service, or install-shim", USAGE);
+  const result = await runtimeRequest("/api/startup-action", { method: "POST", body: JSON.stringify({ action }) }, deps);
+  printData(result, wantsJson, [String((result as Record<string, unknown>).message ?? `${action} complete.`)]);
+}
+
+async function update(argv: string[], deps: RuntimeApiDeps): Promise<void> {
+  const args = [...argv];
+  const action = (args.shift() ?? "check").toLowerCase();
+  const wantsJson = takeFlag(args, "--json");
+  if (action === "status") {
+    const jobId = args.shift();
+    if (!jobId) throw new CliUsageError("update job id is required", USAGE);
+    rejectArgs(args, USAGE);
+    printData(await runtimeRequest(`/api/update/status?jobId=${encodeURIComponent(jobId)}`, {}, deps), wantsJson);
+    return;
+  }
+  const channel = takeOption(args, "--channel") ?? "latest";
+  if (channel !== "latest" && channel !== "preview") throw new CliUsageError("--channel must be latest or preview", USAGE);
+  if (action === "check") {
+    rejectArgs(args, USAGE);
+    printData(await runtimeRequest(`/api/update/check?tag=${channel}`, {}, deps), wantsJson);
+    return;
+  }
+  if (action !== "run") throw new CliUsageError(`unknown update action ${action}`, USAGE);
+  const restart = takeBooleanOption(args, "--restart") ?? true;
+  const yes = takeFlag(args, "--yes");
+  if (!yes) throw new CliUsageError("update run requires --yes", USAGE);
+  rejectArgs(args, USAGE);
+  const result = await runtimeRequest("/api/update/run", { method: "POST", body: JSON.stringify({ tag: channel, restart }) }, deps);
+  printData(result, wantsJson, [`Update started (${channel}).`]);
+}
+
+export async function handleSystemCommand(argv: string[], deps: RuntimeApiDeps = {}): Promise<number> {
+  return runCliAction(async () => {
+    const [sub = "status", ...rest] = argv;
+    if (sub === "status") await status(rest, deps);
+    else if (sub === "settings") await settings(rest, deps);
+    else if (sub === "startup") await startup(rest, deps);
+    else if (sub === "diagnostics") {
+      const args = [...rest]; const wantsJson = takeFlag(args, "--json"); rejectArgs(args, USAGE);
+      printData(await runtimeRequest("/api/diagnostics/project-config", {}, deps), wantsJson);
+    } else if (sub === "sync") {
+      const args = [...rest]; const wantsJson = takeFlag(args, "--json"); rejectArgs(args, USAGE);
+      printData(await runtimeRequest("/api/sync", { method: "POST" }, deps), wantsJson);
+    } else if (sub === "update") await update(rest, deps);
+    else throw new CliUsageError(`unknown system command ${sub}`, USAGE);
+  });
+}
+
+export const SYSTEM_USAGE = USAGE;

package/src/cli/tray-proxy.ts

@@ -0,0 +1,52 @@
+export interface TrayProxyLive { port: number }
+
+export interface TrayProxyServiceState {
+  installed: boolean;
+  startable: boolean;
+  summary: string;
+}
+
+export interface TrayProxyStartIo {
+  findLive: () => Promise<TrayProxyLive | null>;
+  diagnoseService: () => TrayProxyServiceState;
+  startService: () => void | Promise<void>;
+  startDirect: () => void | Promise<void>;
+  waitForProxy: () => Promise<TrayProxyLive | null>;
+  info: (message: string) => void;
+  error: (message: string) => void;
+}
+
+/** Side-effect coordinator for the tray's fixed proxy-start action. */
+export async function runTrayProxyStart(io: TrayProxyStartIo): Promise<boolean> {
+  const live = await io.findLive();
+  if (live) {
+    io.info(`Proxy already running on port ${live.port}.`);
+    return true;
+  }
+
+  const service = io.diagnoseService();
+  if (service.installed && !service.startable) {
+    io.error(`Cannot start from the tray because the installed service is not viable: ${service.summary}`);
+    io.error("Repair or remove the service before starting a direct proxy.");
+    return false;
+  }
+
+  if (service.startable) await io.startService();
+  else await io.startDirect();
+
+  const started = await io.waitForProxy();
+  if (!started) {
+    io.error("Proxy did not become healthy after the tray start action.");
+    return false;
+  }
+  io.info(`Proxy running on port ${started.port}.`);
+  return true;
+}
+
+export async function runTrayProxyRestart(io: {
+  stop: () => boolean | Promise<boolean>;
+  start: () => boolean | Promise<boolean>;
+}): Promise<boolean> {
+  if (!await io.stop()) return false;
+  return io.start();
+}

package/src/cli/v2.ts

@@ -0,0 +1,173 @@
+/**
+ * `ocx v2 status|on|off` — toggle/report the codex `multi_agent_v2` feature that
+ * controls the multi-agent surface (v1 vs v2 collab mode).
+ *
+ * Contract:
+ *  - config.toml writes go through the official `codex features enable|disable`
+ *    CLI only (format-preserving TOML edit stays upstream-owned).
+ *  - after a successful flip the catalog is RESYNCED so model metadata stays fresh.
+ *  - flips preserve the active thread limit while moving it between the v1/v2
+ *    config keys, with byte-for-byte rollback when the feature command fails.
+ *  - nothing in the catalog build path calls this module; no auto-flip exists.
+ */
+import { execFileSync } from "node:child_process";
+import { getAgentsEnabled, getAgentsMaxDepth, getLogicalMaxThreads, getSubagentDeveloperInstructions, hasAgentsMaxThreads, isMultiAgentV2Enabled, transitionMultiAgentV2 } from "../codex/features";
+
+import { commandInvocation, type SpawnInvocation } from "../lib/win-exec";
+import { loadConfig, saveConfig } from "../config";
+import { resolveAndPersistCodexRuntime, type ResolveCodexRuntimeDeps } from "../codex/runtime";
+
+export interface V2CliDeps {
+  execFile?: (file: string, args: string[], options?: SpawnInvocation["options"]) => void;
+  isEnabled?: typeof isMultiAgentV2Enabled;
+  hasMaxThreads?: typeof hasAgentsMaxThreads;
+  sync?: (port?: number) => Promise<unknown>;
+  log?: Pick<Console, "log" | "error">;
+}
+
+export type CodexFeaturesInvocationDeps =
+  & Parameters<typeof commandInvocation>[3]
+  & Pick<ResolveCodexRuntimeDeps, "existsSync" | "execFileSync" | "configDir" | "readFileSync">;
+
+/**
+ * Shared invocation for `codex features enable|disable multi_agent_v2` — the single
+ * source of truth for the CLI and the management API fallback. Windows npm installs
+ * expose `codex` as a `.cmd` shim, which needs the win-exec launcher
+ * (devlog 260715_cross_platform_audit/020).
+ */
+export function codexFeaturesInvocation(
+  action: "enable" | "disable",
+  platform: NodeJS.Platform = process.platform,
+  deps: CodexFeaturesInvocationDeps = {},
+): SpawnInvocation {
+  const command = resolveAndPersistCodexRuntime({
+    env: deps.env ?? process.env,
+    platform,
+    existsSync: deps.existsSync,
+    execFileSync: deps.execFileSync,
+    configDir: deps.configDir,
+    readFileSync: deps.readFileSync,
+  }).runtime.command || "codex";
+  return commandInvocation(command, ["features", action, "multi_agent_v2"], platform, deps);
+}
+
+function runCodexFeatures(action: "enable" | "disable", deps: V2CliDeps): void {
+  const exec = deps.execFile ?? ((file: string, args: string[], options?: SpawnInvocation["options"]) => {
+    execFileSync(file, args, { stdio: ["ignore", "pipe", "pipe"], timeout: 15_000, windowsHide: true, ...options });
+  });
+  const inv = codexFeaturesInvocation(action);
+  exec(inv.file, inv.args, inv.options);
+}
+
+export function v2StatusLine(enabled: boolean): string {
+  return enabled
+    ? "multi_agent_v2: ON — v2 multi-agent surface active"
+    : "multi_agent_v2: OFF — v1 multi-agent surface (default install)";
+}
+
+export function multiAgentModeLine(mode: string): string {
+  switch (mode) {
+    case "v1": return "multi_agent_mode: v1 — ALL models forced to v1 surface (upstream pins overridden)";
+    case "v2": return "multi_agent_mode: v2 — ALL models forced to v2 surface (upstream pins overridden)";
+    default: return "multi_agent_mode: default — upstream model pins respected (sol/terra=v2, luna=v1, rest=codex flag)";
+  }
+}
+
+export async function cmdV2(args: string[], deps: V2CliDeps = {}, findPort?: () => Promise<number | undefined>): Promise<number> {
+  const log = deps.log ?? console;
+  const isEnabled = deps.isEnabled ?? isMultiAgentV2Enabled;
+  const hasMaxThreads = deps.hasMaxThreads ?? hasAgentsMaxThreads;
+  const verb = (args[0] ?? "status").trim().toLowerCase();
+
+  if (verb === "status") {
+    log.log(v2StatusLine(isEnabled()));
+    const cfg = loadConfig();
+    log.log(multiAgentModeLine(cfg.multiAgentMode ?? "default"));
+    const threads = getLogicalMaxThreads();
+    log.log(`max_threads: ${threads ?? "(unset — codex default)"}`);
+    const v2Active = isEnabled();
+    const agentsEnabled = getAgentsEnabled();
+    log.log(`agents.enabled: ${agentsEnabled === null ? "(unset — upstream default true)" : agentsEnabled}`);
+    const maxDepth = getAgentsMaxDepth();
+    // max_depth is V1-only upstream; say so whenever V2 is active so the number
+    // cannot be misread as an effective V2 limit.
+    log.log(`agents.max_depth: ${maxDepth ?? "(unset — upstream default 1)"}${v2Active ? " (V1-only — ignored while multi_agent_v2 is enabled)" : ""}`);
+    const instructions = getSubagentDeveloperInstructions();
+    log.log(`subagent_developer_instructions: ${instructions === null ? "(unset — children inherit)" : instructions === "" ? '"" (clears inherited instructions)' : JSON.stringify(instructions)}`);
+    if (isEnabled() && hasMaxThreads()) {
+      log.log("WARNING: [agents] max_threads is set — codex refuses to start while multi_agent_v2 is enabled. Remove it from config.toml (concurrency lives in features.multi_agent_v2.max_concurrent_threads_per_session).");
+    }
+    return 0;
+  }
+  if (verb === "threads") {
+    const value = Number((args[1] ?? "").trim());
+    if (!Number.isInteger(value) || value < 1) {
+      log.error("v2 threads: pass an integer >= 1 (features.multi_agent_v2.max_concurrent_threads_per_session)");
+      return 1;
+    }
+    const enabled = isEnabled();
+    const result = transitionMultiAgentV2(enabled, next => runCodexFeatures(next ? "enable" : "disable", deps), { threadLimit: value });
+    if (!result.ok) { log.error(`v2 threads: ${result.error}`); return 1; }
+    log.log(result.changed
+      ? `max_threads = ${value} (${enabled ? "v2" : "v1"}) — applies to new sessions.`
+      : `max_threads already ${value} — nothing to do.`);
+    return 0;
+  }
+  if (verb === "mode") {
+    const modeArg = (args[1] ?? "").trim().toLowerCase();
+    if (modeArg !== "v1" && modeArg !== "default" && modeArg !== "v2") {
+      log.error("v2 mode: expected v1|default|v2");
+      return 1;
+    }
+    const cfg = loadConfig();
+    if (modeArg !== "default") {
+      const target = modeArg === "v2";
+      const transition = transitionMultiAgentV2(target, enabled => runCodexFeatures(enabled ? "enable" : "disable", deps));
+      if (!transition.ok) {
+        log.error(`multi-agent mode transition failed: ${transition.error}`);
+        return 1;
+      }
+    }
+    if (modeArg === "default") delete cfg.multiAgentMode;
+    else cfg.multiAgentMode = modeArg as "v1" | "v2";
+    saveConfig(cfg);
+    try {
+      const sync = deps.sync ?? (await import("../codex/sync")).syncModelsToCodex;
+      await sync(findPort ? await findPort() : undefined);
+    } catch (err) {
+      log.error(`catalog resync failed: ${err instanceof Error ? err.message : String(err)} — run 'ocx sync' manually.`);
+      return 1;
+    }
+    log.log(multiAgentModeLine(modeArg));
+    log.log("Applies to NEW sessions; running sessions keep their pinned multi-agent version.");
+    return 0;
+  }
+  if (verb !== "on" && verb !== "off") {
+    log.error(`v2: unknown verb '${verb}' (expected status|on|off|mode <v1|default|v2>|threads <n>)`);
+    return 1;
+  }
+
+  const want = verb === "on";
+  const transition = transitionMultiAgentV2(want, enabled => runCodexFeatures(enabled ? "enable" : "disable", deps));
+  if (!transition.ok) {
+    log.error(`codex features ${want ? "enable" : "disable"} multi_agent_v2 failed: ${transition.error}`);
+    return 1;
+  }
+  if (!transition.changed) {
+    log.log(`multi_agent_v2 already ${want ? "ON" : "OFF"} — nothing to do.`);
+    return 0;
+  }
+
+  // Resync catalog so multi-agent surface metadata stays fresh in both the
+  // on-disk catalog and models_cache.json after the toggle flip.
+  try {
+    const sync = deps.sync ?? (await import("../codex/sync")).syncModelsToCodex;
+    await sync(findPort ? await findPort() : undefined);
+  } catch (err) {
+    log.error(`catalog resync failed (flag IS flipped): ${err instanceof Error ? err.message : String(err)} — run 'ocx sync' manually.`);
+    return 1;
+  }
+  log.log(v2StatusLine(want));
+  log.log("Applies to NEW sessions; running sessions keep their pinned multi-agent version. Restart the Codex app (or wait out its picker cache) to see the ladder change.");
+  return 0;
+}

package/src/cli.ts

@@ -0,0 +1,10 @@
+#!/usr/bin/env bun
+// Compatibility stub for the pre-restructure entrypoint path.
+//
+// Before the src/ restructure the CLI lived at src/cli.ts, and durable launchers
+// (codex shim wrappers, installed service definitions) baked that absolute path
+// into their command lines. Users who upgrade in place with a bare
+// `npm install -g @iislee/opencodex` (instead of `ocx update`, which repairs the
+// shim/service) would otherwise be stranded on a dead path. Keep this stub for at
+// least one release cycle after the restructure ships.
+import "./cli/index.ts";