@twinsearth/w2m-dsh-plugin 1.8.0 → 1.8.2

package/.claude-plugin/marketplace.json

@@ -5,14 +5,14 @@
   },
   "metadata": {
     "description": "The w2m fleet plugins: one account, many machines, any of Windows, macOS or Linux.",
-    "version": "1.8.0"
+    "version": "1.8.2"
   },
   "plugins": [
     {
       "name": "w2m-fleet",
       "source": "./",
       "description": "Read fleet state and dispatch commands across the machines registered to one account. Read-only MCP surface: the five exposed tools cannot change anything.",
-      "version": "1.8.0",
+      "version": "1.8.2",
       "author": {
         "name": "TwinsEarth"
       },
@@ -26,5 +26,5 @@
       ]
     }
   ],
-  "version": "1.8.0"
+  "version": "1.8.2"
 }

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "w2m-fleet",
   "description": "Drive the same project on online Windows, macOS and Linux machines from one account: read fleet state, dispatch commands and read results. The MCP surface is deliberately read-only.",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "author": {
     "name": "TwinsEarth"
   },

package/CHANGELOG.md

@@ -7,6 +7,28 @@
 
 All notable changes to this project are documented here.
 
+## [1.8.2] — 2026-10-26
+
+**GPW 超时策略：黄类（名单外）100 秒无人应答自动同意；黑白名单规则不变；已覆盖父目录的子文件夹拦截记录折叠。**
+
+- **只读工具绿名单扩展**：`read/read_file/search/grep/glob/list/…`、`job_list/job_output/job_status/job_wait`、`w2m_status/w2m_devices/w2m_tasks/w2m_history/w2m_report/w2m_memory/w2m_stats` 判为绿色（无打扰放行）；`job_kill/job_start/w2m_run/w2m_cancel/w2m_intent` 仍为黄色（可变更，需人工）。
+- 超时默认值 120s → **100s**；超时结果由「拒绝」改为「自动同意」（仅黄类 / 名单外路径调用）。
+- 红线（危险命令、敏感/系统路径、显式 deny）仍然立即拒绝，不进入待审批队列；白名单命中仍然立即放行。
+  因此超时规则不会扩大任何名单的授权范围。
+- 自动同意的调用会记录为会话授权（指纹），同一操作的后续出现以蓝色（已授权常态）直接放行。
+- 「最近被拦截」折叠逻辑确认覆盖父目录下的子文件夹：名单条目是根目录，其任意深度子文件夹的拦截记录都会进入
+  「已在名单中 N 条」折叠组（`folder_in` 双向包含匹配）。
+- 新增 `test/gpw-auto-approve.test.mjs`（4 项：超时自动同意→下次变蓝；红线仍拒；白名单立即放行；100s 默认值）。
+- 证据：`docs/acceptance/1.8.2/GPW-AUTO-APPROVE.json`。
+## [1.8.1] — 2026-10-26
+
+**GPW「最近被拦截」去噪：已在名单中的条目折叠显示；加入名单后条目立即消失。**
+
+- 状态接口为每条 recent 增加 `folder_in`（whitelist / blacklist / null）：文件夹已被名单覆盖的拦截记录不再占用主列表。
+- 面板把已覆盖条目折叠为「已在名单中 N 条 · 展开/收起」，展开后只读展示（不重复给加入按钮）。
+- 从最近拦截一键加入白/黑名单时，服务端同步裁剪该条目（以及被同一父目录覆盖的条目），下一次轮询不再出现。
+- 新增 `test/gpw-recent-fold.test.mjs`（4 项：覆盖归属、嵌套覆盖、客户端折叠静态断言、状态接口字段）。
+- 证据：`docs/acceptance/1.8.1/GPW-RECENT-FOLD.json`。
 ## [1.8.0] — 2026-10-26
 
 **GPW 增加四色审核 / 标记 / 提醒系统：绿（通过）、蓝（正常）、黄（警报）、红（风险）。**

package/codex/mcp-servers.toml

@@ -12,6 +12,6 @@
 
 [mcp_servers.w2m-fleet]
 command = "npx"
-args = ["-y", "-p", "@twinsearth/w2m-dsh-plugin@1.8.0", "w2m-mcp"]
+args = ["-y", "-p", "@twinsearth/w2m-dsh-plugin@1.8.2", "w2m-mcp"]
 startup_timeout_sec = 20
 tool_timeout_sec = 60

package/docs/acceptance/1.8.1/GPW-RECENT-FOLD.json

