@ours.network/claude-code 1.2.0-nightly.1 → 1.2.0-nightly.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ours.network/claude-code",
-  "version": "1.2.0-nightly.1",
+  "version": "1.2.0-nightly.10",
   "description": "Claude Code plugin for ours \u2014 secure agent-to-agent messaging over ADAPT with native host network transport.",
   "type": "module",
   "license": "FSL-1.1-Apache-2.0",
@@ -45,9 +45,10 @@
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.29.0",
-    "@ours.network/sdk": "3.8.1-nightly.3",
+    "@ours.network/sdk": "3.8.1-nightly.15",
     "ws": "^8.21.0",
-    "zod": "^3.25.76"
+    "zod": "^3.25.76",
+    "@ours.network/mcp": "1.2.0-nightly.10"
   },
   "devDependencies": {
     "@types/node": "^20.14.0",

package/skills/ours/SKILL.md

@@ -93,12 +93,12 @@ existing file.
    **control-plane monitoring proxy is not available in this release** — there is no tool
    to call. See "Control plane" below.
 
-- **Configuration.** Port, state dir, broker, and GC interval are configurable
-  (env > `~/.ours/config.json` > default; port default 3050). Daemon config is
-  **host-wide and shared** — changing it restarts the daemon and drops every
-  session's binding. Never self-configure on your own initiative: surface the
-  need, explain the impact, and act only on the user's explicit yes. Details:
-  `references/configuration.md`.
+- **Configuration.** Every client selects the HTTP gateway through
+  `~/.ours-client/profile.json` (or the whole-profile `OURS_CONFIG` override).
+  `serverUrl` is the base URL; daemon and Cowork use `/daemon` and `/cowork`
+  beneath it. Import the issued credential with `ours-install client`.
+  Local daemon ports, state directories, and Unix sockets are not client routes.
+  Missing or invalid configuration fails closed. See `references/configuration.md`.
 
 ## ours-fleet — persistent harness roles
 
@@ -404,9 +404,8 @@ release, and do not improvise a substitute. Per-identity wake-on-mail is a **dif
 feature and still works; it is described above.
 ## Notes
 
-- Identities and their state (contacts, history, keys) persist under the daemon's state dir
-  (`OURS_STATE_DIR`, default `~/.ours`) and survive restarts. The daemon is a singleton
-  shared by all your Claude Code sessions.
+- Identity state is stored on the selected server and survives client restarts.
+  Clients access it through the gateway; no server state directory is required locally.
 - Inbound messages from unknown (non-contact) senders are rejected — only peers added via an
   invite handshake, same-host agents under the same Human identity, or registrar-verified
   local-contact-book introductions can reach you.
@@ -414,4 +413,4 @@ feature and still works; it is described above.
   as immutable content-addressed blobs. The wake path stays body-free:
   `notifications.log` and `unread.json` contain metadata only, and SessionStart reads no bodies.
 - This is a **Claude-Code-specific seam** (Monitor + SessionStart hook + the `watch`
-  command). Other clients wire the same `notifications.log` signal to their own wake mechanism.
+  command). Clients consume gateway notification APIs for their own wake mechanisms.

package/skills/ours/references/configuration.md

@@ -1,26 +1,24 @@
-# ours daemon configuration
+# Shared gateway client configuration
 
-ours-mcp is a client of one already-running shared daemon. The operator CLI owns
-configuration and lifecycle:
+Fleet, ours CLI, MCP and harness hooks select one server through
+`~/.ours-client/profile.json`. `serverUrl` names the HTTP(S) gateway, with
+optional base path. Daemon operations use `/daemon`; Cowork uses `/cowork`.
+The profile also pins `expectedInstanceId` and an absolute `credentialPath`.
+An optional `endpoint` must equal `serverUrl + "/daemon"`.
 
-```sh
-ours config show --json
-ours config setup --port 3050 --state-dir "$HOME/.ours"
-ours daemon start
-ours daemon status --json
-```
+Import a prepared private profile with `ours-install client --config /absolute/profile.json`.
+Use `ours config show --json` to inspect connection metadata without reading the token.
+Keep the profile directory mode 0700 and files mode 0600. `OURS_CONFIG` may
+select the same whole profile for all clients. Remove legacy `OURS_PORT`,
+`OURS_STATE_DIR`, `OURS_API_TOKEN` and `OURS_DAEMON_ID` overrides.
 
