@twinsearth/w2m-dsh-plugin 1.9.16 → 1.9.19

package/src/plugin/joint-dev/plan-store.mjs

@@ -1,24 +1,29 @@
 /**
  * joint-dev 计划持久化与人工审批门（本地文件，0600）。
  *
- * 安全不变量（v2 预置）：
+ * 安全不变量（v2）：
  *   · plan_sha256 必须由本模块重算，与文件内容不符即 PLAN_TAMPERED；
  *   · planSha 必须是 64 位小写十六进制，禁止路径穿越；
- *   · 审批绑定 plan_sha256 + approver + authority + 过期时间，approval_sha256 读回时重算；
- *   · 未审批的计划禁止 dispatch（assertDispatchAllowed 是唯一入口）。
- *
- * 审批只由操作员 CLI/UI 写入，不暴露为 agent 工具。
+ *   · 审批绑定 plan_sha256 + approver + authority(70..100) + 有效期（60s..10min）；
+ *   · 审批由 operator Ed25519 私钥签名；签名覆盖除 sig/approval_sha256/operator_key 外的记录体，
+ *     key_id 必须等于公钥指纹（防换公钥），可选 trustedOperatorKeyIds 做信任锚；
+ *   · 审批写入原子（tmp→rename），dispatch 前置门可强制要求签名；
+ *   · consumeApproval 用 O_EXCL 保证"一次审批只能派发一次"。
  */
 import { createHash } from 'node:crypto';
-import { existsSync, mkdirSync, readFileSync, readdirSync, renameSync, statSync, writeFileSync } from 'node:fs';
+import { closeSync, existsSync, fsyncSync, mkdirSync, openSync, readFileSync, readdirSync, renameSync, statSync, writeSync } from 'node:fs';
 import { join } from 'node:path';
 
+import { keyIdOf, verifyApprovalPayload } from '../operator-key.mjs';
+
 const sha256 = (text) => createHash('sha256').update(text, 'utf8').digest('hex');
 const PLAN_SHA = /^[0-9a-f]{64}$/;
-const DEFAULT_APPROVAL_TTL_MS = 24 * 60 * 60 * 1000;
+const APPROVAL_TTL_MIN_MS = 60_000;
+const APPROVAL_TTL_MAX_MS = 10 * 60 * 1000;
 
 const planDir = (stateDir) => join(stateDir, 'joint-dev', 'plans');
 const approvalDir = (stateDir) => join(stateDir, 'joint-dev', 'approvals');