@@ -0,0 +1,21 @@
+{
+  "version": "1.8.1",
+  "case": "GPW-RECENT-FOLD",
+  "kind": "positive",
+  "machines": [
+    "b53a37f4-1464-4512-9259-33a7df091e3e"
+  ],
+  "executed_at": "2026-10-26T06:55:26.042Z",
+  "executor": "lead",
+  "task_id": "local-gpw-fold-20261026065526",
+  "requirement": "recently-intercepted rows already covered by a list are collapsed, and a row the operator adds to a list disappears from the list immediately",
+  "result": {
+    "outcome": "ok",
+    "assertions": {
+      "folder_in": "the state route annotates each recent row with whitelist / blacklist / null",
+      "collapse": "the panel shows covered rows behind \"已在名单中 N 条 · 展开/收起\" and they carry no add buttons",
+      "disappear": "adding a folder from a recent row prunes that row and every row inside the folder server-side",
+      "tests": "test/gpw-recent-fold.test.mjs 4/4"
+    }
+  }
+}

package/docs/acceptance/1.8.2/GPW-AUTO-APPROVE.json

@@ -0,0 +1,23 @@
+{
+  "version": "1.8.2",
+  "case": "GPW-AUTO-APPROVE",
+  "kind": "positive",
+  "machines": [
+    "b53a37f4-1464-4512-9259-33a7df091e3e"
+  ],
+  "executed_at": "2026-10-26T07:41:28.057Z",
+  "executor": "lead",
+  "task_id": "local-gpw-timeout-20261026074128",
+  "requirement": "a class-C (yellow) call with no operator answer is approved after 100 s, while blacklist/whitelist rules and red denials are unchanged; subfolders of a listed parent folder are folded in recently-intercepted",
+  "result": {
+    "outcome": "ok",
+    "assertions": {
+      "timeout": "DEFAULT_PENDING_TIMEOUT_MS = 100_000; on expiry the pending call resolves allow and records a session grant",
+      "lists_unchanged": "red denies immediately (never queued); whitelist hits allow immediately (never queued)",
+      "next_call_blue": "the auto-approved fingerprint is added to session grants, so the identical next call runs immediately",
+      "fold_parents": "folder_in uses bidirectional containment: a child folder under a listed parent maps to that list and is collapsed",
+      "tests": "test/gpw-auto-approve.test.mjs 4/4",
+      "readonly_green": "read-only tools are green (read/grep/glob/web_*/status/health/metrics/inspect, job_list/job_output/job_status/job_wait, w2m_status/devices/tasks/history/report/memory/stats); mutating tools (job_kill/job_start/w2m_run/w2m_cancel/w2m_intent) stay yellow"
+    }
+  }
+}

package/lib/client.js

@@ -569,7 +569,7 @@ const PLUGIN_UPDATE_ROUTE = '/api/w2m/plugin-update';
      * ways: typed here and validated by the host, or taken from a recently intercepted call in one click. The lists
      * live in $DSH_HOME/xclient/gpw-folders.json; no profile YAML is edited by this feature.
      */
-    function GpwPanel({ t, onClose }) {
+    function GpwPanel({ t, sessionId, onClose }) {
       const [state, setState] = React.useState(null);
       const [error, setError] = React.useState(null);
       const [busy, setBusy] = React.useState(false);
@@ -650,8 +650,13 @@ const PLUGIN_UPDATE_ROUTE = '/api/w2m/plugin-update';
           foldRow(items, list),
         ]);
       };