-The MCP adapter uses the published SDK's coherent selection. The wholly default
-selection is port 3050 with state directory `~/.ours`. For another daemon, set
-`OURS_CONFIG`, or set matching `OURS_PORT` and `OURS_STATE_DIR`. A token or
-endpoint selection must be paired with its state directory. The daemon's
-`/state-dir` response is verified before credentials are sent.
+Missing profiles, rejected credentials and unavailable gateways fail closed.
+Clients never read daemon state, start a daemon, or try a local port/socket.
+Hooks use the same gateway and return a harmless no-op on failure. Their
+application-local identity/session files do not select another server.
 
-The adapter never starts a daemon and never falls back to an embedded one.
-`OURS_INSTANCE`, `--application`, and old ours-mcp daemon variables are errors.
-Do not add a duplicate MCP registration; the managed command is simply
-`ours-mcp proxy`.
-
-Changing daemon configuration or restarting the shared daemon affects every
-connected application. Explain that blast radius and obtain the user's consent
-before making operator-level changes.
+For full-stack setup, a custom public port (such as 4050), systemd propagation
+and migration, see the [gateway setup guide](https://github.com/adapt-toolkit/ours-network/blob/prerelease/packages/installer/GATEWAY_SETUP.md).
+The coordinated gateway changes require approved matching package releases;
+current npm nightly is not automatically evidence that these changes are installed.
+Server administration uses `ours-install server` on the server host.

package/bin/container-file-transfer.mjs

@@ -1,147 +0,0 @@
-import { randomUUID } from 'node:crypto';
-import { createReadStream, createWriteStream, mkdirSync } from 'node:fs';
-import { basename, dirname, resolve } from 'node:path';
-import { spawn, spawnSync } from 'node:child_process';
-import { pipeline } from 'node:stream/promises';
-
-function helperInvocation(container, command, args) {
-  const entrypoint = container.args.indexOf('/opt/ours/node_modules/@ours.network/mcp/dist/container.js');
-  return { ...container, args: [...container.args.slice(0, entrypoint + 2), command, ...args] };
-}
-
-function helperJson(container, command, args) {
-  const call = helperInvocation(container, command, args);
-  const child = spawnSync(call.command, call.args, { env: call.env, encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'], timeout: 5000, maxBuffer: 1024 * 1024 });
-  if (child.error) throw child.error;
-  if (child.status !== 0) throw new Error(child.stderr.trim() || `${command} exited ${child.status}`);
-  return JSON.parse(child.stdout);
-}
-
-async function runHelper(container, command, args, input, output) {
-  const call = helperInvocation(container, command, args);
-  const child = spawn(call.command, call.args, { env: call.env, stdio: ['pipe', 'pipe', 'pipe'] });
-  let stderr = '';
-  child.stderr.setEncoding('utf8');
-  child.stderr.on('data', (chunk) => { stderr += chunk; });
-  const exited = new Promise((resolveExit, reject) => {
-    child.once('error', reject);
-    child.once('close', (code, signal) => code === 0 ? resolveExit() : reject(new Error(stderr.trim() || `${command} exited ${signal ?? code}`)));
-  });
-  const streams = [];
-  if (input) streams.push(pipeline(input, child.stdin)); else child.stdin.end();
-  if (output) streams.push(pipeline(child.stdout, output)); else child.stdout.resume();
-  const results = await Promise.allSettled([...streams, exited]);
-  const failed = results.find((result) => result.status === 'rejected');
-  if (failed) throw failed.reason;
-}
-
-async function stageFile(container, id, hostPath) {
-  const abs = resolve(hostPath);
-  const call = helperInvocation(container, 'file-stage', [id, basename(abs)]);
-  const child = spawn(call.command, call.args, { env: call.env, stdio: ['pipe', 'pipe', 'pipe'] });
-  let stdout = '', stderr = '';
-  child.stdout.setEncoding('utf8'); child.stdout.on('data', (v) => { stdout += v; });
-  child.stderr.setEncoding('utf8'); child.stderr.on('data', (v) => { stderr += v; });
-  const exited = new Promise((resolveExit, reject) => {
-    child.once('error', reject);
-    child.once('close', (code, signal) => code === 0 ? resolveExit() : reject(new Error(stderr.trim() || `file-stage exited ${signal ?? code}`)));
-  });
-  const results = await Promise.allSettled([pipeline(createReadStream(abs), child.stdin), exited]);
-  const failed = results.find((result) => result.status === 'rejected');
-  if (failed) throw failed.reason;
-  return { path: JSON.parse(stdout).path, abs };
-}
-
-function toolError(id, error) {
-  return { jsonrpc: '2.0', id, result: { content: [{ type: 'text', text: `host file transfer failed: ${error instanceof Error ? error.message : String(error)}` }], isError: true } };
-}
-
-async function removeTransfer(container, id) {
-  try { await runHelper(container, 'file-remove', [id]); } catch { /* preserve the primary result */ }
-}
-
-async function eachLine(stream, visit) {
-  let pending = Buffer.alloc(0);
-  for await (const chunk of stream) {
-    pending = Buffer.concat([pending, chunk]);
-    let newline;
-    while ((newline = pending.indexOf(10)) !== -1) {
-      const line = pending.subarray(0, newline + 1);
-      pending = pending.subarray(newline + 1);
-      await visit(line);
-    }
-  }
-  if (pending.length) await visit(pending);
-}
-
-export function runContainerProxy(container) {
-  const child = spawn(container.command, container.args, { stdio: ['pipe', 'pipe', 'inherit'], env: container.env });
-  const pending = new Map();
-  let stopping = false;
-  const stopInput = () => { stopping = true; process.stdin.destroy(); };
-  child.stdin.on('error', stopInput);
-  let outputWrites = Promise.resolve();
-  const writeOutput = (bytes) => { outputWrites = outputWrites.then(() => new Promise((done) => process.stdout.write(bytes, done))); return outputWrites; };
-
-  const inputDone = eachLine(process.stdin, async (raw) => {
-    let message;
-    try { message = JSON.parse(raw.toString('utf8')); } catch { child.stdin.write(raw); return; }
-    // Forward cancellation unchanged. The upstream handler owns cancellation;
-    // keep transfer tracking until its actual response so a completed save is
-    // copied to the host and its staging directory is removed.
-    if (message?.method === 'notifications/cancelled') { child.stdin.write(raw); return; }
-    if (message?.method !== 'tools/call' || !message.params?.arguments) { child.stdin.write(raw); return; }
-    const name = message.params.name;
-    if (name !== 'send_file' && name !== 'save_file') { child.stdin.write(raw); return; }
-    const args = message.params.arguments;
-    if (name === 'send_file' && !args.path) { child.stdin.write(raw); return; }
-    const id = randomUUID();
-    try {
-      if (name === 'send_file') {
-        const staged = await stageFile(container, id, args.path);
-        message.params.arguments = { ...args, path: staged.path, filename: args.filename ?? basename(staged.abs) };
-        pending.set(message.id, { id, kind: name });
-      } else {
-        const hostPath = resolve(args.dest_path);
-        const target = helperJson(container, 'file-target', [id]);
-        message.params.arguments = { ...args, dest_path: target.path };
-        pending.set(message.id, { id, kind: name, hostPath, containerPath: target.path });
-      }
-      if (!stopping) child.stdin.write(`${JSON.stringify(message)}\n`);
-    } catch (error) {
-      await removeTransfer(container, id);
-      await writeOutput(`${JSON.stringify(toolError(message.id, error))}\n`);
-    }
-  }).catch((error) => {
-    if (!stopping) { process.stderr.write(`ours: container MCP input failed: ${error.message}\n`); process.exitCode = 1; child.kill(); }
-  }).finally(() => { if (!child.stdin.destroyed) child.stdin.end(); });
-
-  const outputDone = eachLine(child.stdout, async (raw) => {
-    let message;
-    try { message = JSON.parse(raw.toString('utf8')); } catch { await writeOutput(raw); return; }
-    const transfer = pending.get(message?.id);
-    if (!transfer) { await writeOutput(raw); return; }
-    pending.delete(message.id);
-    try {
-      if (transfer.kind === 'save_file' && !message.error && message.result?.isError !== true) {
-        mkdirSync(dirname(transfer.hostPath), { recursive: true });
-        await runHelper(container, 'file-read', [transfer.id], null, createWriteStream(transfer.hostPath));
-        for (const item of message.result?.content ?? []) {
-          if (item?.type === 'text' && typeof item.text === 'string') item.text = item.text.split(transfer.containerPath).join(transfer.hostPath);
-        }
-      }
-      await writeOutput(`${JSON.stringify(message)}\n`);
-    } catch (error) {
-      await writeOutput(`${JSON.stringify(toolError(message.id, error))}\n`);
-    } finally { await removeTransfer(container, transfer.id); }
-  });
-
-  child.on('error', (error) => { stopInput(); process.stderr.write(`ours: cannot launch container MCP: ${error.message}\n`); process.exitCode = 1; });
-  child.on('close', async (code, signal) => {
-    stopInput();
-    await Promise.allSettled([inputDone, outputDone, outputWrites]);
-    await Promise.allSettled([...pending.values()].map((v) => removeTransfer(container, v.id)));
-    if (signal) process.kill(process.pid, signal); else process.exitCode = process.exitCode || (code === null || code < 0 ? 1 : code);
-  });
-  return child;
-}

package/bin/container-launch.d.mts

@@ -1,2 +0,0 @@
-export function containerInvocation(command: string, args?: string[], env?: NodeJS.ProcessEnv): { command: string; args: string[]; env: NodeJS.ProcessEnv } | null;
-export function readContainerJson(command: string, env?: NodeJS.ProcessEnv): unknown;

package/bin/container-launch.mjs

@@ -1,40 +0,0 @@
-import { readFileSync } from 'node:fs';
-import { homedir } from 'node:os';
-import { isAbsolute, join } from 'node:path';
-import { spawnSync } from 'node:child_process';
-
-// An explicit container selection is authoritative: failures never fall back
-// to a host MCP or host application-identity configuration.
-export function containerInvocation(command, args = [], env = process.env) {
-  const explicitPath = (env.OURS_CONFIG ?? '').trim();
-  const path = explicitPath || join(homedir(), '.ours', 'config.json');
-  let profile;
-  try { profile = JSON.parse(readFileSync(path, 'utf8')); }
-  catch (error) {
-    if (!explicitPath && error.code === 'ENOENT') return null;
-    throw new Error(`cannot read OURS_CONFIG profile ${path}: ${error.message}`);
-  }
-  if (!profile || !Object.hasOwn(profile, 'composeFile')) return null;
-  if (typeof profile.composeFile !== 'string' || !isAbsolute(profile.composeFile)) throw new Error('composeFile must be an absolute path');
-  if (typeof profile.expectedInstanceId !== 'string' || !profile.expectedInstanceId.trim()) throw new Error('container profile requires expectedInstanceId');
-  if (profile.composeProject !== undefined && (typeof profile.composeProject !== 'string' || !profile.composeProject.trim())) throw new Error('composeProject must be a nonempty string');
-  const dockerArgs = ['compose', '-f', profile.composeFile];
-  if (profile.composeProject !== undefined) dockerArgs.push('-p', profile.composeProject);
-  dockerArgs.push('exec', '-T');
-  for (const name of ['CLAUDE_CODE_SESSION_ID', 'OURS_BIND_IDENTITY']) {
-    if (env[name] !== undefined) dockerArgs.push('-e', `${name}=${env[name]}`);
-  }
-  dockerArgs.push('daemon', 'node', '/opt/ours/node_modules/@ours.network/mcp/dist/container.js', profile.expectedInstanceId, command, ...args);
-  return { command: 'docker', args: dockerArgs, env: { ...env, OURS_DAEMON_ID: profile.expectedInstanceId } };
-}
-
-export function readContainerJson(command, env = process.env) {
-  const invocation = containerInvocation(command, [], env);
-  if (!invocation) return null;
-  const child = spawnSync(invocation.command, invocation.args, { env: invocation.env, encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'], timeout: 5000, maxBuffer: 1024 * 1024 });
-  if (child.error) throw child.error;
-  if (child.status !== 0) throw new Error(`ours container ${command} failed: ${child.stderr.trim() || child.status}`);
-  const value = JSON.parse(child.stdout);
-  if (value === null) throw new Error(`ours container ${command} returned null`);
-  return value;
-}