@ours.network/codex 0.10.1 → 0.11.1

package/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "ours",
-  "version": "0.10.1",
+  "version": "0.11.1",
   "description": "Secure agent-to-agent messaging and explicitly armed live mail wake for Codex CLI.",
   "author": {
     "name": "Adapt Toolkit",

package/bin/ours-codex-install.mjs

@@ -5,12 +5,14 @@
 //     npm i -g @ours.network/codex
 //     ours-codex-install
 //
-// It resolves this package's install.sh, ensures the existing daemon installation,
-// registers the native Codex marketplace/plugin, and migrates installer-owned legacy
-// config only after Codex confirms the native plugin is installed.
+// SUPERSEDED BY `ours-install`: the unified `ours-install` is now the single front door for the
+// WHOLE stack (ours core + harness plugins + ours-fleet + Telegram). `ours-codex-install` is kept
+// as a THIN ALIAS — by default it hands off to `ours-install` when that's available, so an old
+// muscle-memory command still lands the user in the current, unified flow. Pass `--codex-only`
+// (or set OURS_CODEX_LEGACY=1) to force the legacy Codex-only install below.
 //
 // Usage:
-//   ours-codex-install [--codex-dir DIR] [--skills-dir DIR] [--skip-daemon]
+//   ours-codex-install [--codex-only] [--codex-dir DIR] [--skills-dir DIR] [--skip-daemon]
 import { spawnSync } from 'node:child_process';
 import { fileURLToPath } from 'node:url';
 import { dirname, join } from 'node:path';
@@ -26,22 +28,43 @@ for (let i = 0; i < argv.length; i++) {
   if (a === '--codex-dir') opts.codexDir = argv[++i];
   else if (a === '--skills-dir') opts.skillsDir = argv[++i];
   else if (a === '--skip-daemon') opts.skipDaemon = true;
+  else if (a === '--codex-only' || a === '--legacy') opts.codexOnly = true;
   else if (a === '--help' || a === '-h') { help(); process.exit(0); }
   else { console.error(`ours-codex-install: unknown argument "${a}"`); help(); process.exit(2); }
 }
 
+// Thin-alias hand-off: unless the caller forced the legacy Codex-only path, run the unified
+// `ours-install` if we can find it — on PATH (published), or the monorepo sibling (dev/test).
+if (!opts.codexOnly && !process.env.OURS_CODEX_LEGACY) {
+  const onPath = spawnSync('bash', ['-c', 'command -v ours-install'], { encoding: 'utf8' });
+  const unified = (onPath.status === 0 && (onPath.stdout || '').trim())
+    ? { cmd: (onPath.stdout || '').trim(), args: argv }
+    : (() => {
+        const sib = join(PKG, '..', 'installer', 'install.mjs');
+        return existsSync(sib) ? { cmd: process.execPath, args: [sib, ...argv] } : null;
+      })();
+  if (unified) {
+    const r = spawnSync(unified.cmd, unified.args, { stdio: 'inherit', env: process.env });
+    if (r.error) { console.error(`ours-codex-install: ${r.error.message}`); process.exit(1); }
+    process.exit(r.status ?? 0);
+  }
+  // No unified installer found → fall through to the legacy Codex-only install (still never a dead end).
+}
+
 function help() {
   console.log(`ours-codex-install — set up the ours.network plugin for the OpenAI Codex CLI.
 
   ours-codex-install [options]
 
-Sets up the daemon and native ours Codex plugin. Standard mode uses \`codex\`; live mode uses
-\`ours-codex\`. Live monitoring still requires explicit consent after an identity is bound.
+By default this hands off to the unified \`ours-install\` (the single front door for the whole
+stack). Use --codex-only to run the legacy Codex-only install instead. Standard mode uses
+\`codex\`; live mode uses \`ours-codex\`. Live monitoring still requires explicit consent.
 
 Options:
-      --codex-dir <dir>     Codex config+AGENTS.md root (default ~/.codex)
-      --skills-dir <dir>    skills root (default ~/.agents/skills — USER scope)
-      --skip-daemon         do not install/start the ours daemon
+      --codex-only          run the legacy Codex-only install (skip the unified ours-install)
+      --codex-dir <dir>     Codex config+AGENTS.md root (default ~/.codex)     [--codex-only]
+      --skills-dir <dir>    skills root (default ~/.agents/skills — USER scope) [--codex-only]
+      --skip-daemon         do not install/start the ours daemon               [--codex-only]
   -h, --help                show this help
 
 Idempotent: safe to re-run. Start a new Codex thread after installation and review the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ours.network/codex",
-  "version": "0.10.1",
+  "version": "0.11.1",
   "description": "Native Codex plugin for secure ours.network messaging and explicitly armed, session-scoped live mail wake.",
   "type": "module",
   "license": "FSL-1.1-Apache-2.0",
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.29.0",
-    "@ours.network/mcp": "0.10.1",
+    "@ours.network/mcp": "0.11.1",
     "ws": "^8.21.0",
     "zod": "^3.25.76"
   },