-      const recent = Array.isArray(state?.recent) ? state.recent : [];
-      const pending = Array.isArray(state?.pending) ? state.pending : [];
+      const recentAll = Array.isArray(state?.recent) ? state.recent : [];
+      const recent = recentAll.filter((item) => item?.folder_in === null || item?.folder_in === undefined);
+      const recentInLists = recentAll.filter((item) => item?.folder_in === 'whitelist' || item?.folder_in === 'blacklist');
+      const [showRecentInLists, setShowRecentInLists] = React.useState(false);
+      const pendingAll = Array.isArray(state?.pending) ? state.pending : [];
+      // v1.8.1: an approval belongs to the conversation that raised it; another session must never show it.
+      const pending = pendingAll.filter((item) => item?.session_id === null || item?.session_id === undefined || item?.session_id === sessionId);
       return h('div', { className: 'w2mGpw_overlay', role: 'dialog', 'aria-label': t('gpwTitle') }, [
         h('div', { key: 'card', className: 'w2mGpw_card' }, [
           h('div', { key: 'head', className: 'w2mGpw_head' }, [
@@ -700,6 +705,15 @@ const PLUGIN_UPDATE_ROUTE = '/api/w2m/plugin-update';
             ])),
             foldRow(recent, 'recent'),
           ]),
+          recentInLists.length === 0 ? null : h('div', { key: 'recentInLists', className: 'w2mGpw_block' }, [
+            h('button', { key: 'toggle', type: 'button', className: 'w2mGpw_btn', 'aria-expanded': showRecentInLists, onClick: () => setShowRecentInLists((value) => !value) }, (showRecentInLists ? '收起' : '展开') + ' · 已在名单中 ' + recentInLists.length + ' 条'),
+            ...(showRecentInLists ? recentInLists.map((item, index) => h('div', { key: 'inlist' + index, className: 'w2mGpw_recent' }, [
+              h('div', { key: 'r1', className: 'w2mGpw_row' }, [
+                h('span', { key: 'd', className: 'w2mGpw_dot', 'data-c': item.color ?? 'green' }),
+                h('span', { key: 't', className: 'w2mGpw_path' }, (item.folder ?? '') + ' · 已加入' + (item.folder_in === 'whitelist' ? '白名单' : '黑名单')),
+              ]),
+            ])) : []),
+          ]),
           pending.length === 0 ? null : h('div', { key: 'pending', className: 'w2mGpw_block' }, [
             h('div', { key: 'title', className: 'w2mGpw_title' }, t('gpwPending')),
             ...pending.map((item) => h('div', { key: item.id, className: 'w2mGpw_recent' }, [
@@ -718,7 +732,7 @@ const PLUGIN_UPDATE_ROUTE = '/api/w2m/plugin-update';
     }
 
     /** The floating launcher: a pending badge, and the panel fixed to the lower-right corner. */
-    function GpwLauncher({ t }) {
+    function GpwLauncher({ t, sessionId }) {
       const [open, setOpen] = React.useState(false);
       const [pendingCount, setPendingCount] = React.useState(0);
       React.useEffect(() => {
@@ -754,7 +768,7 @@ const PLUGIN_UPDATE_ROUTE = '/api/w2m/plugin-update';
           t('gpwLauncher'),
           pendingCount > 0 ? h('span', { key: 'badge', className: 'w2mGpw_badge' }, String(pendingCount)) : null,
         ]),
-        open ? h(GpwPanel, { key: 'panel', t, onClose: () => setOpen(false) }) : null,
+        open ? h(GpwPanel, { key: 'panel', t, sessionId, onClose: () => setOpen(false) }) : null,
       ]);
     }
 
@@ -762,7 +776,7 @@ const PLUGIN_UPDATE_ROUTE = '/api/w2m/plugin-update';
      * v1.7.9: the inline approval prompt -- an interception asks a question in the composer row
      * (allow once / deny once / open the panel) instead of waiting silently for the operator.
      */
-    function GpwPrompt({ t }) {
+    function GpwPrompt({ t, sessionId }) {
       const [state, setState] = React.useState(null);
       const [busy, setBusy] = React.useState(false);
       React.useEffect(() => {
@@ -783,7 +797,9 @@ const PLUGIN_UPDATE_ROUTE = '/api/w2m/plugin-update';
           clearInterval(timer);
         };
       }, []);
-      const pending = Array.isArray(state?.pending) ? state.pending : [];
+      const pendingAll = Array.isArray(state?.pending) ? state.pending : [];
+      // v1.8.1: an approval belongs to the conversation that raised it; another session must never show it.
+      const pending = pendingAll.filter((item) => item?.session_id === null || item?.session_id === undefined || item?.session_id === sessionId);
       if (pending.length === 0) return null;
       const item = pending[0];
       const decide = async (decision) => {
@@ -1688,7 +1704,7 @@ function TargetSelect({ sessionId, locked: _locked, t }) {
             id: 'w2m-gpw',
             order: 43,
             label: 'GPW folders',
-            inject: () => ({ t }),
+            inject: (sessionId) => ({ t, sessionId }),
           }, GpwLauncher));
         } catch (error) {
           console.error('@twinsearth/w2m-dsh-plugin: the GPW folder panel was not mounted; the rest of the page is unaffected', error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twinsearth/w2m-dsh-plugin",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "description": "Run one project across your own Windows and macOS machines from a single DeepSeek account, through 11 w2m_* tools. Four coordination modes (replicate, split, broadcast, pipeline) and six aggregate verdicts (consistent, divergent, divergent-platform, failed, partial, unverifiable). P2P hole punching by default, with a bundled relay, STUN responder and ledger fallback, so the fleet needs no third-party service. Joining needs a pairing code plus autoStartAgent: true; installing alone does not join.",
   "type": "module",
   "exports": {
@@ -64,7 +64,7 @@
     "pack": "node scripts/pack.mjs",
     "reachability": "node scripts/reachability-check.mjs",
     "reachability:classify": "node scripts/reachability-classify.mjs",
-    "test": "node --test --test-force-exit test/relay.test.mjs test/broadcast.test.mjs test/blake2s.test.mjs test/agent.test.mjs test/plan-sec-cmd.test.mjs test/authority.test.mjs test/blocks.test.mjs test/approval-index.test.mjs test/fleet-sync.test.mjs test/fleet-merge.test.mjs test/fleet-memory-e2e.test.mjs test/fleet-concurrency.test.mjs test/fleet-merge-race.test.mjs test/health.test.mjs test/storage.test.mjs test/exit-channel.test.mjs test/council.test.mjs test/council-session.test.mjs test/log-bounds.test.mjs test/test-report.test.mjs test/fleet-scale.test.mjs test/fleet-state.test.mjs test/crypto-blake2s.test.mjs test/installed-version.test.mjs test/permission.test.mjs test/machine-test-packet.test.mjs test/field-authority.test.mjs test/approval-gate.test.mjs test/authority-choice.test.mjs test/reachability-check.test.mjs test/reachability-classify.test.mjs test/accepted-orphans.test.mjs test/acceptance-doc.test.mjs test/layer-model.test.mjs test/cwd-containment.test.mjs test/cwd-outside-project.test.mjs test/memory.test.mjs test/tools.test.mjs test/claims.test.mjs test/fleet-target.test.mjs test/client-bundle.test.mjs test/schedule.test.mjs test/auto-update.test.mjs test/update-source.test.mjs test/update-install.test.mjs test/update-wiring.test.mjs test/signing.test.mjs test/stress.test.mjs test/shared-config.test.mjs test/metrics.test.mjs test/metrics-route.test.mjs test/tool-cards.test.mjs test/p2p-stun.test.mjs test/p2p-transport.test.mjs test/p2p-signaling.test.mjs test/p2p-node.test.mjs test/p2p-transport-fields.test.mjs test/p2p-plugin.test.mjs test/p2p-crypto.test.mjs test/stun-server.test.mjs test/loader-entry.test.mjs test/mdns-wire.test.mjs test/mdns-discover.test.mjs test/chatops-approval.test.mjs test/chatops-policy.test.mjs test/chatops-file-safety.test.mjs test/chatops-outbound-queue.test.mjs test/chatops-commands.test.mjs test/chatops-bridge.test.mjs test/chatops-config-route.test.mjs test/chatops-apply.test.mjs test/chatops-ilink-contract.test.mjs test/chatops-fleet.test.mjs test/chatops-account.test.mjs test/chatops-auth.test.mjs test/chatops-fleet-scope.test.mjs test/chatops-handoff.test.mjs test/chatops-fleet-wiring.test.mjs test/chatops-fleet-live.test.mjs test/chatops-takeover.test.mjs test/chatops-device-signing.test.mjs test/chatops-relay-verify.test.mjs test/chatops-durability.test.mjs test/chatops-run-command.test.mjs test/secrets-guard.test.mjs test/chatops-ilink-fleet-bridge.test.mjs test/agent-plugins.test.mjs test/memory-layer.test.mjs test/mcp-server.test.mjs test/portable-plugins.test.mjs test/mcp-http.test.mjs test/mcp-http-live.test.mjs test/vision.test.mjs test/ilink-shape.test.mjs test/chatops-fleet-join.test.mjs test/admission.test.mjs test/admission-routes.test.mjs test/join-degradation.test.mjs test/account-identity.test.mjs test/join-challenge.test.mjs test/exec-env-injection.test.mjs test/account-join.test.mjs test/fleet-messages.test.mjs test/message-shards.test.mjs test/fleet-messages-http.test.mjs test/message-notify.test.mjs test/update-channels.test.mjs test/update-prerelease.test.mjs test/session-watch.test.mjs test/session-readonly.test.mjs test/session-sync.test.mjs test/fleet-chat-identity.test.mjs test/identity-reader.test.mjs test/intents.test.mjs test/dataflow.test.mjs test/council-fleet.test.mjs test/fleet-memory.test.mjs test/memory-view.test.mjs test/schema-spec.test.mjs test/fleet-weight-parity.test.mjs test/task-deps.test.mjs test/dataflow-wiring.test.mjs test/task-graph.test.mjs test/ask-store.test.mjs test/turn.test.mjs test/fleet-members.test.mjs test/redact.test.mjs test/policy-matrix.test.mjs test/envelope-signature.test.mjs test/chat-crypto.test.mjs test/reduce-suggestion.test.mjs test/merge-hint.test.mjs test/fleet-chat-route.test.mjs test/maintenance.test.mjs test/maintenance-ferry.test.mjs test/grant.test.mjs test/grant-gate.test.mjs test/worktree.test.mjs test/patch-artifact.test.mjs test/merge-queue.test.mjs test/m3-workflow.test.mjs test/project-room.test.mjs test/project-attribution.test.mjs test/project-locks.test.mjs test/project-reviews.test.mjs test/project-notifications.test.mjs test/blob-sessions.test.mjs test/outbox.test.mjs test/reliability-metrics.test.mjs test/evidence.test.mjs test/grant-issue.test.mjs test/project-refs.test.mjs test/exec-capability.test.mjs test/secondary-link.test.mjs test/bootstrap-cli.test.mjs test/bootstrap.test.mjs test/windows-hidden-task.test.mjs test/relay-failover.test.mjs test/npm-update.test.mjs test/agent-start-nonblocking.test.mjs test/fleet-chat-capture.test.mjs test/capture-route.test.mjs test/update-resolver.test.mjs test/agent-identity-safe.test.mjs test/re-pair-stale-token.test.mjs test/gpw-folder-policy.test.mjs test/gpw-activation.test.mjs test/gpw-hardening.test.mjs test/gpw-tamper-gate.test.mjs test/gpw-persistence.test.mjs test/gpw-colors.test.mjs",
+    "test": "node --test --test-force-exit test/relay.test.mjs test/broadcast.test.mjs test/blake2s.test.mjs test/agent.test.mjs test/plan-sec-cmd.test.mjs test/authority.test.mjs test/blocks.test.mjs test/approval-index.test.mjs test/fleet-sync.test.mjs test/fleet-merge.test.mjs test/fleet-memory-e2e.test.mjs test/fleet-concurrency.test.mjs test/fleet-merge-race.test.mjs test/health.test.mjs test/storage.test.mjs test/exit-channel.test.mjs test/council.test.mjs test/council-session.test.mjs test/log-bounds.test.mjs test/test-report.test.mjs test/fleet-scale.test.mjs test/fleet-state.test.mjs test/crypto-blake2s.test.mjs test/installed-version.test.mjs test/permission.test.mjs test/machine-test-packet.test.mjs test/field-authority.test.mjs test/approval-gate.test.mjs test/authority-choice.test.mjs test/reachability-check.test.mjs test/reachability-classify.test.mjs test/accepted-orphans.test.mjs test/acceptance-doc.test.mjs test/layer-model.test.mjs test/cwd-containment.test.mjs test/cwd-outside-project.test.mjs test/memory.test.mjs test/tools.test.mjs test/claims.test.mjs test/fleet-target.test.mjs test/client-bundle.test.mjs test/schedule.test.mjs test/auto-update.test.mjs test/update-source.test.mjs test/update-install.test.mjs test/update-wiring.test.mjs test/signing.test.mjs test/stress.test.mjs test/shared-config.test.mjs test/metrics.test.mjs test/metrics-route.test.mjs test/tool-cards.test.mjs test/p2p-stun.test.mjs test/p2p-transport.test.mjs test/p2p-signaling.test.mjs test/p2p-node.test.mjs test/p2p-transport-fields.test.mjs test/p2p-plugin.test.mjs test/p2p-crypto.test.mjs test/stun-server.test.mjs test/loader-entry.test.mjs test/mdns-wire.test.mjs test/mdns-discover.test.mjs test/chatops-approval.test.mjs test/chatops-policy.test.mjs test/chatops-file-safety.test.mjs test/chatops-outbound-queue.test.mjs test/chatops-commands.test.mjs test/chatops-bridge.test.mjs test/chatops-config-route.test.mjs test/chatops-apply.test.mjs test/chatops-ilink-contract.test.mjs test/chatops-fleet.test.mjs test/chatops-account.test.mjs test/chatops-auth.test.mjs test/chatops-fleet-scope.test.mjs test/chatops-handoff.test.mjs test/chatops-fleet-wiring.test.mjs test/chatops-fleet-live.test.mjs test/chatops-takeover.test.mjs test/chatops-device-signing.test.mjs test/chatops-relay-verify.test.mjs test/chatops-durability.test.mjs test/chatops-run-command.test.mjs test/secrets-guard.test.mjs test/chatops-ilink-fleet-bridge.test.mjs test/agent-plugins.test.mjs test/memory-layer.test.mjs test/mcp-server.test.mjs test/portable-plugins.test.mjs test/mcp-http.test.mjs test/mcp-http-live.test.mjs test/vision.test.mjs test/ilink-shape.test.mjs test/chatops-fleet-join.test.mjs test/admission.test.mjs test/admission-routes.test.mjs test/join-degradation.test.mjs test/account-identity.test.mjs test/join-challenge.test.mjs test/exec-env-injection.test.mjs test/account-join.test.mjs test/fleet-messages.test.mjs test/message-shards.test.mjs test/fleet-messages-http.test.mjs test/message-notify.test.mjs test/update-channels.test.mjs test/update-prerelease.test.mjs test/session-watch.test.mjs test/session-readonly.test.mjs test/session-sync.test.mjs test/fleet-chat-identity.test.mjs test/identity-reader.test.mjs test/intents.test.mjs test/dataflow.test.mjs test/council-fleet.test.mjs test/fleet-memory.test.mjs test/memory-view.test.mjs test/schema-spec.test.mjs test/fleet-weight-parity.test.mjs test/task-deps.test.mjs test/dataflow-wiring.test.mjs test/task-graph.test.mjs test/ask-store.test.mjs test/turn.test.mjs test/fleet-members.test.mjs test/redact.test.mjs test/policy-matrix.test.mjs test/envelope-signature.test.mjs test/chat-crypto.test.mjs test/reduce-suggestion.test.mjs test/merge-hint.test.mjs test/fleet-chat-route.test.mjs test/maintenance.test.mjs test/maintenance-ferry.test.mjs test/grant.test.mjs test/grant-gate.test.mjs test/worktree.test.mjs test/patch-artifact.test.mjs test/merge-queue.test.mjs test/m3-workflow.test.mjs test/project-room.test.mjs test/project-attribution.test.mjs test/project-locks.test.mjs test/project-reviews.test.mjs test/project-notifications.test.mjs test/blob-sessions.test.mjs test/outbox.test.mjs test/reliability-metrics.test.mjs test/evidence.test.mjs test/grant-issue.test.mjs test/project-refs.test.mjs test/exec-capability.test.mjs test/secondary-link.test.mjs test/bootstrap-cli.test.mjs test/bootstrap.test.mjs test/windows-hidden-task.test.mjs test/relay-failover.test.mjs test/npm-update.test.mjs test/agent-start-nonblocking.test.mjs test/fleet-chat-capture.test.mjs test/capture-route.test.mjs test/update-resolver.test.mjs test/agent-identity-safe.test.mjs test/re-pair-stale-token.test.mjs test/gpw-folder-policy.test.mjs test/gpw-activation.test.mjs test/gpw-hardening.test.mjs test/gpw-tamper-gate.test.mjs test/gpw-persistence.test.mjs test/gpw-colors.test.mjs test/gpw-recent-fold.test.mjs test/gpw-auto-approve.test.mjs",
     "test:acceptance-doc": "node --test --test-force-exit test/acceptance-doc.test.mjs",
     "test:account-identity": "node --test --test-force-exit test/account-identity.test.mjs",
     "test:account-join": "node --test --test-force-exit test/account-join.test.mjs",
@@ -82,7 +82,7 @@
     "test:council-session": "node --test --test-force-exit test/council-session.test.mjs",
     "test:crossnetwork": "node --test --test-force-exit test/crossnetwork.test.mjs",
     "test:crypto-blake2s": "node --test --test-force-exit test/crypto-blake2s.test.mjs",
-    "test:e2e": "node --test --test-force-exit test/e2e.test.mjs test/crossnetwork.test.mjs test/signing-e2e.test.mjs test/outbound-only.test.mjs test/recovery.test.mjs test/pipeline-e2e.test.mjs test/p2p-agent.test.mjs test/secondary-link.test.mjs test/bootstrap-cli.test.mjs test/bootstrap.test.mjs test/windows-hidden-task.test.mjs test/relay-failover.test.mjs test/npm-update.test.mjs test/agent-start-nonblocking.test.mjs test/fleet-chat-capture.test.mjs test/capture-route.test.mjs test/update-resolver.test.mjs test/agent-identity-safe.test.mjs test/re-pair-stale-token.test.mjs test/gpw-folder-policy.test.mjs test/gpw-activation.test.mjs test/gpw-hardening.test.mjs test/gpw-tamper-gate.test.mjs test/gpw-persistence.test.mjs test/gpw-colors.test.mjs",
+    "test:e2e": "node --test --test-force-exit test/e2e.test.mjs test/crossnetwork.test.mjs test/signing-e2e.test.mjs test/outbound-only.test.mjs test/recovery.test.mjs test/pipeline-e2e.test.mjs test/p2p-agent.test.mjs test/secondary-link.test.mjs test/bootstrap-cli.test.mjs test/bootstrap.test.mjs test/windows-hidden-task.test.mjs test/relay-failover.test.mjs test/npm-update.test.mjs test/agent-start-nonblocking.test.mjs test/fleet-chat-capture.test.mjs test/capture-route.test.mjs test/update-resolver.test.mjs test/agent-identity-safe.test.mjs test/re-pair-stale-token.test.mjs test/gpw-folder-policy.test.mjs test/gpw-activation.test.mjs test/gpw-hardening.test.mjs test/gpw-tamper-gate.test.mjs test/gpw-persistence.test.mjs test/gpw-colors.test.mjs test/gpw-recent-fold.test.mjs test/gpw-auto-approve.test.mjs",
     "test:exec-env": "node --test --test-force-exit test/exec-env-injection.test.mjs",
     "test:exit-channel": "node --test --test-force-exit test/exit-channel.test.mjs",
     "test:field-authority": "node --test --test-force-exit test/field-authority.test.mjs",

package/plugin.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://agent-plugins.org/schemas/1.0.0/plugin.schema.json",
   "name": "twinsearth-w2m-dsh",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "description": "Run one project across your own Windows and macOS machines from a single DeepSeek account, through 12 w2m_* tools. Four coordination modes (replicate, split, broadcast, pipeline) and six aggregate verdicts (consistent, divergent, divergent-platform, failed, partial, unverifiable). P2P hole punching by default, with a bundled relay, STUN responder and ledger fallback, so the fleet needs no third-party service. Joining needs a pairing code plus autoStartAgent: true; installing alone does not join.",
   "license": "MIT",
   "keywords": [

package/src/plugin/gpw-colors.mjs

@@ -27,7 +27,18 @@ export const GPW_COLOR_LABELS = Object.freeze({
 });
 
 /** Tools that only read: green by their nature. */
-const READONLY_TOOLS = /^(read|search|grep|glob|list|dir|ls|web_search|web_fetch|fetch|cat|head|tail|status|health|metrics|inspect)$/i;
+const READONLY_TOOLS = new RegExp(
+  '^(' +
+    // local read-only tools
+    'read|read_file|search|grep|glob|glob_files|list|list_files|dir|ls|cat|head|tail|view|' +
+    'web_search|web_fetch|fetch|status|health|metrics|inspect|' +
+    // background-job observation is read-only; kill/spawn are not in this list on purpose
+    'job_list|job_output|job_status|job_wait|' +
+    // read-only fleet queries (w2m_run / w2m_cancel / w2m_intent mutate, so they stay yellow)
+    'w2m_status|w2m_devices|w2m_tasks|w2m_history|w2m_report|w2m_memory|w2m_wait|w2m_stats' +
+  ')$',
+  'i',
+);
 
 /** Command tools: their argv decides, not the tool name. */
 const COMMAND_TOOLS = /^(bash|pwsh|powershell|shell|terminal|run_command|exec)$/i;

package/src/plugin/gpw.mjs

@@ -39,11 +39,51 @@ import { homedir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { createHmac, randomBytes, randomUUID } from 'node:crypto';
 
-import { classifyToolCall } from './folder-policy.mjs';
+import { classifyToolCall, isInside, normalizeFolder } from './folder-policy.mjs';
 import { classifyGpwCall, fingerprintOf } from './gpw-colors.mjs';
 
 export const name = 'dsh-gpw';
 
+/**
+ * Which list (if any) already covers a folder, for the "recently intercepted" fold.
+ *
+ * A recent row whose folder is already covered by a list is noise: the operator already made that decision. Those rows
+ * are collapsed in the panel, and adding a folder from a recent row removes the row outright.
+ */
+export function folderInLists(folder, lists) {
+  if (typeof folder !== 'string' || folder.trim() === '') return null;
+  let target;
+  try {
+    target = normalizeFolder(folder);
+  } catch {
+    return null;
+  }
+  const inList = (entries) => (Array.isArray(entries) ? entries : []).some((entry) => {
+    try {
+      const root = normalizeFolder(entry);
+      return isInside(target, root) || isInside(root, target);
+    } catch {
+      return false;
+    }
+  });
+  if (inList(lists?.whitelist)) return 'whitelist';
+  if (inList(lists?.blacklist)) return 'blacklist';
+  return null;
+}
+
+/** True when a recent row's folder is the folder just added, or lives inside it. */
+export function foldIsCoveredBy(addedFolder, candidate) {
+  if (typeof addedFolder !== 'string' || typeof candidate !== 'string') return false;
+  try {
+    const added = normalizeFolder(addedFolder);
+    const target = normalizeFolder(candidate);
+    return target === added || isInside(target, added);
+  } catch {
+    return false;
+  }
+}
+
+
 /** Services this plugin cannot work without. `connection` is used only for the operator routes. */
 export const inject = ['permissionPresets'];
 
@@ -55,7 +95,7 @@ export const GPW_PICK_ROUTE = '/api/w2m/gpw/pick';
 export const GPW_RESET_ROUTE = '/api/w2m/gpw/reset';
 
 const DEFAULT_BUDGET = { maxPerWindow: 10, windowMs: 60_000, minGapMs: 3_000 };
-const DEFAULT_PENDING_TIMEOUT_MS = 120_000;
+const DEFAULT_PENDING_TIMEOUT_MS = 100_000;
 const RECENT_LIMIT = 20;
 const NO_STORE = { 'cache-control': 'no-store' };
 /** v1.7.9: lists are MAC-signed (v2) so an external edit is detectable instead of silently trusted. */
@@ -426,16 +466,22 @@ export function apply(ctx, config = {}) {
       paths,
       color: 'yellow',
       fingerprint: fingerprintOf(toolCallOf(exec)),
+      sessionId: String(exec?.agent?.session?.header?.id ?? ''),
     };
     pending.set(id, entry);
     pendingTotal += 1;
     const timer = setTimeout(() => {
       if (!pending.has(id)) return;
       pending.delete(id);
-      deniedTotal += 1;
-      resolveDecision({ kind: 'deny', reason: `GPW: no operator answer within ${Math.round(pendingTimeoutMs / 1000)} s for ${entry.tool}` });
+      // v1.8.2 timeout policy: a yellow (class-C) call that nobody answered is approved after 100 s. Red never reaches
+      // this queue (it is denied outright) and black/white list hits never become pending, so this rule cannot widen
+      // either list's authority. The approval is recorded as a session grant, which is what turns its next occurrence
+      // blue.
+      allowedTotal += 1;
+      colorCounts.blue += 1;
+      if (typeof entry.fingerprint === 'string' && entry.fingerprint !== '') sessionGrants.add(entry.fingerprint);
+      resolveDecision({ kind: 'allow', reason: `GPW: auto-approved after ${Math.round(pendingTimeoutMs / 1000)} s with no operator answer (yellow path; black/white lists keep their own rules)` });
     }, pendingTimeoutMs);
-    timer.unref?.();
     entry.timer = timer;
   });
 
@@ -608,15 +654,19 @@ export function apply(ctx, config = {}) {
           tampered: lists.tampered,
           tampered_reason: lists.reason,
           counters: { allowedTotal, pendingTotal, deniedTotal, budgetWindow: approvals.length, maxPerWindow, colors: { ...colorCounts }, grants: sessionGrants.size },
-          recent: recent.map((entry) => ({
-            at: entry.at,
-            tool: entry.tool,
-            decision: entry.decision,
-            color: entry.color ?? null,
-            reason: entry.reason,
-            paths: entry.paths,
-            folder: entry.paths.length > 0 ? folderForPath(entry.paths[0]) : null,
-          })),
+          recent: recent.map((entry) => {
+            const folder = entry.paths.length > 0 ? folderForPath(entry.paths[0]) : null;
+            return {
+              at: entry.at,
+              tool: entry.tool,
+              decision: entry.decision,
+              color: entry.color ?? null,
+              reason: entry.reason,
+              paths: entry.paths,
+              folder,
+              folder_in: folderInLists(folder, lists),
+            };
+          }),
           pending: [...pending.entries()].map(([id, entry]) => ({
             id,
             tool: entry.tool,

package/src/plugin/tools.mjs

@@ -283,7 +283,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.8.0';
+const PLUGIN_VERSION = '1.8.2';
 
 /** How long any single HTTP call may take before it is aborted, in milliseconds. */
 const DEFAULT_REQUEST_TIMEOUT_MS = 15_000;