thoth-agents 0.3.2 → 0.3.3

package/.claude-plugin/marketplace.json

@@ -9,7 +9,7 @@
     {
       "name": "thoth-agents",
       "description": "Adaptive root orchestration, six specialist subagents, and a runtime-autonomous Spec Kit-compatible SDD bundle.",
-      "version": "0.3.2",
+      "version": "0.3.3",
       "author": {
         "name": "thoth-agents maintainers"
       },

package/README.md

@@ -65,25 +65,19 @@ from the CLI step. Existing project-owned files are preserved.
 
 ### Codex
 
-Register the repository marketplace from a terminal:
-
-```bash
-codex plugin marketplace add EremesNG/thoth-agents
-```
-
-Restart Codex, open `/plugins`, and install or enable `thoth-agents`. Then return
-to a terminal and apply the mandatory global layer:
+Preview, then run the combined native-plugin and global-layer installer:
 
 ```bash
 npx thoth-agents@latest install --agent=codex --dry-run
 npx thoth-agents@latest install --agent=codex
 ```
 
-The CLI writes the orchestrator block to `~/.codex/AGENTS.md`, creates six
-custom-agent TOMLs under `~/.codex/agents/`, and merges the managed feature into
-`~/.codex/config.toml`. It also installs the external skills and invokes
-provider-owned thoth-mem setup. Restart Codex again, then initialize each target
-repository's SDD governance:
+The CLI first uses Codex's native manager to register `EremesNG/thoth-agents`
+and install or enable `thoth-agents@thoth-agents`. It then writes the
+orchestrator block to `~/.codex/AGENTS.md`, creates six custom-agent TOMLs under
+`~/.codex/agents/`, merges the managed feature into `~/.codex/config.toml`,
+installs the external skills, and invokes provider-owned thoth-mem setup.
+Restart Codex, then initialize each target repository's SDD governance:
 
 ```text
 $thoth-init
@@ -345,7 +339,7 @@ diagnostics, manual actions, and receipt paths remain visible for recovery.
 | Harness | Important limitation |
 | --- | --- |
 | OpenCode | Strongest integrated path. The CLI installs the npm plugin configuration, external skills, and provider-owned thoth-mem setup; `/thoth-init` materializes thoth-owned project skills/governance. Only the OpenAI built-in preset ships. |
-| Codex | Native plugin installation is incomplete without the CLI. The CLI manages global `AGENTS.md`, six agent TOMLs, config, external skills, and thoth-mem setup; `$thoth-init` only initializes per-repository SDD governance. Runtime role matching and some permissions remain instruction-level. |
+| Codex | The CLI installs the native plugin and manages global `AGENTS.md`, six agent TOMLs, config, external skills, and thoth-mem setup; `$thoth-init` only initializes per-repository SDD governance. Runtime role matching and some permissions remain instruction-level. |
 | Claude Code | Run both native marketplace commands before the CLI installs external skills and requests thoth-mem setup. The native manager owns cache files; fine-grained path restrictions remain instruction-level. |
 
 Codex and Claude marketplace manifests are versioned in
@@ -385,7 +379,8 @@ npx thoth-agents@latest install --agent=claude
 npx thoth-agents@latest model --harness=codex --role=deep --model=gpt-5.6-sol
 ```
 
-It does not replace native marketplace trust or mutate manager-owned caches.
+It does not bypass native marketplace trust or edit manager-owned caches
+directly; Codex and Claude own their native manager mutations.
 
 ## Documentation
 

package/dist/{chunk-NUSODNWE.js → chunk-UQOCEMU3.js}

@@ -1411,11 +1411,11 @@ function buildCodexManagedConfigPatch(content, options) {
   ];
   if (options.pluginId) {
     diffSummary.push(
-      `plugin enablement for "${options.pluginId}" is not textually merged; use /plugins to enable it`
+      `plugin enablement for "${options.pluginId}" is not textually merged; use the native Codex plugin manager`
     );
   } else {
     diffSummary.push(
-      "plugin enablement left to /plugins; no guessed plugin id written"
+      "plugin installation and enablement owned by the native Codex plugin manager; no plugin table written"
     );
   }
   return {
@@ -1843,8 +1843,8 @@ function buildCodexSetupPlan(config) {
     configPath: targets.configPath,
     pluginId: config.pluginId,
     diagnostics: [
-      "Register the published marketplace with `codex plugin marketplace add EremesNG/thoth-agents`, restart Codex, then open /plugins to install and enable thoth-agents.",
-      "The CLI does not copy a plugin into ~/.codex/plugins or merge ~/.agents/plugins/marketplace.json; Codex owns marketplace snapshots and installed plugin cache state.",
+      "The combined install flow runs `codex plugin marketplace add EremesNG/thoth-agents` and `codex plugin add thoth-agents@thoth-agents` through the native manager; restart Codex, then use /plugins to review its state.",
+      "The CLI does not copy a plugin into ~/.codex/plugins or merge ~/.agents/plugins/marketplace.json directly; Codex owns marketplace snapshots and installed plugin cache state.",
       "The /hooks surface may show hooks from independently installed plugins; this thoth-agents setup plan does not install provider hooks.",
       "Codex Default mode user-input requests require features.default_mode_request_user_input = true and use the request_user_input tool; other modes may not expose it.",
       "Higher-precedence Codex config (project, profile, CLI, system, or admin) may override user config feature flags.",

package/dist/cli/codex-plugin-install.d.ts

@@ -0,0 +1,51 @@
+export type CodexPluginSetupAction = 'register-marketplace' | 'install-plugin';
+export interface CodexCommandResult {
+    exitCode: number;
+    stdout: string;
+    stderr: string;
+}
+export interface CodexCommandOptions {
+    cwd: string;
+}
+export interface CodexCommandInvocationOptions {
+    platform?: NodeJS.Platform;
+    commandShell?: string;
+}
+export interface CodexCommandInvocation {
+    command: string;
+    args: string[];
+}
+export type CodexCommandExecutor = (command: string, args: readonly string[], options: CodexCommandOptions) => CodexCommandResult;
+export interface CodexPluginInstallConfig {
+    dryRun?: boolean;
+    projectRoot: string;
+    commandExecutor?: CodexCommandExecutor;
+}
+export interface CodexPluginSetupPlanItem {
+    action: CodexPluginSetupAction;
+    targetPath: string;
+    description: string;
+    command: {
+        executable: 'codex';
+        args: string[];
+        cwd: string;
+    };
+}
+export interface CodexPluginSetupPlan {
+    dryRun: boolean;
+    items: CodexPluginSetupPlanItem[];
+    diagnostics: string[];
+    ready: boolean;
+    projectRoot: string;
+    commandExecutor: CodexCommandExecutor;
+}
+export interface CodexPluginApplyResult {
+    success: boolean;
+    changed: string[];
+    diagnostics: string[];
+    error?: string;
+}
+export declare function getCodexCommand(args: readonly string[], options?: CodexCommandInvocationOptions): CodexCommandInvocation;
+export declare function buildCodexPluginSetupPlan(config: CodexPluginInstallConfig): CodexPluginSetupPlan;
+export declare function applyCodexPluginSetup(plan: CodexPluginSetupPlan): CodexPluginApplyResult;
+export declare function formatCodexPluginSetupPlan(plan: CodexPluginSetupPlan): string;

package/dist/cli/index.js

@@ -43,7 +43,7 @@ import {
   installRequiredSkill,
   listOperationHarnesses,
   normalizeEffortSelection
-} from "../chunk-NUSODNWE.js";
+} from "../chunk-UQOCEMU3.js";
 import {
   ALL_AGENT_NAMES,
   detectCurrentConfig,
@@ -74,8 +74,243 @@ import { existsSync } from "fs";
 import { homedir } from "os";
 import { cwd } from "process";
 
-// src/cli/thoth-mem-install.ts
+// src/cli/codex-plugin-install.ts
 import { spawnSync } from "child_process";
+var MARKETPLACE_NAME = "thoth-agents";
+var MARKETPLACE_SOURCE = "EremesNG/thoth-agents";
+var PLUGIN_ID = "thoth-agents@thoth-agents";
+var MARKETPLACE_TARGET = "codex://marketplaces/thoth-agents";
+var PLUGIN_TARGET = "codex://plugins/thoth-agents@thoth-agents";
+function getCodexCommand(args, options = {}) {
+  if ((options.platform ?? process.platform) !== "win32") {
+    return { command: "codex", args: [...args] };
+  }
+  return {
+    command: options.commandShell ?? process.env.ComSpec ?? "cmd.exe",
+    args: ["/d", "/s", "/c", "codex.cmd", ...args]
+  };
+}
+function defaultCommandExecutor(command, args, options) {
+  const invocation = command === "codex" ? getCodexCommand(args) : { command, args: [...args] };
+  const result = spawnSync(invocation.command, invocation.args, {
+    cwd: options.cwd,
+    encoding: "utf8",
+    shell: false,
+    windowsHide: true
+  });
+  return {
+    exitCode: result.status ?? (result.error ? 1 : 0),
+    stdout: result.stdout ?? "",
+    stderr: result.stderr ?? result.error?.message ?? ""
+  };
+}
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function parseRecordArray(value) {
+  return Array.isArray(value) && value.every(isRecord) ? value : null;
+}
+function parseManagerRecord(content) {
+  try {
+    const parsed = JSON.parse(content);
+    return isRecord(parsed) ? parsed : null;
+  } catch {
+    return null;
+  }
+}
+function normalizeMarketplaceSource(value) {
+  return value.trim().replace(/^git@github\.com:/i, "").replace(/^(?:https?|ssh):\/\/(?:git@)?github\.com\//i, "").replace(/^github\.com\//i, "").replace(/\/?\.git\/?$/i, "").replace(/\/$/, "").toLowerCase();
+}
+function marketplaceSources(entry) {
+  const sources = [entry.repo, entry.source];
+  if (isRecord(entry.marketplaceSource)) {
+    sources.push(entry.marketplaceSource.repo, entry.marketplaceSource.source);
+  }
+  return sources.filter(
+    (source) => typeof source === "string"
+  );
+}
+function isCanonicalMarketplace(entry) {
+  if (entry.name !== MARKETPLACE_NAME) return false;
+  const canonical = MARKETPLACE_SOURCE.toLowerCase();
+  return marketplaceSources(entry).some(
+    (source) => normalizeMarketplaceSource(source) === canonical
+  );
+}
+function inspectCodexManager(executor, cwd2) {
+  const marketplaceResult = executor(
+    "codex",
+    ["plugin", "marketplace", "list", "--json"],
+    { cwd: cwd2 }
+  );
+  const pluginResult = executor(
+    "codex",
+    ["plugin", "list", "--available", "--json"],
+    { cwd: cwd2 }
+  );
+  const diagnostics = [];
+  if (marketplaceResult.exitCode !== 0 || pluginResult.exitCode !== 0) {
+    diagnostics.push(
+      "Codex native plugin state could not be inspected; no manager mutation will be attempted."
+    );
+    return {
+      ready: false,
+      marketplace: "unknown",
+      plugin: "unknown",
+      diagnostics
+    };
+  }
+  const marketplaceRecord = parseManagerRecord(marketplaceResult.stdout);
+  const pluginRecord = parseManagerRecord(pluginResult.stdout);
+  const marketplaces = marketplaceRecord ? parseRecordArray(marketplaceRecord.marketplaces) : null;
+  const installedPlugins = pluginRecord ? parseRecordArray(pluginRecord.installed) : null;
+  if (!marketplaces || !installedPlugins) {
+    diagnostics.push(
+      "Codex returned unparseable plugin manager JSON; no manager mutation will be attempted."
+    );
+    return {
+      ready: false,
+      marketplace: "unknown",
+      plugin: "unknown",
+      diagnostics
+    };
+  }
+  const namedMarketplaces = marketplaces.filter(
+    (entry) => entry.name === MARKETPLACE_NAME
+  );
+  let marketplace = "absent";
+  if (namedMarketplaces.length > 0) {
+    marketplace = namedMarketplaces.every(isCanonicalMarketplace) ? "installed" : "conflict";
+  }
+  if (marketplace === "conflict") {
+    diagnostics.push(
+      "A Codex marketplace named thoth-agents is registered from a different source; resolve it through Codex before retrying."
+    );
+  }
+  const matchingPlugins = installedPlugins.filter(
+    (entry) => entry.pluginId === PLUGIN_ID
+  );
+  let plugin = "absent";
+  if (matchingPlugins.some((entry) => entry.enabled === true)) {
+    plugin = "installed";
+  } else if (matchingPlugins.length > 0) {
+    plugin = "disabled";
+  }
+  return {
+    ready: marketplace !== "conflict",
+    marketplace,
+    plugin,
+    diagnostics
+  };
+}
+function commandItem(action, projectRoot) {
+  if (action === "register-marketplace") {
+    return {
+      action,
+      targetPath: MARKETPLACE_TARGET,
+      description: "Register the package-owned thoth-agents Codex marketplace.",
+      command: {
+        executable: "codex",
+        args: ["plugin", "marketplace", "add", MARKETPLACE_SOURCE, "--json"],
+        cwd: projectRoot
+      }
+    };
+  }
+  return {
+    action,
+    targetPath: PLUGIN_TARGET,
+    description: "Install and enable the thoth-agents Codex plugin from its native marketplace.",
+    command: {
+      executable: "codex",
+      args: ["plugin", "add", PLUGIN_ID, "--json"],
+      cwd: projectRoot
+    }
+  };
+}
+function buildCodexPluginSetupPlan(config) {
+  const commandExecutor = config.commandExecutor ?? defaultCommandExecutor;
+  const inspection = inspectCodexManager(commandExecutor, config.projectRoot);
+  const items = [];
+  if (inspection.ready) {
+    if (inspection.marketplace === "absent") {
+      items.push(commandItem("register-marketplace", config.projectRoot));
+    }
+    if (inspection.plugin === "absent" || inspection.plugin === "disabled") {
+      items.push(commandItem("install-plugin", config.projectRoot));
+    }
+  }
+  return {
+    dryRun: config.dryRun === true,
+    items,
+    ready: inspection.ready,
+    projectRoot: config.projectRoot,
+    commandExecutor,
+    diagnostics: [
+      ...inspection.diagnostics,
+      "Codex installs thoth-agents from EremesNG/thoth-agents through its native plugin manager and owns the cached plugin files.",
+      "Restart Codex after installation; use /plugins to inspect marketplace and plugin state."
+    ]
+  };
+}
+function uniqueMessages(messages) {
+  return [...new Set(messages)];
+}
+function boundedCommandFailure(item, result) {
+  const detail = result.stderr.trim().replace(/\s+/g, " ").slice(0, 240);
+  return `${item.description} Codex exited with code ${result.exitCode}${detail ? `: ${detail}` : "."}`;
+}
+function applyCodexPluginSetup(plan) {
+  const changed = [];
+  const diagnostics = uniqueMessages(plan.diagnostics);
+  if (!plan.ready) {
+    return {
+      success: false,
+      changed,
+      diagnostics,
+      error: "Codex native plugin manager state is not safe to mutate."
+    };
+  }
+  if (plan.dryRun) return { success: true, changed, diagnostics };
+  for (const item of plan.items) {
+    const result = plan.commandExecutor(
+      item.command.executable,
+      item.command.args,
+      { cwd: item.command.cwd }
+    );
+    if (result.exitCode !== 0) {
+      return {
+        success: false,
+        changed,
+        diagnostics,
+        error: boundedCommandFailure(item, result)
+      };
+    }
+    changed.push(item.targetPath);
+  }
+  const inspection = inspectCodexManager(
+    plan.commandExecutor,
+    plan.projectRoot
+  );
+  diagnostics.push(...inspection.diagnostics);
+  if (inspection.marketplace !== "installed" || inspection.plugin !== "installed") {
+    return {
+      success: false,
+      changed,
+      diagnostics: uniqueMessages(diagnostics),
+      error: "Codex did not verify the expected marketplace and enabled plugin after mutation."
+    };
+  }
+  return { success: true, changed, diagnostics: uniqueMessages(diagnostics) };
+}
+function formatCodexPluginSetupPlan(plan) {
+  const lines = plan.items.map(
+    (item) => `- ${item.action}: ${item.command.executable} ${item.command.args.join(" ")}`
+  );
+  return ["Codex plugin setup plan:", ...lines].join("\n");
+}
+
+// src/cli/thoth-mem-install.ts
+import { spawnSync as spawnSync2 } from "child_process";
 var THOTH_MEM_SETUP_TIMEOUT_MS = 12e4;
 var STATUS_EXIT_CODE = {
   complete: 0,
@@ -93,17 +328,17 @@ var STEP_OUTCOMES = /* @__PURE__ */ new Set([
   "failed",
   "unavailable"
 ]);
-function isRecord(value) {
+function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function isStringArray(value) {
   return Array.isArray(value) && value.every((item) => typeof item === "string");
 }
 function isSetupStep(value) {
-  return isRecord(value) && typeof value.name === "string" && value.name.length > 0 && typeof value.outcome === "string" && STEP_OUTCOMES.has(value.outcome);
+  return isRecord2(value) && typeof value.name === "string" && value.name.length > 0 && typeof value.outcome === "string" && STEP_OUTCOMES.has(value.outcome);
 }
 function isProviderSetupResult(value, expectedHarness) {
-  return isRecord(value) && typeof value.status === "string" && SETUP_STATUSES.has(value.status) && typeof value.changed === "boolean" && value.harness === expectedHarness && value.scope === "global" && typeof value.target === "string" && value.target.length > 0 && Array.isArray(value.steps) && value.steps.every(isSetupStep) && isStringArray(value.diagnostics) && isStringArray(value.manual_actions) && (value.receipt === null || typeof value.receipt === "string");
+  return isRecord2(value) && typeof value.status === "string" && SETUP_STATUSES.has(value.status) && typeof value.changed === "boolean" && value.harness === expectedHarness && value.scope === "global" && typeof value.target === "string" && value.target.length > 0 && Array.isArray(value.steps) && value.steps.every(isSetupStep) && isStringArray(value.diagnostics) && isStringArray(value.manual_actions) && (value.receipt === null || typeof value.receipt === "string");
 }
 function parseProviderSetupResult(stdout, expectedHarness) {
   let value;
@@ -114,8 +349,8 @@ function parseProviderSetupResult(stdout, expectedHarness) {
   }
   return isProviderSetupResult(value, expectedHarness) ? value : void 0;
 }
-function defaultCommandExecutor(command, args, options) {
-  const result = spawnSync(command, [...args], {
+function defaultCommandExecutor2(command, args, options) {
+  const result = spawnSync2(command, [...args], {
     cwd: options.cwd,
     encoding: "utf8",
     stdio: ["ignore", "pipe", "pipe"],
@@ -132,7 +367,7 @@ function describeError(error) {
   return error instanceof Error ? error.message : String(error);
 }
 function isTimeoutError(error) {
-  return isRecord(error) && error.code === "ETIMEDOUT";
+  return isRecord2(error) && error.code === "ETIMEDOUT";
 }
 function invalidResult(harness, command, args, exitCode, error) {
   return {
@@ -171,7 +406,7 @@ function runThothMemSetup(options) {
     options.harness,
     options.dryRun ?? false
   );
-  const executor = options.commandExecutor ?? defaultCommandExecutor;
+  const executor = options.commandExecutor ?? defaultCommandExecutor2;
   let commandResult;
   try {
     commandResult = executor(command, args, {
@@ -466,11 +701,23 @@ function createInstallConfig(args) {
 async function install(args, dependencies = {}) {
   const config = createInstallConfig(args);
   if (config.agent === "codex") {
+    const projectRoot = cwd();
+    const pluginPlan = buildCodexPluginSetupPlan({
+      dryRun: config.dryRun,
+      projectRoot
+    });
+    console.log(formatCodexPluginSetupPlan(pluginPlan));
+    const pluginResult = applyCodexPluginSetup(pluginPlan);
+    for (const diagnostic of pluginResult.diagnostics) printInfo(diagnostic);
+    if (!pluginResult.success) {
+      printError(`Codex plugin install failed: ${pluginResult.error}`);
+      return 1;
+    }
     const plan = buildCodexSetupPlan({
       dryRun: config.dryRun,
       reset: config.reset,
       scope: "user",
-      projectRoot: cwd(),
+      projectRoot,
       homeDir: homedir()
     });
     console.log(formatCodexSetupPlan(plan));
@@ -485,7 +732,7 @@ async function install(args, dependencies = {}) {
       return 1;
     }
     printSuccess(
-      config.dryRun ? "Codex dry-run complete; no files written" : "Codex agent-pack setup complete"
+      config.dryRun ? "Codex dry-run complete; no files written" : "Codex plugin installed as thoth-agents@thoth-agents and agent-pack setup complete (restart Codex to activate)"
     );
     return 0;
   }

package/dist/cli/tui/index.js

@@ -2,7 +2,7 @@ import {
   defaultTuiOperations,
   effortChoicesForModel,
   listOperationHarnesses
-} from "../../chunk-NUSODNWE.js";
+} from "../../chunk-UQOCEMU3.js";
 import "../../chunk-XO74DXBZ.js";
 
 // src/cli/tui/index.tsx

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thoth-agents",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Adaptive multi-harness orchestration with seven roles, runtime-autonomous Spec Kit-compatible SDD routes, and external provider boundaries.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/plugin/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "thoth-agents",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Adaptive multi-harness agent pack with seven roles and a runtime-autonomous Spec Kit-compatible SDD bundle for Claude Code.",
   "author": {
     "name": "thoth-agents"

package/plugin/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "thoth-agents",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Bundled Spec Kit-compatible SDD skills and MCP configuration; the seven-role global Codex layer requires thoth-agents CLI setup.",
   "skills": "./skills/",
   "mcpServers": "./codex.mcp.json"