@ours.network/codex 1.2.0-nightly.1 → 1.2.0-nightly.11

package/.codex-plugin/plugin.json

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

package/README.md

@@ -51,38 +51,21 @@ The launcher never starts, stops, restarts, or reconfigures the ours daemon. If
 selected daemon is absent or incompatible, it exits with an error and leaves standard
 `codex` available.
 
-## Selecting a daemon
-
-Multiple daemons may run on one host when each uses a distinct port and state directory.
-For network clients, explicit `OURS_CONFIG` takes precedence over the managed
-`~/.ours-client/profile.json`. When the managed file exists, ordinary `ours-codex`
-launches need no environment override. Invalid or unreadable managed profiles
-fail before selecting another daemon. With neither selection, the existing
-local-daemon precedence remains:
-
-1. `ours-codex --ours-port <port>`
-2. `OURS_PORT`
-3. the config selected by `OURS_CONFIG`
-4. `~/.ours/config.json`
-5. port `3050`
-
-All MCP, hooks, unread, and watcher calls inherit the same selected profile. Host-profile
-traffic goes directly to the selected daemon's authenticated `/mcp` endpoint through the
-Codex package; it does not require Docker or an installed `@ours.network/mcp` package.
-Example:
+## Selecting a gateway
+
+Every client uses `~/.ours-client/profile.json`; `OURS_CONFIG` can select a complete
+alternate profile. It contains `serverUrl`, `expectedInstanceId`, and `credentialPath`.
+The daemon endpoint is derived as `serverUrl + /daemon`, including gateway path prefixes.
+Missing, unsafe, or invalid profiles fail closed. Remove legacy port/state/token
+selectors; `--ours-port` is rejected. Example after provisioning with `ours-install client`:
 
 ```sh
-OURS_CONFIG="$HOME/.ours/testing.json" ours-codex --ours-port 4050
+OURS_CONFIG="$HOME/.ours-client/testing.json" ours-codex
 ```
 
-An operator-provisioned host profile uses the complete
-`endpoint`/`expectedInstanceId`/`credentialPath` tuple in the selected file. In this mode,
-do not combine the profile with `--ours-port`, `OURS_PORT`, `OURS_API_TOKEN`, or
-`OURS_STATE_DIR`. Codex forwards the actual selected path as `OURS_CONFIG` and the optional `OURS_MCP_CONFIG` host
-record location; the SDK verifies the expected
-daemon instance and rereads `credentialPath` for every request, so an operator token
-update takes effect in the running hook and live monitor without a restart or token
-snapshot in child process environments.
+MCP, hooks, unread and watcher requests inherit that profile. The SDK verifies the
+instance and rereads the issued credential for each request. Client installation and
+launch never install, start, restart or reconfigure server services.
 
 Native ownership is keyed by Codex's actual thread ID. A normal live TUI exit forwards
 that ID through the same `SessionEnd` input used by the hook. If Codex has not produced

package/bin/codex-config-install.mjs

@@ -33,7 +33,7 @@ export function planTomlInstall(text) {
 }
 
 // Render the managed TOML block: the `ours` MCP server pointing at the globally-installed
-// daemon proxy (`ours-mcp proxy`). Equivalent to `codex mcp add ours -- ours-mcp proxy`.
+// gateway client (`ours-mcp proxy`). Equivalent to `codex mcp add ours -- ours-mcp proxy`.
 export function renderTomlBlock() {
   return `${SENTINEL}
 # Added by @ours.network/codex install.sh. Remove this whole block to uninstall.
@@ -41,9 +41,9 @@ export function renderTomlBlock() {
 [mcp_servers.ours]
 command = "ours-mcp"
 args = ["proxy"]
-# Optional per-server environment overrides go here, e.g.:
+# Optional whole shared gateway profile override:
 # [mcp_servers.ours.env]
-# OURS_PORT = "3050"
+# OURS_CONFIG = "/absolute/private/path/profile.json"
 ${SENTINEL_END}
 `;
 }

package/bin/ours-codex-install.mjs

@@ -5,14 +5,7 @@
 //     npm i -g @ours.network/codex
 //     ours-codex-install
 //
-// 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-only] [--codex-dir DIR] [--skills-dir DIR] [--skip-daemon]
+// Installs client plugin wiring only after shared gateway profile validation.
 import { spawnSync } from 'node:child_process';
 import { fileURLToPath } from 'node:url';
 import { dirname, join } from 'node:path';
@@ -33,38 +26,19 @@ for (let i = 0; i < argv.length; i++) {
   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]
 
-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
+Requires clients and a shared gateway profile provisioned by \`ours-install client\`. Standard mode uses
 \`codex\`; live mode uses \`ours-codex\`. Live monitoring still requires explicit consent.
 
 Options:
-      --codex-only          run the legacy Codex-only install (skip the unified ours-install)
+      --codex-only          compatibility flag; plugin setup is always client-only
       --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]
+      --skip-daemon         compatibility flag; server lifecycle is never changed               [--codex-only]
   -h, --help                show this help
 
 Idempotent: safe to re-run. Start a new Codex thread after installation and review the
@@ -81,7 +55,6 @@ if (!existsSync(INSTALL)) {
 const env = { ...process.env };
 if (opts.codexDir) env.CODEX_DIR = opts.codexDir;
 if (opts.skillsDir) env.SKILLS_DIR = opts.skillsDir;
-if (opts.skipDaemon) env.OURS_INSTALL_SKIP_DAEMON = '1';
 
 const res = spawnSync('bash', [INSTALL], { stdio: 'inherit', env });
 if (res.error) { console.error(`ours-codex-install: ${res.error.message}`); process.exit(1); }

package/bin/proxy.mjs

@@ -1,8 +1,7 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
 import { spawn } from 'node:child_process';
-import { existsSync, readFileSync } from 'node:fs';
-import { homedir } from 'node:os';
+import { existsSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
@@ -15,21 +14,6 @@ const here = dirname(fileURLToPath(import.meta.url));
 const env = { ...process.env };
 
 async function main() {
-  const network = await import('../dist/network-proxy.mjs');
-  const profile = network.hostProfileFromEnv(env);
-  if (profile) {
-    const configPath = env.OURS_MCP_CONFIG || join(env.HOME || homedir(), '.ours-mcp', 'config.json');
-    const hostRecordRoot = dirname(configPath);
-    if (sessionEnd) {
-      const payload = JSON.parse(readFileSync(0, 'utf8') || '{}');
-      if (typeof payload.session_id !== 'string' || !payload.session_id) throw new Error('SessionEnd requires session_id.');
-      await network.endNetworkNativeSession({ profile, nativeSessionId: payload.session_id, hostRecordRoot });
-      return;
-    }
-    await network.runNetworkProxy({ profile, hostRecordRoot, env });
-    return;
-  }
-
   let cliPath;
   try { cliPath = require.resolve(spec); } catch { /* try plugin cache layouts */ }
   if (!cliPath) {