@twinsearth/w2m-dsh-plugin 1.9.17 → 1.9.19

package/src/plugin/tools.mjs

@@ -191,7 +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 { 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';
@@ -285,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.17';
+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;
@@ -3627,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:

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/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 });