+const consumedDir = (stateDir) => join(stateDir, 'joint-dev', 'consumed');
 
 /** Hash of the plan body WITHOUT plan_sha256 — the same rule buildPlan uses. */
 export function planHashOf(plan) {
@@ -42,6 +47,18 @@ function readPlanFile(stateDir, planSha) {
   return { ok: true, plan, path, saved_at: parsed.saved_at ?? null };
 }
 
+function writeFileAtomic(path, text) {
+  const tmp = path + '.tmp-' + process.pid + '-' + Date.now().toString(36);
+  const fd = openSync(tmp, 'w', 0o600);
+  try {
+    writeSync(fd, text);
+    fsyncSync(fd);
+  } finally {
+    closeSync(fd);
+  }
+  renameSync(tmp, path);
+}
+
 export function savePlan({ stateDir, plan, now = Date.now() }) {
   if (plan === null || typeof plan !== 'object' || !PLAN_SHA.test(String(plan.plan_sha256 ?? ''))) {
     return { ok: false, code: 'PLAN_INVALID' };
@@ -53,10 +70,7 @@ export function savePlan({ stateDir, plan, now = Date.now() }) {
   mkdirSync(planDir(stateDir), { recursive: true });
   const path = join(planDir(stateDir), plan.plan_sha256 + '.json');
   if (existsSync(path)) return { ok: true, path, reused: true };
-  const tmp = path + '.tmp-' + process.pid;
-  writeFileSync(tmp, JSON.stringify({ plan, saved_at: new Date(now).toISOString() }, null, 2), { encoding: 'utf8', mode: 0o600 });
-  // rename is atomic on the same volume; a crash leaves only the tmp file behind.
-  renameSync(tmp, path);
+  writeFileAtomic(path, JSON.stringify({ plan, saved_at: new Date(now).toISOString() }, null, 2));
   return { ok: true, path, reused: false };
 }
 
@@ -72,30 +86,38 @@ export function listPlans({ stateDir, limit = 50 }) {
   const entries = [];
   for (const name of readdirSync(dir)) {
     if (!name.endsWith('.json')) continue;
-    const path = join(dir, name);
+    const sha = name.slice(0, -5);
+    if (!PLAN_SHA.test(sha)) continue;
     try {
-      const stat = statSync(path);
-      entries.push({ plan_sha256: name.slice(0, -5), saved_at_ms: stat.mtimeMs });
-    } catch { /* a vanished plan is simply absent */ }
+      entries.push({ plan_sha256: sha, saved_at_ms: statSync(join(dir, name)).mtimeMs });
+    } catch { /* absent */ }
   }
   entries.sort((a, b) => b.saved_at_ms - a.saved_at_ms);
   return { ok: true, plans: entries.slice(0, Math.max(1, Math.min(200, limit))), total: entries.length };
 }
 
 /**
- * 人工审批。authority 最低 70；TTL 默认 24h；过期/哈希不符/计划被替换时 dispatch 拒绝。
+ * 人工审批。authority 70..100；TTL 60s..10min（决策 2）；传入 signer 时审批带 Ed25519 签名。
+ * signer 只被调用一次：签名覆盖最终要落盘的 body（不含 operator_key / sig / approval_sha256）。
+ *
+ * @param {{stateDir: string, planSha: string, approver: string, authority: number, note?: string, now?: number, ttlMs?: number,
+ *          signer?: (body: object) => {sig: string, key_id: string, public_key_pem: string}}} input
  */
-export function approvePlan({ stateDir, planSha, approver, authority, note = '', now = Date.now(), ttlMs = DEFAULT_APPROVAL_TTL_MS }) {
+export function approvePlan(input) {
+  const { stateDir, planSha, approver, authority, note = '', now = Date.now(), ttlMs = APPROVAL_TTL_MAX_MS, signer } = input;
   if (!PLAN_SHA.test(String(planSha ?? ''))) return { ok: false, code: 'PLAN_SHA_INVALID' };
   if (typeof approver !== 'string' || approver.trim() === '') return { ok: false, code: 'APPROVER_REQUIRED' };
-  if (!Number.isInteger(authority) || authority < 70) return { ok: false, code: 'APPROVAL_AUTHORITY_TOO_LOW', detail: { authority } };
-  if (!Number.isInteger(ttlMs) || ttlMs < 60_000 || ttlMs > 7 * 24 * 60 * 60 * 1000) {
+  if (!Number.isInteger(authority) || authority < 70 || authority > 100) {
+    return { ok: false, code: 'APPROVAL_AUTHORITY_INVALID', detail: { authority } };
+  }
+  if (!Number.isInteger(ttlMs) || ttlMs < APPROVAL_TTL_MIN_MS || ttlMs > APPROVAL_TTL_MAX_MS) {
     return { ok: false, code: 'APPROVAL_TTL_INVALID', detail: { ttlMs } };
   }
   const loaded = readPlanFile(stateDir, planSha);
   if (loaded.ok !== true) return loaded;
   mkdirSync(approvalDir(stateDir), { recursive: true });
-  const body = {
+
+  const base = {
     v: 2,
     plan_sha256: planSha,
     approver,
@@ -104,13 +126,29 @@ export function approvePlan({ stateDir, planSha, approver, authority, note = '',
     approved_at: new Date(now).toISOString(),
     expires_at: new Date(now + ttlMs).toISOString(),
   };
-  const record = { ...body, approval_sha256: sha256(JSON.stringify(body)) };
+  let record = base;
+  if (typeof signer === 'function') {
+    const material = signer({ ...base });
+    if (typeof material?.sig !== 'string' || material.sig === '' || typeof material?.public_key_pem !== 'string') {
+      return { ok: false, code: 'APPROVAL_SIGN_FAILED' };
+    }
+    const keyId = String(material.key_id ?? '');
+    if (keyId === '' || keyId !== keyIdOf(material.public_key_pem)) {
+      return { ok: false, code: 'APPROVAL_KEY_MISMATCH' };
+    }
+    record = { ...base, operator_key: { key_id: keyId, public_key_pem: material.public_key_pem }, sig: material.sig };
+  }
+  const stored = { ...record, approval_sha256: sha256(JSON.stringify(record)) };
   const path = join(approvalDir(stateDir), planSha + '.json');
-  writeFileSync(path, JSON.stringify(record, null, 2), { encoding: 'utf8', mode: 0o600 });
-  return { ok: true, approval: record, path };
+  writeFileAtomic(path, JSON.stringify(stored, null, 2));
+  return { ok: true, approval: stored, path, signed: typeof record.sig === 'string' };
 }
 
-export function loadApproval({ stateDir, planSha, now = Date.now() }) {
+/**
+ * @param {{stateDir: string, planSha: string, now?: number, trustedOperatorKeyIds?: string[]}} input
+ */
+export function loadApproval(input) {
+  const { stateDir, planSha, now = Date.now(), trustedOperatorKeyIds } = input;
   if (!PLAN_SHA.test(String(planSha ?? ''))) return { ok: false, code: 'PLAN_SHA_INVALID' };
   const path = join(approvalDir(stateDir), planSha + '.json');
   if (!existsSync(path)) return { ok: false, code: 'APPROVAL_REQUIRED' };
@@ -119,19 +157,66 @@ export function loadApproval({ stateDir, planSha, now = Date.now() }) {
   if (record?.plan_sha256 !== planSha) return { ok: false, code: 'APPROVAL_STALE' };
   const { approval_sha256: declared, ...body } = record;
   if (sha256(JSON.stringify(body)) !== declared) return { ok: false, code: 'APPROVAL_SIGNATURE_INVALID' };
-  if (!Number.isInteger(record.authority) || record.authority < 70) {
-    return { ok: false, code: 'APPROVAL_AUTHORITY_TOO_LOW', detail: { authority: record.authority } };
+  if (!Number.isInteger(record.authority) || record.authority < 70 || record.authority > 100) {
+    return { ok: false, code: 'APPROVAL_AUTHORITY_INVALID', detail: { authority: record.authority } };
   }
+  const approved = Date.parse(record.approved_at ?? '');
   const expires = Date.parse(record.expires_at ?? '');
-  if (Number.isFinite(expires) && now > expires) return { ok: false, code: 'APPROVAL_EXPIRED', detail: { expires_at: record.expires_at } };
-  return { ok: true, approval: record };
+  if (!Number.isFinite(approved) || !Number.isFinite(expires)) return { ok: false, code: 'APPROVAL_EXPIRY_INVALID' };
+  if (expires - approved < APPROVAL_TTL_MIN_MS || expires - approved > APPROVAL_TTL_MAX_MS) {
+    return { ok: false, code: 'APPROVAL_TTL_INVALID' };
+  }
+  if (now > expires) return { ok: false, code: 'APPROVAL_EXPIRED', detail: { expires_at: record.expires_at } };
+  let strength = 'digest';
+  if (typeof record.sig === 'string') {
+    const pem = record?.operator_key?.public_key_pem;
+    const keyId = record?.operator_key?.key_id;
+    if (typeof pem !== 'string' || pem === '' || typeof keyId !== 'string' || keyId === '') {
+      return { ok: false, code: 'APPROVAL_SIGNATURE_INVALID' };
+    }
+    if (keyId !== keyIdOf(pem)) return { ok: false, code: 'APPROVAL_KEY_MISMATCH' };
+    if (Array.isArray(trustedOperatorKeyIds) && !trustedOperatorKeyIds.includes(keyId)) {
+      return { ok: false, code: 'APPROVAL_KEY_UNTRUSTED', detail: { key_id: keyId } };
+    }
+    if (verifyApprovalPayload(record, record.sig, pem) !== true) {
+      return { ok: false, code: 'APPROVAL_SIGNATURE_INVALID' };
+    }
+    strength = 'signature';
+  }
+  return { ok: true, approval: record, strength };
 }
 
-/** dispatch 前置门：计划必须存在、未被篡改，且已审批、未过期。 */
-export function assertDispatchAllowed({ stateDir, planSha, now = Date.now() }) {
+/**
+ * 一次性消费：O_EXCL 写 consumed/<approval_sha>.json；第二次调用返回 APPROVAL_ALREADY_USED。
+ */
+export function consumeApproval({ stateDir, planSha, approvalSha, now = Date.now() }) {
+  if (!PLAN_SHA.test(String(planSha ?? '')) || !PLAN_SHA.test(String(approvalSha ?? ''))) {
+    return { ok: false, code: 'APPROVAL_SHA_INVALID' };
+  }
+  mkdirSync(consumedDir(stateDir), { recursive: true });
+  const path = join(consumedDir(stateDir), approvalSha + '.json');
+  try {
+    const fd = openSync(path, 'wx', 0o600);
+    try {
+      writeSync(fd, JSON.stringify({ plan_sha256: planSha, approval_sha256: approvalSha, consumed_at: new Date(now).toISOString() }));
+      fsyncSync(fd);
+    } finally { closeSync(fd); }
+    return { ok: true, path };
+  } catch (error) {
+    if (error?.code === 'EEXIST') return { ok: false, code: 'APPROVAL_ALREADY_USED', detail: { path } };
+    return { ok: false, code: 'APPROVAL_CONSUME_FAILED', detail: error instanceof Error ? error.message : String(error) };
+  }
+}
+
+/** dispatch 前置门：计划存在未篡改、审批有效且未过期；requireSignature 时必须是签名审批。 */
+export function assertDispatchAllowed(input) {
+  const { stateDir, planSha, now = Date.now(), requireSignature = false, trustedOperatorKeyIds } = input;
   const plan = loadPlan({ stateDir, planSha });
   if (plan.ok !== true) return { ok: false, code: plan.code ?? 'PLAN_NOT_FOUND' };
-  const approval = loadApproval({ stateDir, planSha, now });
+  const approval = loadApproval({ stateDir, planSha, now, trustedOperatorKeyIds });
   if (approval.ok !== true) return { ok: false, code: approval.code ?? 'APPROVAL_REQUIRED' };
-  return { ok: true, plan: plan.plan, approval: approval.approval };
+  if (requireSignature === true && approval.strength !== 'signature') {
+    return { ok: false, code: 'APPROVAL_SIGNATURE_REQUIRED' };
+  }
+  return { ok: true, plan: plan.plan, approval: approval.approval, strength: approval.strength };
 }

package/src/plugin/joint-dev/relay-dispatch.mjs

@@ -0,0 +1,171 @@
+/**
+ * Joint-dev relay dispatch (v2 S2).
+ *
+ * Turns an approved plan into relay tasks:
+ *   · steps are dispatched in dependency order; a step's `depends_on` is mapped to the task ids of
+ *     the steps it waits for, so the relay's own dependency gate keeps them from running together;
+ *   · task ids are deterministic (`jd-<sha256(plan|step)>`), so retrying a dispatch does not create
+ *     a second task — a relay `TASK_EXISTS` answer is reported as "already dispatched";
+ *   · every control envelope is checked by `inspectControlMessage` (16 KiB, field whitelist, no
+ *     data-plane bytes) and the attempt/outcome is written to the local audit file;
+ *   · capabilities are negotiated first (an older relay is refused), and the leases the relay
+ *     returns are checked: a lease on a machine that was not pinned cancels the task and fails.
+ */
+import { createHash } from 'node:crypto';
+
+import { appendAudit } from './audit-file.mjs';
+import { inspectControlMessage } from './redline.mjs';
+import { readRelayCapabilities, negotiateFeatures } from '../relay-capabilities.mjs';
+
+const sha256 = (text) => createHash('sha256').update(text, 'utf8').digest('hex');
+const trimBase = (value) => (typeof value === 'string' ? value.replace(/\/+$/, '') : '');
+const taskIdOf = (planSha, stepId) => 'jd-' + sha256(planSha + '|' + stepId).slice(0, 26);
+
+/** Kahn order over the plan's dependency graph; unknown dependencies are a refusal, not a guess. */
+function orderSteps(steps) {
+  const byId = new Map(steps.map((step) => [step.step_id, step]));
+  for (const step of steps) {
+    for (const dep of step.depends_on ?? []) {
+      if (!byId.has(dep)) return { ok: false, code: 'PLAN_DEPENDENCY_UNKNOWN', detail: { step_id: step.step_id, depends_on: dep } };
+    }
+  }
+  const placed = new Set();
+  const ordered = [];
+  let remaining = steps.slice();
+  while (remaining.length > 0) {
+    const ready = remaining.filter((step) => (step.depends_on ?? []).every((dep) => placed.has(dep)));
+    if (ready.length === 0) return { ok: false, code: 'PLAN_DEPENDENCY_CYCLE' };
+    for (const step of ready) { ordered.push(step); placed.add(step.step_id); }
+    remaining = remaining.filter((step) => !placed.has(step.step_id));
+  }
+  return { ok: true, steps: ordered };
+}
+
+function writeAudit(file, event) {
+  if (typeof file !== 'string' || file === '') return;
+  try { appendAudit(file, event); } catch { /* an audit write must not change the dispatch outcome */ }
+}
+
+/**
+ * @param {{rabbitUrl: string, token: string, plan: object, approval: object, fetchImpl?: Function,
+ *          timeoutMs?: number, includeOffline?: boolean, auditFile?: string}} input
+ */
+export async function dispatchPlanToRelay(input) {
+  const rabbitUrl = trimBase(input?.rabbitUrl);
+  const token = typeof input?.token === 'string' ? input.token : '';
+  const plan = input?.plan ?? null;
+  const approval = input?.approval ?? null;
+  if (rabbitUrl === '') return { ok: false, code: 'RELAY_URL_REQUIRED' };
+  if (token === '') return { ok: false, code: 'OPERATOR_TOKEN_MISSING' };
+  if (plan === null || typeof plan.plan_sha256 !== 'string') return { ok: false, code: 'PLAN_INVALID' };
+  if (!Array.isArray(plan.steps) || plan.steps.length === 0) return { ok: false, code: 'PLAN_INVALID' };
+  if (approval === null || typeof approval.approval_sha256 !== 'string') return { ok: false, code: 'APPROVAL_REQUIRED' };
+  for (const step of plan.steps) {
+    if (typeof step?.step_id !== 'string' || step.step_id === '' || typeof step?.machine_id !== 'string' || step.machine_id === '' || !Array.isArray(step?.command_argv) || step.command_argv.length === 0) {
+      return { ok: false, code: 'PLAN_STEP_INVALID', detail: { step_id: step?.step_id ?? null } };
+    }
+  }
+  const ordered = orderSteps(plan.steps);
+  if (ordered.ok !== true) return { ok: false, code: ordered.code, detail: ordered.detail ?? null };
+
+  const fetchImpl = input?.fetchImpl ?? globalThis.fetch;
+  const timeoutMs = Number.isInteger(input?.timeoutMs) ? input.timeoutMs : 60_000;
+  const signalOf = () => (typeof AbortSignal !== 'undefined' && typeof AbortSignal.timeout === 'function' ? AbortSignal.timeout(timeoutMs) : undefined);
+  const headers = { authorization: `Bearer ${token}`, 'content-type': 'application/json', accept: 'application/json' };
+  const auditFile = typeof input?.auditFile === 'string' ? input.auditFile : '';
+
+  // R3: when a device token is supplied, every target machine must advertise the same plugin version.
+  if (typeof input?.deviceToken === 'string' && input.deviceToken !== '') {
+    const expected = typeof input?.expectedVersion === 'string' ? input.expectedVersion : null;
+    if (expected !== null) {
+      let fleet;
+      try {
+        const response = await fetchImpl(`${rabbitUrl}/v1/devices`, { headers: { authorization: `Bearer ${input.deviceToken}`, accept: 'application/json' }, signal: signalOf() });
+        fleet = response.ok === true ? await response.json() : null;
+      } catch { fleet = null; }
+      if (fleet === null || !Array.isArray(fleet.devices)) return { ok: false, code: 'VERSION_UNVERIFIABLE', detail: { reason: 'the relay device list could not be read' } };
+      const byId = new Map(fleet.devices.map((device) => [device.machine_id, device]));
+      const skew = ordered.steps
+        .map((step) => ({ machine_id: step.machine_id, version: byId.get(step.machine_id)?.caps?.plugin_version ?? null }))
+        .filter((row) => row.version !== expected);
+      if (skew.length > 0) return { ok: false, code: 'VERSION_SKEW', detail: { expected, machines: skew } };
+    }
+  }
+
+  const capabilities = await readRelayCapabilities({ rabbitUrl, fetchImpl, timeoutMs });
+  const negotiation = negotiateFeatures(capabilities);
+  if (negotiation.ok !== true) {
+    return { ok: false, code: negotiation.code ?? 'RELAY_CAPABILITIES_MISSING', detail: { missing: negotiation.missing ?? null, relay: rabbitUrl } };
+  }
+
+  const dispatched = new Map(); // step_id -> task_id
+  const tasks = [];
+  for (const step of ordered.steps) {
+    const taskId = taskIdOf(plan.plan_sha256, step.step_id);
+    const dependsOn = (step.depends_on ?? []).map((dep) => dispatched.get(dep)).filter((id) => typeof id === 'string');
+    const body = {
+      task_id: taskId,
+      mode: 'broadcast',
+      executor_machine_id: step.machine_id,
+      command_argv: step.command_argv,
+      command_hash: step.command_hash,
+      base_commit: plan.base_commit,
+      plan_sha256: plan.plan_sha256,
+      approval_sha256: approval.approval_sha256,
+      step_id: step.step_id,
+      ...(dependsOn.length > 0 ? { depends_on: dependsOn } : {}),
+      ...(Array.isArray(step.write_scope) && step.write_scope.length > 0 ? { write: true, write_scope: step.write_scope } : {}),
+      ...(step.timeout_ms === undefined ? {} : { timeout_ms: step.timeout_ms }),
+      ...(input?.includeOffline === false ? {} : { include_offline: true }),
+    };
+    const check = inspectControlMessage({ v: 1, type: 'joint.dispatch', body });
+    if (check.ok !== true) {
+      writeAudit(auditFile, { event: 'joint.dispatch.refused', plan_sha256: plan.plan_sha256, step_id: step.step_id, reason_code: check.code ?? 'CONTROL_REFUSED' });
+      return { ok: false, code: check.code ?? 'CONTROL_REFUSED', detail: check.detail ?? null, partial: tasks.length > 0, tasks };
+    }
+    let response;
+    try {
+      response = await fetchImpl(`${rabbitUrl}/v1/task`, { method: 'POST', headers, body: JSON.stringify(body), signal: signalOf() });
+    } catch (error) {
+      writeAudit(auditFile, { event: 'joint.dispatch.failed', plan_sha256: plan.plan_sha256, step_id: step.step_id, task_id: taskId, reason_code: 'RELAY_UNREACHABLE' });
+      return { ok: false, code: 'RELAY_UNREACHABLE', detail: error instanceof Error ? error.message : String(error), partial: tasks.length > 0, tasks };
+    }
+    const doc = await response.json().catch(() => null);
+    if (response.status === 409 && doc?.error?.code === 'TASK_EXISTS') {
+      writeAudit(auditFile, { event: 'joint.dispatch.already', plan_sha256: plan.plan_sha256, step_id: step.step_id, task_id: taskId });
+      dispatched.set(step.step_id, taskId);
+      tasks.push({ step_id: step.step_id, task_id: taskId, already: true, leases: [] });
+      continue;
+    }
+    if (response.ok !== true) {
+      writeAudit(auditFile, { event: 'joint.dispatch.refused', plan_sha256: plan.plan_sha256, step_id: step.step_id, task_id: taskId, reason_code: doc?.error?.code ?? 'RELAY_REFUSED' });
+      return { ok: false, code: doc?.error?.code ?? 'RELAY_REFUSED', status: response.status, detail: doc?.error ?? doc, partial: tasks.length > 0, tasks };
+    }
+    const returnedTaskId = doc?.task_id ?? doc?.task?.task_id ?? taskId;
+    const leases = Array.isArray(doc?.leases) ? doc.leases : [];
+    const foreign = leases.filter((lease) => lease?.state !== 'observing' && lease?.machine_id !== step.machine_id);
+    if (foreign.length > 0) {
+      try {
+        await fetchImpl(`${rabbitUrl}/v1/tasks/${encodeURIComponent(returnedTaskId)}/cancel`, {
+          method: 'POST', headers, body: JSON.stringify({ reason: 'SELECTION_NOT_HONOURED' }), signal: signalOf(),
+        });
+      } catch { /* the refusal below is still the answer */ }
+      writeAudit(auditFile, { event: 'joint.dispatch.not_honoured', plan_sha256: plan.plan_sha256, step_id: step.step_id, task_id: returnedTaskId });
+      return {
+        ok: false,
+        code: 'SELECTION_NOT_HONOURED',
+        detail: { step_id: step.step_id, named: step.machine_id, leased: foreign.map((lease) => lease.machine_id), task_id: returnedTaskId },
+        partial: tasks.length > 0,
+        tasks,
+      };
+    }
+    writeAudit(auditFile, { event: 'joint.dispatch.sent', plan_sha256: plan.plan_sha256, step_id: step.step_id, task_id: returnedTaskId, machine_id: step.machine_id });
+    dispatched.set(step.step_id, returnedTaskId);
+    tasks.push({
+      step_id: step.step_id,
+      task_id: returnedTaskId,
+      leases: leases.map((lease) => ({ machine_id: lease?.machine_id ?? null, state: lease?.state ?? null })),
+    });
+  }
+  return { ok: true, relay_version: capabilities.relay_version ?? null, features: capabilities.features ?? null, tasks };
+}

package/src/plugin/operator-key.mjs

@@ -0,0 +1,73 @@
+/**
+ * Operator Ed25519 key (v2 decisions 1 & 2).
+ *
+ * The key is generated once, stored as a 0600 PKCS#8 PEM under `~/.w2m/operator-key.pem`
+ * (`W2M_OPERATOR_KEY_FILE` overrides), and used to sign plan approvals. The public key travels
+ * with the approval; the private key never leaves this machine and is never logged.
+ */
+import { createHash, createPrivateKey, createPublicKey, generateKeyPairSync, sign, verify } from 'node:crypto';
+import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { dirname, join } from 'node:path';
+
+export function operatorKeyPath(env = process.env) {
+  const explicit = typeof env.W2M_OPERATOR_KEY_FILE === 'string' ? env.W2M_OPERATOR_KEY_FILE.trim() : '';
+  if (explicit !== '') return explicit;
+  return join(homedir(), '.w2m', 'operator-key.pem');
+}
+
+export function keyIdOf(publicKeyPem) {
+  return createHash('sha256').update(publicKeyPem, 'utf8').digest('hex').slice(0, 16);
+}
+
+/** The exact bytes that are signed: the approval body without its signature fields. */
+export function approvalPayloadOf(body) {
+  const { sig, approval_sha256: _ignored, operator_key: _key, ...rest } = body ?? {};
+  return Buffer.from(JSON.stringify(rest), 'utf8');
+}
+
+export function signApprovalPayload(body, privateKey) {
+  return sign(null, approvalPayloadOf(body), privateKey).toString('base64');
+}
+
+export function verifyApprovalPayload(body, signatureBase64, publicKeyPem) {
+  try {
+    const key = createPublicKey(publicKeyPem);
+    return verify(null, approvalPayloadOf(body), key, Buffer.from(String(signatureBase64), 'base64'));
+  } catch { return false; }
+}
+
+/** Load the existing key, or create one and write it 0600. */
+export function ensureOperatorKey(options = {}) {
+  const env = options.env ?? process.env;
+  const path = options.path ?? operatorKeyPath(env);
+  if (existsSync(path)) {
+    const loaded = loadOperatorKey({ path });
+    return loaded.ok === true ? { ...loaded, created: false } : loaded;
+  }
+  try {
+    const { privateKey } = generateKeyPairSync('ed25519');
+    const pem = privateKey.export({ type: 'pkcs8', format: 'pem' });
+    mkdirSync(dirname(path), { recursive: true });
+    writeFileSync(path, pem, { encoding: 'utf8', mode: 0o600 });
+    try { chmodSync(path, 0o600); } catch { /* Windows ACL */ }
+    const loaded = loadOperatorKey({ path });
+    return loaded.ok === true ? { ...loaded, created: true } : loaded;
+  } catch (error) {
+    return { ok: false, code: 'OPERATOR_KEY_CREATE_FAILED', detail: error instanceof Error ? error.message : String(error) };
+  }
+}
+
+export function loadOperatorKey(options = {}) {
+  const env = options.env ?? process.env;
+  const path = options.path ?? operatorKeyPath(env);
+  if (!existsSync(path)) return { ok: false, code: 'OPERATOR_KEY_MISSING', path };
+  try {
+    const pem = readFileSync(path, 'utf8');
+    const privateKey = createPrivateKey(pem);
+    const publicKeyPem = createPublicKey(privateKey).export({ type: 'spki', format: 'pem' });
+    return { ok: true, path, privateKey, publicKeyPem, key_id: keyIdOf(publicKeyPem) };
+  } catch (error) {
+    return { ok: false, code: 'OPERATOR_KEY_UNREADABLE', path, detail: error instanceof Error ? error.message : String(error) };
+  }
+}

package/src/plugin/operator-token-route.mjs

@@ -0,0 +1,71 @@
+/**
+ * `/api/w2m/operator-token` (v2 S0-1): the settings-page half of the secure token setup.
+ *
+ * Wire:
+ *   GET  /api/w2m/operator-token -> { ok, configured, source, fingerprint, path }
+ *   POST /api/w2m/operator-token { token } -> { ok, configured: true, source: 'file', fingerprint, path }
+ *
+ * The token value is written straight into the 0600 file and never echoed back: the response carries
+ * only a fingerprint, so the page can confirm "configured" without the secret ever entering a log,
+ * a transcript or the DOM's value after the save.
+ */
+import { fingerprintOf, readOperatorToken, writeOperatorToken } from './operator-token.mjs';
+
+export const OPERATOR_TOKEN_ROUTE_PATH = '/api/w2m/operator-token';
+const NO_STORE = { 'cache-control': 'no-store' };
+
+/**
+ * @param {object} ctx Cordis context
+ * @param {{path?: () => string|null, configuredToken?: () => string|null}} [deps]
+ */
+export function registerOperatorTokenRoute(ctx, deps = {}) {
+  const status = { mounted: false, reason: 'the host has no Connection service' };
+  if (typeof ctx?.inject !== 'function') return status;
+  ctx.inject(['connection'], (webCtx) => {
+    const registry = webCtx?.connection?.fetch;
+    if (registry === undefined || typeof registry.register !== 'function') {
+      status.reason = 'the connection service carries no fetch registry';
+      return;
+    }
+    const pathOf = () => {
+      const configured = typeof deps?.path === 'function' ? deps.path() : null;
+      return typeof configured === 'string' && configured !== '' ? configured : undefined;
+    };
+    registry.register({
+      path: OPERATOR_TOKEN_ROUTE_PATH,
+      methods: ['GET', 'POST'],
+      requestBody: 'buffered',
+      fetch: async (request) => {
+        if (request.method === 'GET') {
+          const path = pathOf();
+          const read = path === undefined ? readOperatorToken() : readOperatorToken({ path });
+          const configuredToken = typeof deps?.configuredToken === 'function' ? deps.configuredToken() : null;
+          const fromFile = read.configured === true;
+          const source = fromFile ? 'file' : (typeof configuredToken === 'string' && configuredToken !== '' ? 'config-or-env' : null);
+          return Response.json({
+            ok: true,
+            configured: fromFile || source !== null,
+            source,
+            fingerprint: fromFile ? read.fingerprint : (source === null ? null : fingerprintOf(configuredToken)),
+            path: read.path ?? path ?? null,
+          }, { headers: NO_STORE });
+        }
+        let body = null;
+        try { body = await request.json(); } catch { /* refused below */ }
+        const token = typeof body?.token === 'string' ? body.token : '';
+        if (token.trim() === '') {
+          return Response.json({ ok: false, code: 'OPERATOR_TOKEN_REQUIRED' }, { status: 400, headers: NO_STORE });
+        }
+        const path = pathOf();
+        const written = path === undefined ? writeOperatorToken(token) : writeOperatorToken(token, { path });
+        if (written.ok !== true) {
+          return Response.json({ ok: false, code: written.code, detail: written.detail ?? null }, { status: 400, headers: NO_STORE });
+        }
+        return Response.json({ ok: true, configured: true, source: 'file', fingerprint: written.fingerprint, path: written.path }, { headers: NO_STORE });
+      },
+    });
+    status.mounted = true;
+    status.reason = null;
+  });
+  return status;
+}

package/src/plugin/tools-joint.mjs

@@ -0,0 +1,97 @@
+/**
+ * S2-d: the joint-dev tool surface.
+ *
+ * Only the two inert halves live here: a plan can be created/read/listed, and a status can be read.
+ * Approval and dispatch stay in `w2m-joint` (operator CLI) and the settings page — a model can never
+ * sign an approval or send a command, which is the decision-2 boundary.
+ */
+import { buildPlan } from './joint-dev/dispatch.mjs';
+import { assertDispatchAllowed, listPlans, loadApproval, loadPlan, savePlan } from './joint-dev/plan-store.mjs';
+import { loadOperatorKey } from './operator-key.mjs';
+
+const json = (value) => JSON.stringify(value, null, 2);
+
+export function registerJointTools(ctx, { defineTool, stateDir, machineName, output }) {
+  const requireStateDir = () => {
+    if (typeof stateDir === 'string' && stateDir !== '') return stateDir;
+    return null;
+  };
+
+  ctx.tools.register(defineTool({
+    name: 'w2m_joint_plan',
+    description:
+      'Joint-dev plan store (metadata only). action=create builds a canonical plan from steps_json ' +
+      '(an array of {step_id, machine_id, command_argv, depends_on?, write_scope?}), action=list lists ' +
+      'saved plans, action=get reads one. Nothing is approved or dispatched by this tool.',
+    parameters: {
+      action: { type: 'string', enum: ['create', 'list', 'get'], description: 'create | list | get (default list)' },
+      steps_json: { type: 'string', description: 'action=create: JSON array of steps' },
+      base_commit: { type: 'string', description: 'action=create: base commit the plan is anchored to' },
+      plan_sha256: { type: 'string', description: 'action=get: the 64-hex plan id' },
+    },
+    output: output ?? { type: 'json' },
+    async execute(args) {
+      const dir = requireStateDir();
+      if (dir === null) return json({ ok: false, code: 'JOINT_STATE_UNAVAILABLE', detail: 'no stateDir configured for this plugin' });
+      const action = typeof args?.action === 'string' ? args.action : 'list';
+      if (action === 'list') return json({ ok: true, ...listPlans({ stateDir: dir }) });
+      if (action === 'get') {
+        const loaded = loadPlan({ stateDir: dir, planSha: String(args?.plan_sha256 ?? '') });
+        return json(loaded);
+      }
+      if (action === 'create') {
+        let steps;
+        try { steps = JSON.parse(String(args?.steps_json ?? '')); } catch { return json({ ok: false, code: 'PLAN_STEPS_INVALID' }); }
+        const built = buildPlan({ base_commit: typeof args?.base_commit === 'string' ? args.base_commit : undefined, steps });
+        if (built.ok !== true) return json(built);
+        const saved = savePlan({ stateDir: dir, plan: built.plan });
+        if (saved.ok !== true) return json(saved);
+        return json({
+          ok: true,
+          plan_sha256: built.plan.plan_sha256,
+          steps: built.plan.steps.length,
+          machines: [...new Set(built.plan.steps.map((step) => step.machine_id))],
+          path: saved.path,
+          reused: saved.reused,
+          initiator: machineName ?? null,
+        });
+      }
+      return json({ ok: false, code: 'PLAN_ACTION_INVALID', detail: { action } });
+    },
+    presentCall: () => ({ card: 'generic', title: 'joint plan', kind: 'read', rawInput: {} }),
+  }));
+
+  ctx.tools.register(defineTool({
+    name: 'w2m_joint_status',
+    description:
+      'Read one joint-dev plan and its approval state (metadata only): approval strength, expiry, ' +
+      'whether a signed approval allows dispatch, and the per-step machine/command hash. It never ' +
+      'returns argv, output or file bytes, and it cannot approve or dispatch.',
+    parameters: {
+      plan_sha256: { type: 'string', description: 'the 64-hex plan id' },
+    },
+    output: output ?? { type: 'json' },
+    async execute(args) {
+      const dir = requireStateDir();
+      if (dir === null) return json({ ok: false, code: 'JOINT_STATE_UNAVAILABLE' });
+      const planSha = String(args?.plan_sha256 ?? '');
+      const plan = loadPlan({ stateDir: dir, planSha });
+      if (plan.ok !== true) return json(plan);
+      const key = loadOperatorKey();
+      const trusted = key.ok === true ? [key.key_id] : [];
+      const gate = assertDispatchAllowed({ stateDir: dir, planSha, requireSignature: true, trustedOperatorKeyIds: trusted });
+      const approval = loadApproval({ stateDir: dir, planSha, trustedOperatorKeyIds: trusted });
+      return json({
+        ok: true,
+        plan_sha256: planSha,
+        steps: plan.plan.steps.map((step) => ({ step_id: step.step_id, machine_id: step.machine_id, command_hash: step.command_hash })),
+        approval: approval.ok === true
+          ? { strength: approval.strength, approver: approval.approval.approver, expires_at: approval.approval.expires_at, key_id: approval.approval.operator_key?.key_id ?? null }
+          : { state: approval.code },
+        dispatch_allowed: gate.ok === true,
+        blocked_by: gate.ok === true ? null : gate.code,
+      });
+    },
+    presentCall: () => ({ card: 'generic', title: 'joint status', kind: 'read', rawInput: {} }),
+  }));
+}