@ours.network/codex 0.17.0-nightly.3 → 0.17.0-nightly.5

package/.codex-plugin/plugin.json

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

package/bin/proxy.mjs

@@ -24,8 +24,7 @@ const env = { ...process.env };
 if (env.OURS_CODEX_LIVE === '1') env.OURS_AUTOSTART = '0';
 if (process.ppid > 1) env.OURS_CLIENT_PID = String(process.ppid);
 const child = cliPath
-  ? spawn(process.execPath, [cliPath, 'proxy', ...process.argv.slice(2)], { stdio: 'inherit', env })
-  : spawn('ours-mcp', ['proxy', ...process.argv.slice(2)], { stdio: 'inherit', env });
+  ? spawn(process.execPath, [cliPath, 'proxy', '--application', 'codex', ...process.argv.slice(2)], { stdio: 'inherit', env })
+  : spawn('ours-mcp', ['proxy', '--application', 'codex', ...process.argv.slice(2)], { stdio: 'inherit', env });
 child.on('error', (error) => { process.stderr.write(`ours: cannot launch @ours.network/mcp proxy: ${error.message}\n`); process.exit(1); });
 child.on('exit', (code, signal) => { if (signal) process.kill(process.pid, signal); else process.exit(code ?? 0); });
-

package/dist/monitor-mcp.mjs

@@ -21156,9 +21156,9 @@ var foregroundOffer = (identity) => `IMPORTANT: Before offering the fallback, te
 function foregroundWatchProcess(identity) {
   try {
     const cliPath = require2.resolve("@ours.network/mcp/dist/cli.js");
-    return { command: process.execPath, args: [cliPath, "watch", identity] };
+    return { command: process.execPath, args: [cliPath, "watch", "--application", "codex", identity] };
   } catch {
-    return { command: "ours-mcp", args: ["watch", identity] };
+    return { command: "ours-mcp", args: ["watch", "--application", "codex", identity] };
   }
 }
 async function handleMonitorCommand(command, args = {}, { env = process.env, send = sendControlCommand } = {}) {
@@ -21268,6 +21268,7 @@ async function runMonitorMcp() {
 }
 export {
   createMonitorMcpServer,
+  foregroundWatchProcess,
   handleMonitorCommand,
   monitorToolNames,
   runMonitorMcp,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ours.network/codex",
-  "version": "0.17.0-nightly.3",
+  "version": "0.17.0-nightly.5",
   "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.17.0-nightly.3",
+    "@ours.network/mcp": "0.17.0-nightly.5",
     "ws": "^8.21.0",
     "zod": "^3.25.76"
   },

package/skills/ours/references/configuration.md

@@ -18,6 +18,11 @@ queries `/info`, verifies the authenticated notification API, and propagates tha
 profile to the plugin, hooks, and watcher. It never starts or changes the daemon. A stopped
 or incompatible selected daemon is an error.
 
+With no explicit `--ours-port`, `OURS_PORT`, `OURS_CONFIG`, or `OURS_STATE_DIR`, both standard
+Codex and `ours-codex` use Codex's association in `~/.ours/installer-profiles.json` before the
+historical default config. The selected config and daemon `/info.stateDir` must match the
+registry; drift/auth failures stop with rerun-Nightly guidance. The registry never stores tokens.
+
 Changing daemon configuration is separate operator work. Explain the impact and obtain
 explicit consent before editing or restarting anything. A changed state directory selects a
 different identity store. Use a distinct `OURS_CONFIG`, port, and state directory for a

package/src/hooks/runner.mjs

@@ -3,6 +3,7 @@ import { readFile } from 'node:fs/promises';
 import { dirname, join, resolve } from 'node:path';
 import { pathToFileURL } from 'node:url';
 import { sendControlCommand } from '../control-server.mjs';
+import { resolveDaemonProfile } from '../profile.mjs';
 
 async function defaultFindPin(cwd) {
   let dir = resolve(cwd || process.cwd());
@@ -62,8 +63,19 @@ export async function handleHook(payload, { env = process.env, fetch: fetchImpl
     if (event === 'SessionStart' && socket && capability && payload.session_id && payload.cwd) {
       await send(socket, capability, { command: 'register_session', sessionId: payload.session_id, threadId: payload.session_id, cwd: payload.cwd });
     }
-    const port = env.OURS_PORT || '3050';
-    const headers = env.OURS_API_TOKEN ? { 'x-ours-api-token': env.OURS_API_TOKEN } : {};
+    let port = env.OURS_PORT || '3050';
+    let selectedToken = env.OURS_API_TOKEN || '';
+    // Standard Codex does not pass through ours-codex's resolved environment.
+    // Resolve its registry association here too so SessionStart/UserPromptSubmit
+    // inspect the same daemon as the stdio proxy. Hook failures remain benign.
+    if (!env.OURS_PORT && !env.OURS_CONFIG && !env.OURS_STATE_DIR) {
+      try {
+        const selected = await resolveDaemonProfile({ env, fetch: fetchImpl });
+        port = String(selected.port);
+        selectedToken = selected.token || '';
+      } catch { /* proxy/launcher owns diagnostics; hooks emit a benign no-op */ }
+    }
+    const headers = selectedToken ? { 'x-ours-api-token': selectedToken } : {};
     let unread = [];
     try {
       const response = await fetchImpl(`http://127.0.0.1:${port}/unread`, { headers, signal: AbortSignal.timeout(1500) });
