@twinsearth/w2m-dsh-plugin 1.9.16 → 1.9.19

package/src/plugin/tools.mjs

@@ -191,6 +191,8 @@ import {
 import { registerChatRoutes } from './fleet-chat-route.mjs';
 import { registerExecCapabilityRoutes } from './exec-capability-route.mjs';
 import { registerPluginUpdateRoutes } from './update-route.mjs';
+import { registerOperatorTokenRoute } from './operator-token-route.mjs';
+import { registerJointTools } from './tools-joint.mjs';
 import { fingerprintOf, readOperatorToken } from './operator-token.mjs';
 import { registerCaptureRoutes } from './capture-route.mjs';
 import { defaultExecCapabilityFile } from '../util/exec-capability.mjs';
@@ -284,7 +286,7 @@ const MAX_STAGES = 16;
  * `package.json` during `scripts/pack.mjs` rather than hand-maintained, and `W2M_PLUGIN_VERSION`
  * overrides it at runtime for tests and packagers.
  */
-const PLUGIN_VERSION = '1.9.16';
+const PLUGIN_VERSION = '1.9.19';
 
 /** How long any single HTTP call may take before it is aborted, in milliseconds. */
 const DEFAULT_REQUEST_TIMEOUT_MS = 15_000;
@@ -3583,6 +3585,7 @@ export async function apply(ctx, config = {}) {
   // v1.6.8: the plugin panel's "更新" button: GET checks npm latest, POST installs through the
   // verified updater (SHA-256 checked, old package backed up, restart required afterwards).
   const _updateRoutes = registerPluginUpdateRoutes(ctx, { profileDir: () => cfg.profileDir });
+    const _operatorTokenRoute = registerOperatorTokenRoute(ctx, { configuredToken: () => cfg.operatorToken });
 
   // v1.7.1: host-side screenshot + clipboard fallbacks. The DSH desktop shell does not grant the
   // renderer getDisplayMedia/navigator.clipboard, so the chat panel needs a host route that does not
@@ -3625,6 +3628,8 @@ export async function apply(ctx, config = {}) {
   // -------------------------------------------------------------------------------------------
   // 1. w2m_device - read-only
   // -------------------------------------------------------------------------------------------
+  registerJointTools(ctx, { defineTool, stateDir: cfg.stateDir, machineName: cfg.machineName, output: jsonOutput });
+
   ctx.tools.register(defineTool({
     name: 'w2m_devices',
     description:
@@ -4895,8 +4900,8 @@ const result = await request({
             http_status: probe.status,
             protocol_version: health.protocol_version ?? null,
             error: probe.ok ? null : (probe.error?.code ?? `HTTP ${probe.status}`),
-            relay_id: health.relay_id ?? null,
-            relay_version: health.relay_version ?? health.version ?? null,
+            relay_id: health.relay_id ?? null,
+            relay_version: health.relay_version ?? health.version ?? null,
             features: Array.isArray(health.features) ? health.features : null,
             uptime_ms: typeof health.uptime_ms === 'number' ? health.uptime_ms : null,
             started_at: health.started_at ?? null,

package/src/relay/fleet-messages.mjs

@@ -101,6 +101,10 @@ export function createFleetMessages(options = {}) {
     if (sessionId === '') return { ok: false, code: 'BAD_SESSION' };
     const machineId = typeof input?.machine_id === 'string' ? input.machine_id.trim() : '';
     if (machineId === '') return { ok: false, code: 'BAD_MACHINE' };
+    // v1.9.18: chat carries text and slash-command text only; images never travel over the relay.
+    const MEDIA_FIELDS = ['image', 'image_url', 'image_base64', 'image_bytes', 'picture', 'photo', 'thumb', 'thumbnail', 'attachment', 'attachments', 'file', 'files', 'data', 'base64', 'blob', 'binary', 'buffer', 'media', 'sticker_image', 'sticker_data', 'gif', 'png', 'jpeg', 'webp'];
+    const mediaField = Object.keys(input ?? {}).find((key) => MEDIA_FIELDS.includes(key.toLowerCase()));
+    if (mediaField !== undefined) return { ok: false, code: 'CHAT_FIELD_FORBIDDEN', detail: { field: mediaField } };
     if (typeof input?.text !== 'string') return { ok: false, code: 'NOT_TEXT' };
     const text = input.text;
     if (text.trim() === '') return { ok: false, code: 'EMPTY_TEXT' };
@@ -130,6 +134,24 @@ export function createFleetMessages(options = {}) {
       enc = { v: 1, alg: 'aes-256-gcm', iv: rawEnc.iv, tag: rawEnc.tag };
     }
 
+    // v1.9.18: a plain-text message may not smuggle an image payload. Encrypted text is exempt:
+    // it is base64 ciphertext by design and the relay cannot (and must not) inspect it.
+    if (enc === null) {
+      if (/data:(?:image|video|audio)\//i.test(text) || /!\[[^\]]*\]\(/i.test(text)) {
+        return { ok: false, code: 'TEXT_IMAGE_FORBIDDEN' };
+      }
+      const block = text.match(/[A-Za-z0-9+/]{256,}={0,2}/);
+      if (block !== null) {
+        try {
+          const head = Buffer.from(block[0].slice(0, 32), 'base64');
+          const magic = head.slice(0, 4).toString('latin1');
+          if ((head[0] === 0x89 && head.slice(1, 4).toString('latin1') === 'PNG') || (head[0] === 0xff && head[1] === 0xd8) || magic.startsWith('GIF8') || magic.startsWith('RIFF')) {
+            return { ok: false, code: 'TEXT_BINARY_FORBIDDEN' };
+          }
+        } catch { /* not base64 that matters */ }
+      }
+    }
+
     // v1.2.5 idempotency: replay the first message instead of storing the text twice.
     const idempotencyKey = typeof input?.idempotency_key === 'string' && input.idempotency_key.trim() !== ''
       ? input.idempotency_key.trim().slice(0, 64)

package/src/relay/offer-journal.mjs

@@ -0,0 +1,71 @@
+/**
+ * Offer journal (v2 R8): the command an in-flight task will be offered with lives HERE, not in the
+ * ledger.
+ *
+ * The ledger must never carry `command_argv` (it is the relay's durable, copyable record), yet a
+ * relay restart still needs the command to re-offer unclaimed work. The journal is that narrow,
+ * short-lived control-plane store: one 0600 file per task, written before the task is announced,
+ * removed when the task settles or is cancelled. It is not an artifact and carries no output.
+ */
+import { closeSync, existsSync, fsyncSync, mkdirSync, openSync, readFileSync, readdirSync, renameSync, unlinkSync, writeSync } from 'node:fs';
+import { join } from 'node:path';
+
+const journalDir = (stateDir) => join(stateDir, 'offers');
+const journalPath = (stateDir, taskId) => join(journalDir(stateDir), String(taskId).replace(/[^A-Za-z0-9._-]/g, '_') + '.json');
+
+export function writeOfferJournal(stateDir, taskId, payload) {
+  if (typeof stateDir !== 'string' || stateDir === '' || typeof taskId !== 'string' || taskId === '') {
+    return { ok: false, code: 'JOURNAL_INPUT_INVALID' };
+  }
+  mkdirSync(journalDir(stateDir), { recursive: true });
+  const path = journalPath(stateDir, taskId);
+  const tmp = path + '.tmp-' + process.pid;
+  const text = JSON.stringify({
+    v: 1,
+    task_id: taskId,
+    argv: Array.isArray(payload?.argv) ? payload.argv : [],
+    stages: Array.isArray(payload?.stages) ? payload.stages : null,
+    reduce_argv: Array.isArray(payload?.reduce_argv) ? payload.reduce_argv : null,
+    written_at: new Date().toISOString(),
+  });
+  const fd = openSync(tmp, 'w', 0o600);
+  try {
+    writeSync(fd, text);
+    fsyncSync(fd);
+  } finally {
+    closeSync(fd);
+  }
+  renameSync(tmp, path);
+  return { ok: true, path };
+}
+
+export function readOfferJournal(stateDir, taskId) {
+  const path = journalPath(stateDir, taskId);
+  if (!existsSync(path)) return null;
+  try {
+    const parsed = JSON.parse(readFileSync(path, 'utf8'));
+    if (parsed?.task_id !== taskId) return null;
+    return parsed;
+  } catch {
+    return null;
+  }
+}
+
+export function deleteOfferJournal(stateDir, taskId) {
+  try { unlinkSync(journalPath(stateDir, taskId)); return true; } catch { return false; }
+}
+
+/** Remove journals whose task no longer exists (settled, cancelled, or lost). */
+export function pruneOfferJournals(stateDir, liveTaskIds) {
+  const dir = journalDir(stateDir);
+  if (!existsSync(dir)) return 0;
+  const live = liveTaskIds instanceof Set ? liveTaskIds : new Set(liveTaskIds ?? []);
+  let removed = 0;
+  for (const name of readdirSync(dir)) {
+    if (!name.endsWith('.json')) continue;
+    const taskId = name.slice(0, -5);
+    if (live.has(taskId)) continue;
+    try { unlinkSync(join(dir, name)); removed += 1; } catch { /* best effort */ }
+  }
+  return removed;
+}

package/src/relay/p0-projection.mjs

@@ -81,6 +81,16 @@ export function projectLedgerLine(line) {
   try { record = JSON.parse(line); } catch { return { changed: false, line }; }
   // Real ledger lines nest the envelope one level down: {type:'result.stored', result:{envelope:{...}}}.
   // Handle that shape first, then the flat result, then a bare envelope record.
+  // v2 R8: a legacy task record still carries the command itself. Project it to hash + length,
+  // so the scrub can bring old ledgers in line with "persist only metadata".
+  if (record?.type === 'task.created' && record.task && typeof record.task === 'object') {
+    const task = record.task;
+    if (!Array.isArray(task.command_argv)) return { changed: false, line };
+    task.command_argv_len = task.command_argv.length;
+    delete task.command_argv;
+    record.projection = { dropped: ['task.command_argv'], at: new Date().toISOString() };
+    return { changed: true, line: JSON.stringify(record) };
+  }
   let holder = null;
   if (record?.result && typeof record.result === 'object' && record.result.envelope && typeof record.result.envelope === 'object') holder = { parent: record.result, key: 'envelope' };
   else if (record?.result && typeof record.result === 'object') holder = { parent: record, key: 'result' };

package/src/relay/report.mjs

@@ -524,6 +524,41 @@ export function aggregate(task, resultRecords = [], opts = {}) {
 }
 
 /** Convenience wrapper: pull the task + its results out of a RabbitState. */
+/** S3: a read-only progress view. phase/progress are live-only (null after a restart). */
+export function taskProgress(state, taskId, opts = {}) {
+  const task = state.getTask(taskId);
+  if (!task) return null;
+  const aggregate = aggregateTask(state, taskId, opts);
+  const summary = state.taskSummary(task);
+  const machines = aggregate.machines.map((machine) => {
+    const lease = task.leases.get(machine.machine_id) ?? null;
+    return {
+      machine_id: machine.machine_id,
+      lease_state: machine.lease_state,
+      outcome: machine.outcome,
+      exit_code: machine.exit_code ?? null,
+      phase: lease?.phase ?? null,
+      progress: typeof lease?.progress === 'number' ? lease.progress : null,
+      last_heartbeat_at: Number.isFinite(lease?.last_heartbeat_ms) ? rfc3339(lease.last_heartbeat_ms) : null,
+      lease_until: Number.isFinite(lease?.lease_until_ms) ? rfc3339(lease.lease_until_ms) : null,
+    };
+  });
+  return {
+    task_id: taskId,
+    mode: task.mode,
+    plan_sha256: task.plan_sha256 ?? null,
+    approval_sha256: task.approval_sha256 ?? null,
+    step_id: task.step_id ?? null,
+    command_hash: aggregate.expected?.command_hash ?? task.command_hash ?? null,
+    command_argv_len: Array.isArray(task.command_argv) ? task.command_argv.length : 0,
+    status: summary.status,
+    verdict: aggregate.status,
+    terminal: aggregate.status !== 'pending',
+    counts: aggregate.counts,
+    waiting_on: summary.waiting_on,
+    machines,
+  };
+}
 export function aggregateTask(state, taskId, opts = {}) {
   const task = state.getTask(taskId);
   if (!task) throw new ProtocolError('NOT_FOUND', 'unknown task_id', { task_id: taskId });
@@ -614,10 +649,13 @@ export function renderReportMarkdown(agg, task = null) {
     L.push('');
   }
   if (task) {
-    L.push('## 原始命令');
+    // R8: the markdown report is readable by any paired device token, so it must never carry the
+    // command itself. The hash is the command identity; the length is the only shape we expose.
+    L.push('## 命令指纹');
     L.push('');
     L.push('```');
-    L.push(jcs(task.command_argv));
+    L.push('command_hash: ' + (typeof task.command_hash === 'string' ? task.command_hash : '-'));
+    L.push('command_argv_len: ' + (Array.isArray(task.command_argv) ? task.command_argv.length : '-'));
     L.push('```');
     L.push('');
   }

package/src/relay/scrub.mjs

@@ -1,81 +1,94 @@
-/**
- * relay 状态清理（P0）：旧 blob 清除 + ledger 内容投影重建。
- * 只处理已落盘的数据，不联网；dry-run 先报清单，apply 先备份再原子替换。
- */
-import {
-  copyFileSync, existsSync, readdirSync, readFileSync, renameSync, statSync, unlinkSync, writeFileSync,
-} from 'node:fs';
-import { createHash } from 'node:crypto';
-import { join } from 'node:path';
-
-import { projectLedgerLine } from './p0-projection.mjs';
-
-export const LEDGER_CONTENT_FIELDS = ['stdout_head', 'stdout_tail', 'stderr_head', 'stderr_tail', 'command_argv', 'pipeline_hash_material', 'changed_files'];
-const sha256 = (buf) => createHash('sha256').update(buf).digest('hex');
-
-
-/** 清理 ledger：默认 dry-run；apply 时备份 .bak-<ts> 后原子替换。 */
-export function scrubLedger(ledgerPath, { dryRun = true, now = Date.now() } = {}) {
-  if (!existsSync(ledgerPath)) return { ok: true, exists: false, changed: 0, lines: 0, backup: null };
-  const text = readFileSync(ledgerPath, 'utf8');
-  const lines = text.split('\n').filter((line) => line.trim() !== '');
-  let changed = 0;
-  const rewritten = lines.map((line) => {
-    const projected = projectLedgerLine(line);
-    if (projected.changed) changed += 1;
-    return projected.line;
-  });
-  if (dryRun || changed === 0) return { ok: true, exists: true, changed, lines: lines.length, backup: null, dryRun };
-  const backup = ledgerPath + '.bak-' + now;
-  copyFileSync(ledgerPath, backup);
-  const tmp = ledgerPath + '.tmp-' + process.pid;
-  writeFileSync(tmp, rewritten.join('\n') + '\n', 'utf8');
-  renameSync(tmp, ledgerPath);
-  return { ok: true, exists: true, changed, lines: lines.length, backup, dryRun: false };
-}
-
-/** 清点/删除 relay blob 目录（内容寻址文件）。 */
-export function scrubBlobs(blobDir, { dryRun = true, now = Date.now() } = {}) {
-  if (!existsSync(blobDir)) return { ok: true, exists: false, files: [], bytes: 0, deleted: 0, manifest: null };
-  const files = [];
-  let bytes = 0;
-  for (const name of readdirSync(blobDir)) {
-    const path = join(blobDir, name);
-    if (!statSync(path).isFile()) continue;
-    files.push(name);
-    bytes += statSync(path).size;
-  }
-  const manifest = {
-    at: new Date(now).toISOString(),
-    files: files.map((name) => ({ name, sha256: sha256(readFileSync(join(blobDir, name))) })),
-  };
-  if (dryRun) return { ok: true, exists: true, files, bytes, deleted: 0, manifest, dryRun };
-  for (const name of files) unlinkSync(join(blobDir, name));
-  return { ok: true, exists: true, files, bytes, deleted: files.length, manifest, dryRun: false };
-}
-
-/** 验收：扫描目录中是否仍存在内容字段/数据面 marker。 */
-export function scanForContent(rootDir, markers = []) {
-  const hits = [];
-  const walk = (dir) => {
-    for (const name of readdirSync(dir)) {
-      // Backups/temporaries are not live state: they hold the bytes the scrub just moved out.
-      if (/\.bak-|\.tmp-|\.corrupt-/.test(name)) continue;
-      const path = join(dir, name);
-      const stat = statSync(path);
-      if (stat.isDirectory()) { walk(path); continue; }
-      if (stat.size > 32 * 1024 * 1024) continue;
-      // The projection metadata names the dropped fields; scanning it for those names would report
-      // the scrub itself as a leak, so it is removed before the marker check.
-      const text = readFileSync(path, 'utf8').replace(/"projection"\s*:\s*\{[^{}]*\}/g, '');
-      for (const field of LEDGER_CONTENT_FIELDS) {
-        if (text.includes('"' + field + '"')) hits.push({ file: path, marker: field });
-      }
-      for (const marker of markers) {
-        if (marker !== '' && text.includes(marker)) hits.push({ file: path, marker });
-      }
-    }
-  };
-  if (existsSync(rootDir)) walk(rootDir);
-  return { ok: hits.length === 0, hits };
-}
+/**
+ * relay 状态清理（P0）：旧 blob 清除 + ledger 内容投影重建。
+ * 只处理已落盘的数据，不联网；dry-run 先报清单，apply 先备份再原子替换。
+ */
+import {
+  copyFileSync, existsSync, readdirSync, readFileSync, renameSync, rmdirSync, statSync, unlinkSync, writeFileSync,
+} from 'node:fs';
+import { createHash } from 'node:crypto';
+import { join } from 'node:path';
+
+import { projectLedgerLine } from './p0-projection.mjs';
+
+export const LEDGER_CONTENT_FIELDS = ['stdout_head', 'stdout_tail', 'stderr_head', 'stderr_tail', 'command_argv', 'pipeline_hash_material', 'changed_files'];
+const sha256 = (buf) => createHash('sha256').update(buf).digest('hex');
+
+
+/** 清理 ledger：默认 dry-run；apply 时备份 .bak-<ts> 后原子替换。 */
+export function scrubLedger(ledgerPath, { dryRun = true, now = Date.now() } = {}) {
+  if (!existsSync(ledgerPath)) return { ok: true, exists: false, changed: 0, lines: 0, backup: null };
+  const text = readFileSync(ledgerPath, 'utf8');
+  const lines = text.split('\n').filter((line) => line.trim() !== '');
+  let changed = 0;
+  const rewritten = lines.map((line) => {
+    const projected = projectLedgerLine(line);
+    if (projected.changed) changed += 1;
+    return projected.line;
+  });
+  if (dryRun || changed === 0) return { ok: true, exists: true, changed, lines: lines.length, backup: null, dryRun };
+  const backup = ledgerPath + '.bak-' + now;
+  copyFileSync(ledgerPath, backup);
+  const tmp = ledgerPath + '.tmp-' + process.pid;
+  writeFileSync(tmp, rewritten.join('\n') + '\n', 'utf8');
+  renameSync(tmp, ledgerPath);
+  return { ok: true, exists: true, changed, lines: lines.length, backup, dryRun: false };
+}
+
+/** 清点/删除 relay blob 目录（内容寻址；真实布局是 blobs/<aa>/<sha>，递归处理）。 */
+export function scrubBlobs(blobDir, { dryRun = true, now = Date.now() } = {}) {
+  if (!existsSync(blobDir)) return { ok: true, exists: false, files: [], bytes: 0, deleted: 0, manifest: null };
+  const files = [];
+  let bytes = 0;
+  const walk = (dir, rel) => {
+    for (const name of readdirSync(dir)) {
+      const path = join(dir, name);
+      const stat = statSync(path);
+      const relPath = rel === '' ? name : rel + '/' + name;
+      if (stat.isDirectory()) { walk(path, relPath); continue; }
+      files.push(relPath);
+      bytes += stat.size;
+    }
+  };
+  walk(blobDir, '');
+  const manifest = {
+    at: new Date(now).toISOString(),
+    files: files.map((name) => ({ name, sha256: sha256(readFileSync(join(blobDir, name.split('/').join('/')))) })),
+  };
+  if (dryRun) return { ok: true, exists: true, files, bytes, deleted: 0, manifest, dryRun };
+  for (const name of files) unlinkSync(join(blobDir, name));
+  // Remove the empty sharding directories the files lived in, but never the blob root itself.
+  const prune = (dir) => {
+    for (const name of readdirSync(dir)) {
+      const path = join(dir, name);
+      if (statSync(path).isDirectory()) { prune(path); try { rmdirSync(path); } catch { /* not empty */ } }
+    }
+  };
+  prune(blobDir);
+  return { ok: true, exists: true, files, bytes, deleted: files.length, manifest, dryRun: false };
+}
+
+/** 验收：扫描目录中是否仍存在内容字段/数据面 marker。 */
+export function scanForContent(rootDir, markers = []) {
+  const hits = [];
+  const walk = (dir) => {
+    for (const name of readdirSync(dir)) {
+      // Backups/temporaries are not live state: they hold the bytes the scrub just moved out.
+      if (/\.bak-|\.tmp-|\.corrupt-/.test(name)) continue;
+      const path = join(dir, name);
+      const stat = statSync(path);
+      if (stat.isDirectory()) { walk(path); continue; }
+      if (stat.size > 32 * 1024 * 1024) continue;
+      // The projection metadata names the dropped fields; scanning it for those names would report
+      // the scrub itself as a leak, so it is removed before the marker check.
+      const text = readFileSync(path, 'utf8').replace(/"projection"\s*:\s*\{[^{}]*\}/g, '');
+      for (const field of LEDGER_CONTENT_FIELDS) {
+        if (text.includes('"' + field + '"')) hits.push({ file: path, marker: field });
+      }
+      for (const marker of markers) {
+        if (marker !== '' && text.includes(marker)) hits.push({ file: path, marker });
+      }
+    }
+  };
+  if (existsSync(rootDir)) walk(rootDir);
+  return { ok: hits.length === 0, hits };
+}