@@ -83,4 +95,3 @@ async function main() {
 }
 
 if (process.argv[1] && pathToFileURL(process.argv[1]).href === import.meta.url) main();
-

package/src/monitor-mcp.mjs

@@ -20,12 +20,12 @@ const foregroundOffer = (identity) =>
   `Only after an explicit yes, call get_messages once to drain existing unread mail, then ` +
   `call foreground_monitor({ identity: ${JSON.stringify(identity)} }).`;
 
-function foregroundWatchProcess(identity) {
+export function foregroundWatchProcess(identity) {
   try {
     const cliPath = require.resolve('@ours.network/mcp/dist/cli.js');
-    return { command: process.execPath, args: [cliPath, 'watch', identity] };
+    return { command: process.execPath, args: [cliPath, 'watch', '--application', 'codex', identity] };
   } catch {
-    return { command: 'ours-mcp', args: ['watch', identity] };
+    return { command: 'ours-mcp', args: ['watch', '--application', 'codex', identity] };
   }
 }
 

package/src/profile.mjs

@@ -1,6 +1,6 @@
 import { readFile } from 'node:fs/promises';
 import { homedir } from 'node:os';
-import { join, resolve } from 'node:path';
+import { isAbsolute, join, normalize, resolve } from 'node:path';
 
 const DEFAULT_PORT = 3050;
 
@@ -31,17 +31,148 @@ async function readJson(path) {
   try { return JSON.parse(await readFile(path, 'utf8')); } catch { return {}; }
 }
 
+async function readRequiredJson(path, kind) {
+  let text;
+  try { text = await readFile(path, 'utf8'); }
+  catch (error) { throw rerun(`cannot read ${kind} ${path}: ${error.message}`); }
+  try {
+    const value = JSON.parse(text);
+    if (!value || typeof value !== 'object' || Array.isArray(value)) throw new Error('expected an object');
+    return value;
+  } catch (error) { throw rerun(`${kind} ${path} is corrupt JSON: ${error.message}`); }
+}
+
+async function readRegistryJson(path) {
+  let text;
+  try { text = await readFile(path, 'utf8'); }
+  catch (error) {
+    if (error?.code === 'ENOENT') return null;
+    throw error;
+  }
+  try { return JSON.parse(text); }
+  catch (error) { throw rerun(`registry ${path} is corrupt JSON: ${error.message}`); }
+}
+
 async function readOwnerToken(stateDir) {
   try { return (await readFile(join(stateDir, 'daemon-token'), 'utf8')).trim() || null; } catch { return null; }
 }
 
+export class AssociationError extends Error {
+  constructor(message, code = 'INVALID_ASSOCIATION') {
+    super(`ours profile association: ${message}. Re-run the Nightly installer to repair this association`);
+    this.name = 'AssociationError';
+    this.code = code;
+  }
+}
+
+const rerun = (message, code) => new AssociationError(message, code);
+const PROFILE_ID = /^[A-Za-z0-9](?:[A-Za-z0-9_-]{0,30}[A-Za-z0-9])?$/;
+const APPLICATIONS = ['claude-code', 'codex', 'hermes'];
+
+function associatedPath(value, profileId, field) {
+  if (typeof value !== 'string' || !isAbsolute(value) || normalize(value) !== value || value === '/') {
+    throw rerun(`profile ${profileId} has unsafe ${field}`);
+  }
+  return value;
+}
+
+function validateProfile(profileId, value) {
+  if (!PROFILE_ID.test(profileId)) throw rerun(`invalid profile id ${JSON.stringify(profileId)}`);
+  if (!value || typeof value !== 'object' || Array.isArray(value)) throw rerun(`profile ${profileId} is not an object`);
+  for (const key of Object.keys(value)) {
+    if (!['label', 'host', 'port', 'configPath', 'stateDir', 'serviceName', 'ownership'].includes(key)) {
+      throw rerun(`profile ${profileId} contains unsupported field ${JSON.stringify(key)}`);
+    }
+  }
+  if (typeof value.label !== 'string' || !value.label.trim()) throw rerun(`profile ${profileId} has no label`);
+  const host = String(value.host || '').toLowerCase();
+  if (host !== 'localhost' && host !== '127.0.0.1') throw rerun(`profile ${profileId} uses non-loopback host ${JSON.stringify(value.host)}`);
+  if (typeof value.port !== 'number') throw rerun(`profile ${profileId} has invalid port`);
+  let port;
+  try { port = validPort(value.port); }
+  catch { throw rerun(`profile ${profileId} has invalid port`); }
+  const configPath = associatedPath(value.configPath, profileId, 'configPath');
+  const stateDir = associatedPath(value.stateDir, profileId, 'stateDir');
+  const serviceName = typeof value.serviceName === 'string' ? value.serviceName.trim() : '';
+  if ((profileId !== 'default' && !serviceName) || (serviceName && !PROFILE_ID.test(serviceName))) {
+    throw rerun(`profile ${profileId} has invalid serviceName`);
+  }
+  const ownership = value.ownership;
+  if (!ownership || typeof ownership !== 'object' || Array.isArray(ownership)) throw rerun(`profile ${profileId} has no explicit ownership`);
+  for (const key of Object.keys(ownership)) if (!['config', 'service', 'state'].includes(key)) throw rerun(`profile ${profileId} ownership contains unsupported field ${JSON.stringify(key)}`);
+  if (typeof ownership.config !== 'boolean' || typeof ownership.service !== 'boolean' || typeof ownership.state !== 'boolean') {
+    throw rerun(`profile ${profileId} has invalid ownership`);
+  }
+  return { ...value, label: value.label.trim(), host: '127.0.0.1', port, configPath, stateDir, serviceName };
+}
+
+function associatedProfile(registry, application) {
+  if (!registry || typeof registry !== 'object' || Array.isArray(registry)) throw rerun('registry is not an object');
+  for (const key of Object.keys(registry)) if (!['version', 'profiles', 'harnessAssociations'].includes(key)) throw rerun(`registry contains unsupported field ${JSON.stringify(key)}`);
+  if (registry.version !== 1) throw rerun(`unsupported registry version ${JSON.stringify(registry.version)}`);
+  if (!registry.profiles || typeof registry.profiles !== 'object' || Array.isArray(registry.profiles) ||
+      !registry.harnessAssociations || typeof registry.harnessAssociations !== 'object' || Array.isArray(registry.harnessAssociations)) {
+    throw rerun('registry profiles and harnessAssociations must be objects');
+  }
+  const profiles = Object.fromEntries(Object.entries(registry.profiles).map(([id, value]) => [id, validateProfile(id, value)]));
+  const profileEntries = Object.entries(profiles);
+  for (let index = 0; index < profileEntries.length; index += 1) {
+    const [id, profile] = profileEntries[index];
+    for (const [otherId, other] of profileEntries.slice(index + 1)) {
+      const collision = profile.port === other.port ? 'endpoint'
+        : resolve(profile.stateDir) === resolve(other.stateDir) ? 'stateDir'
+          : profile.configPath === other.configPath ? 'configPath'
+            : profile.serviceName === other.serviceName ? 'serviceName' : '';
+      if (collision) throw rerun(`profiles ${id} and ${otherId} collide on ${collision}`);
+    }
+  }
+  for (const [key, value] of Object.entries(registry.harnessAssociations)) {
+    if (!APPLICATIONS.includes(key) || typeof value !== 'string' || !profiles[value]) {
+      throw rerun(`invalid association ${JSON.stringify(key)} -> ${JSON.stringify(value)}`);
+    }
+  }
+  const profileId = registry.harnessAssociations[application];
+  if (profileId == null) return null;
+  return { profileId, ...profiles[profileId] };
+}
+
 export async function resolveDaemonProfile({ argv = [], env = process.env, readConfig, fetch: fetchImpl = globalThis.fetch } = {}) {
   const parsed = parseOursArgs(argv);
-  const configPath = env.OURS_CONFIG || join(env.HOME || homedir(), '.ours', 'config.json');
-  const config = await (readConfig ? readConfig(configPath) : readJson(configPath));
+  const home = env.HOME || homedir();
+  const defaultConfigPath = join(home, '.ours', 'config.json');
+  const explicitPort = parsed.port != null || (env.OURS_PORT != null && env.OURS_PORT !== '');
+  const explicitConfig = !!env.OURS_CONFIG;
+  const explicitState = !!env.OURS_STATE_DIR;
+  let association = null;
+  if (!explicitPort && !explicitConfig && !explicitState) {
+    const registryPath = env.OURS_INSTALL_PROFILES || join(home, '.ours', 'installer-profiles.json');
+    if (env.OURS_INSTALL_PROFILES && (!isAbsolute(registryPath) || normalize(registryPath) !== registryPath || registryPath === '/')) {
+      throw rerun('OURS_INSTALL_PROFILES must be a normalized absolute path');
+    }
+    let registry;
+    try { registry = await readRegistryJson(registryPath); }
+    catch (error) {
+      if (String(error?.message || '').startsWith('ours profile association:')) throw error;
+      throw rerun(`cannot read registry ${registryPath}: ${error?.message || error}`);
+    }
+    if (registry) association = associatedProfile(registry, 'codex');
+  }
+  const configPath = env.OURS_CONFIG || association?.configPath || defaultConfigPath;
+  const config = await (readConfig ? readConfig(configPath) : association
+    ? readRequiredJson(configPath, `associated config for ${association.profileId}`)
+    : readJson(configPath));
   let source = 'default';
   let port = DEFAULT_PORT;
-  if (config?.port != null) { port = validPort(config.port); source = env.OURS_CONFIG ? 'OURS_CONFIG' : 'config'; }
+  if (typeof config?.port === 'number' && Number.isFinite(config.port)) {
+    port = validPort(config.port);
+    source = env.OURS_CONFIG ? 'OURS_CONFIG' : association ? 'registry' : 'config';
+  }
+  if (association) {
+    const configState = resolve(typeof config?.stateDir === 'string' ? config.stateDir : join(home, '.ours'));
+    if (port !== association.port || configState !== resolve(association.stateDir)) {
+      throw rerun(`profile ${association.profileId} disagrees with ${configPath} on port/stateDir`, 'CONFIG_DRIFT');
+    }
+  }
   if (env.OURS_PORT != null && env.OURS_PORT !== '') { port = validPort(env.OURS_PORT); source = 'OURS_PORT'; }
   if (parsed.port != null) { port = parsed.port; source = '--ours-port'; }
 
@@ -57,7 +188,14 @@ export async function resolveDaemonProfile({ argv = [], env = process.env, readC
     throw new Error(`incompatible service on port ${port}; expected an ours daemon with notification protocol 1`);
   }
   const stateDir = resolve(info.stateDir);
-  const token = env.OURS_API_TOKEN?.trim() || config?.apiToken?.trim() || await readOwnerToken(stateDir);
+  const expectedStateDir = env.OURS_STATE_DIR ? resolve(env.OURS_STATE_DIR) : association ? resolve(association.stateDir) : null;
+  if (expectedStateDir && stateDir !== expectedStateDir) {
+    throw association
+      ? rerun(`profile ${association.profileId} expects stateDir ${expectedStateDir}, daemon reports ${stateDir}`)
+      : new Error(`ours daemon stateDir mismatch: expected ${expectedStateDir}, daemon reports ${stateDir}`);
+  }
+  const selectedStateDir = expectedStateDir || stateDir;
+  const token = env.OURS_API_TOKEN?.trim() || config?.apiToken?.trim() || await readOwnerToken(selectedStateDir);
   const headers = token ? { 'x-ours-api-token': token } : {};
   let capability;
   try { capability = await fetchImpl(`${baseUrl}/identities`, { headers, signal: AbortSignal.timeout(2000) }); }
@@ -71,8 +209,9 @@ export async function resolveDaemonProfile({ argv = [], env = process.env, readC
   if (!unread.ok) throw new Error(`selected daemon lacks the body-free unread API (HTTP ${unread.status}); install the testing daemon build and restart that daemon explicitly`);
 
   return {
-    port, stateDir, token: token || null,
+    port, stateDir: selectedStateDir, token: token || null,
     visibility: env.OURS_API_VISIBILITY || config?.apiVisibility || 'owner',
     source, info, baseUrl, configPath, codexArgs: parsed.codexArgs,
+    ...(association ? { profileId: association.profileId, association } : {}),
   };
 }