@ran-sh/dsh-crew 1.8.0 → 1.9.1

package/scripts/policy-probe.mjs

@@ -1,101 +1,101 @@
-// Functional probe of the real MCP stdio server (src/server.mjs), no DSH
-// instance and no DeepSeek credentials needed: policy rejections must happen
-// before any worker runtime is touched.
-// Run: node scripts/policy-probe.mjs
-
-import { spawn } from 'node:child_process';
-
-const child = spawn(process.execPath, ['src/server.mjs'], { stdio: ['pipe', 'pipe', 'pipe'] });
-let buffer = '';
-const pending = new Map();
-let nextId = 1;
-
-child.stdout.on('data', (d) => {
-  buffer += d.toString();
-  let idx;
-  while ((idx = buffer.indexOf('\n')) >= 0) {
-    const line = buffer.slice(0, idx);
-    buffer = buffer.slice(idx + 1);
-    if (!line.trim()) continue;
-    let msg;
-    try { msg = JSON.parse(line); } catch { continue; }
-    if (msg.id !== undefined && pending.has(msg.id)) {
-      pending.get(msg.id)(msg);
-      pending.delete(msg.id);
-    }
-  }
-});
-
-function call(method, params) {
-  return new Promise((resolve) => {
-    const id = nextId++;
-    pending.set(id, resolve);
-    child.stdin.write(JSON.stringify({ jsonrpc: '2.0', id, method, params }) + '\n');
-  });
-}
-
-const results = [];
-function check(name, cond, detail) {
-  results.push({ name, ok: !!cond, detail });
-  console.log(`${cond ? 'PASS' : 'FAIL'} ${name}${detail ? ` — ${detail}` : ''}`);
-}
-
-await call('initialize', { protocolVersion: '2025-03-26', capabilities: {}, clientInfo: { name: 'probe', version: '1' } });
-await new Promise((r) => setTimeout(r, 200));
-
-// 1. Read config: must expose the new effective policy fields.
-const cfg = await call('tools/call', { name: 'dsh_worker_config', arguments: {} });
-const cfgText = cfg.result?.content?.[0]?.text;
-let cfgJson = null;
-try { cfgJson = JSON.parse(cfgText); } catch {}
-check('config returns effective policy', !!cfgJson && typeof cfgJson.flash_state === 'string' && typeof cfgJson.pro_state === 'string' && typeof cfgJson.routing_guidance === 'string',
-  cfgJson ? `flash=${cfgJson.flash_state} pro=${cfgJson.pro_state} mode=${cfgJson.collaboration_mode}` : cfgText?.slice(0, 120));
-check('config hides API keys', cfgText !== undefined && !/api_key|sk-/.test(cfgText));
-check('config reports effective_policy + roles + legacy_source', !!cfgJson
-  && typeof cfgJson.effective_policy === 'string' && cfgJson.effective_policy.includes('mode=')
-  && Array.isArray(cfgJson.flash_roles) && cfgJson.flash_roles.length > 0
-  && Array.isArray(cfgJson.pro_roles) && cfgJson.pro_roles.length > 0
-  && typeof cfgJson.legacy_source === 'string',
-  cfgJson ? cfgJson.effective_policy : undefined);
-check('config reflects main_agent_mode', !!cfgJson && ['direct-allowed', 'coordinator-first', 'dispatcher-only'].includes(cfgJson.main_agent_mode), cfgJson?.main_agent_mode);
-
-// 2. Session clamp: flash-only + explicit pro must be refused with TIER_DISABLED.
-const clamp = await call('tools/call', { name: 'dsh_worker_config', arguments: { tier_policy: 'flash-only' } });
-check('session tier_policy clamp set', clamp.result !== undefined && !clamp.result.isError);
-
-const refusePro = await call('tools/call', { name: 'dsh_run_worker', arguments: { task: 'probe', tier: 'pro' } });
-const refuseText = refusePro.result?.content?.[0]?.text ?? '';
-check('pro refused under flash-only', /TIER_DISABLED/.test(refuseText), refuseText.slice(0, 120));
-
-// 3. subagents master switch via session enabled=false.
-const off = await call('tools/call', { name: 'dsh_worker_config', arguments: { reset: true, enabled: false } });
-check('session enabled=false set', off.result !== undefined && !off.result.isError);
-const refuseAll = await call('tools/call', { name: 'dsh_run_worker', arguments: { task: 'probe' } });
-const refuseAllText = refuseAll.result?.content?.[0]?.text ?? '';
-check('dispatch refused when disabled', /SUBAGENTS_DISABLED/.test(refuseAllText), refuseAllText.slice(0, 120));
-
-// 4. dsh_spawn_worker shares the same policy.
-const refuseSpawn = await call('tools/call', { name: 'dsh_spawn_worker', arguments: { task: 'probe' } });
-const refuseSpawnText = refuseSpawn.result?.content?.[0]?.text ?? '';
-check('spawn refused when disabled', /SUBAGENTS_DISABLED/.test(refuseSpawnText));
-
-// 5. Manual semantics: flash manual + pro auto, no explicit tier → pro is chosen, never flash.
-const manual = await call('tools/call', { name: 'dsh_worker_config', arguments: { reset: true, tier_policy: 'auto' } });
-// global config is balanced here; exercise manual via session state override:
-const manualSet = await call('tools/call', { name: 'dsh_worker_config', arguments: { collaboration_mode: 'custom', flash_state: 'manual', pro_state: 'auto', default_tier: 'flash' } });
-check('manual/custom session set', manualSet.result !== undefined && !manualSet.result.isError);
-const manualCfg = await call('tools/call', { name: 'dsh_worker_config', arguments: {} });
-const manualCfgJson = JSON.parse(manualCfg.result.content[0].text);
-check('manual tier never auto-default (effective_default_tier=pro)',
-  manualCfgJson.effective_default_tier === 'pro', `got ${manualCfgJson.effective_default_tier}`);
-check('effective states reported', manualCfgJson.flash_state === 'manual' && manualCfgJson.pro_state === 'auto');
-
-// 6. Reset back to global defaults.
-const reset = await call('tools/call', { name: 'dsh_worker_config', arguments: { reset: true } });
-check('reset restores defaults', reset.result !== undefined && !reset.result.isError);
-
-child.kill();
-await new Promise((r) => setTimeout(r, 100));
-const failed = results.filter((r) => !r.ok);
-console.log(`\n${results.length - failed.length}/${results.length} checks passed`);
-process.exit(failed.length > 0 ? 1 : 0);
+// Functional probe of the real MCP stdio server (src/server.mjs), no DSH
+// instance and no DeepSeek credentials needed: policy rejections must happen
+// before any worker runtime is touched.
+// Run: node scripts/policy-probe.mjs
+
+import { spawn } from 'node:child_process';
+
+const child = spawn(process.execPath, ['src/server.mjs'], { stdio: ['pipe', 'pipe', 'pipe'] });
+let buffer = '';
+const pending = new Map();
+let nextId = 1;
+
+child.stdout.on('data', (d) => {
+  buffer += d.toString();
+  let idx;
+  while ((idx = buffer.indexOf('\n')) >= 0) {
+    const line = buffer.slice(0, idx);
+    buffer = buffer.slice(idx + 1);
+    if (!line.trim()) continue;
+    let msg;
+    try { msg = JSON.parse(line); } catch { continue; }
+    if (msg.id !== undefined && pending.has(msg.id)) {
+      pending.get(msg.id)(msg);
+      pending.delete(msg.id);
+    }
+  }
+});
+
+function call(method, params) {
+  return new Promise((resolve) => {
+    const id = nextId++;
+    pending.set(id, resolve);
+    child.stdin.write(JSON.stringify({ jsonrpc: '2.0', id, method, params }) + '\n');
+  });
+}
+
+const results = [];
+function check(name, cond, detail) {
+  results.push({ name, ok: !!cond, detail });
+  console.log(`${cond ? 'PASS' : 'FAIL'} ${name}${detail ? ` — ${detail}` : ''}`);
+}
+
+await call('initialize', { protocolVersion: '2025-03-26', capabilities: {}, clientInfo: { name: 'probe', version: '1' } });
+await new Promise((r) => setTimeout(r, 200));
+
+// 1. Read config: must expose the new effective policy fields.
+const cfg = await call('tools/call', { name: 'dsh_worker_config', arguments: {} });
+const cfgText = cfg.result?.content?.[0]?.text;
+let cfgJson = null;
+try { cfgJson = JSON.parse(cfgText); } catch {}
+check('config returns effective policy', !!cfgJson && typeof cfgJson.flash_state === 'string' && typeof cfgJson.pro_state === 'string' && typeof cfgJson.routing_guidance === 'string',
+  cfgJson ? `flash=${cfgJson.flash_state} pro=${cfgJson.pro_state} mode=${cfgJson.collaboration_mode}` : cfgText?.slice(0, 120));
+check('config hides API keys', cfgText !== undefined && !/api_key|sk-/.test(cfgText));
+check('config reports effective_policy + roles + legacy_source', !!cfgJson
+  && typeof cfgJson.effective_policy === 'string' && cfgJson.effective_policy.includes('mode=')
+  && Array.isArray(cfgJson.flash_roles) && cfgJson.flash_roles.length > 0
+  && Array.isArray(cfgJson.pro_roles) && cfgJson.pro_roles.length > 0
+  && typeof cfgJson.legacy_source === 'string',
+  cfgJson ? cfgJson.effective_policy : undefined);
+check('config reflects main_agent_mode', !!cfgJson && ['direct-allowed', 'coordinator-first', 'dispatcher-only'].includes(cfgJson.main_agent_mode), cfgJson?.main_agent_mode);
+
+// 2. Session clamp: flash-only + explicit pro must be refused with TIER_DISABLED.
+const clamp = await call('tools/call', { name: 'dsh_worker_config', arguments: { tier_policy: 'flash-only' } });
+check('session tier_policy clamp set', clamp.result !== undefined && !clamp.result.isError);
+
+const refusePro = await call('tools/call', { name: 'dsh_run_worker', arguments: { task: 'probe', tier: 'pro' } });
+const refuseText = refusePro.result?.content?.[0]?.text ?? '';
+check('pro refused under flash-only', /TIER_DISABLED/.test(refuseText), refuseText.slice(0, 120));
+
+// 3. subagents master switch via session enabled=false.
+const off = await call('tools/call', { name: 'dsh_worker_config', arguments: { reset: true, enabled: false } });
+check('session enabled=false set', off.result !== undefined && !off.result.isError);
+const refuseAll = await call('tools/call', { name: 'dsh_run_worker', arguments: { task: 'probe' } });
+const refuseAllText = refuseAll.result?.content?.[0]?.text ?? '';
+check('dispatch refused when disabled', /SUBAGENTS_DISABLED/.test(refuseAllText), refuseAllText.slice(0, 120));
+
+// 4. dsh_spawn_worker shares the same policy.
+const refuseSpawn = await call('tools/call', { name: 'dsh_spawn_worker', arguments: { task: 'probe' } });
+const refuseSpawnText = refuseSpawn.result?.content?.[0]?.text ?? '';
+check('spawn refused when disabled', /SUBAGENTS_DISABLED/.test(refuseSpawnText));
+
+// 5. Manual semantics: flash manual + pro auto, no explicit tier → pro is chosen, never flash.
+const manual = await call('tools/call', { name: 'dsh_worker_config', arguments: { reset: true, tier_policy: 'auto' } });
+// global config is balanced here; exercise manual via session state override:
+const manualSet = await call('tools/call', { name: 'dsh_worker_config', arguments: { collaboration_mode: 'custom', flash_state: 'manual', pro_state: 'auto', default_tier: 'flash' } });
+check('manual/custom session set', manualSet.result !== undefined && !manualSet.result.isError);
+const manualCfg = await call('tools/call', { name: 'dsh_worker_config', arguments: {} });
+const manualCfgJson = JSON.parse(manualCfg.result.content[0].text);
+check('manual tier never auto-default (effective_default_tier=pro)',
+  manualCfgJson.effective_default_tier === 'pro', `got ${manualCfgJson.effective_default_tier}`);
+check('effective states reported', manualCfgJson.flash_state === 'manual' && manualCfgJson.pro_state === 'auto');
+
+// 6. Reset back to global defaults.
+const reset = await call('tools/call', { name: 'dsh_worker_config', arguments: { reset: true } });
+check('reset restores defaults', reset.result !== undefined && !reset.result.isError);
+
+child.kill();
+await new Promise((r) => setTimeout(r, 100));
+const failed = results.filter((r) => !r.ok);
+console.log(`\n${results.length - failed.length}/${results.length} checks passed`);
+process.exit(failed.length > 0 ? 1 : 0);

package/scripts/remove-legacy-official-bridge.ps1

@@ -1,89 +1,89 @@
-# One-shot operator maintenance: remove the legacy official-web bridge state
-# left behind BEFORE the read-only policy. This script is NEVER invoked by
-# the dsh-crew installer; the product code never writes to ~/.dsh.
-#
-# Preconditions (fail closed unless ALL hold):
-#   1. Official 3080 is stopped and no longer listening.
-#   2. ~/.dsh/profiles/web/package.json dependencies["@ran-sh/dsh-crew-web-bridge"] exists.
-#   3. dsh.profile.bundles contains "@ran-sh/dsh-crew-web-bridge".
-#   4. node_modules/@ran-sh/dsh-crew-web-bridge is a symlink/junction whose
-#      target is an old Crew release official-web-bridge dir.
-# Usage:
-#   powershell -NoProfile -ExecutionPolicy Bypass -File scripts/remove-legacy-official-bridge.ps1 [-WhatIf]
-
-[CmdletBinding(SupportsShouldProcess = $true)]
-param()
-
-Set-StrictMode -Version Latest
-$ErrorActionPreference = 'Stop'
-
-$BridgePackage = '@ran-sh/dsh-crew-web-bridge'
-$officialManifest = Join-Path $env:USERPROFILE '.dsh\profiles\web\package.json'
-$bridgeLink = Join-Path $env:USERPROFILE '.dsh\profiles\web\node_modules\@ran-sh\dsh-crew-web-bridge'
-$crewState = Join-Path $env:USERPROFILE '.config\dsh-crew\official-web.json'
-
-function Fail($message) {
-  Write-Host "FAIL-CLOSED: $message" -ForegroundColor Red
-  exit 2
-}
-
-# 1. Official 3080 must be stopped.
-try {
-  $listeners = [System.Net.NetworkInformation.IPGlobalProperties]::GetIPGlobalProperties().GetActiveTcpListeners()
-  if (@($listeners | Where-Object Port -eq 3080).Count -gt 0) {
-    Fail 'official 3080 is still listening; stop it before cleanup.'
-  }
-} catch {
-  Fail "could not enumerate TCP listeners: $($_.Exception.Message)"
-}
-
-# 2. Read + back up the official manifest (backup goes OUTSIDE .dsh).
-if (-not (Test-Path -LiteralPath $officialManifest -PathType Leaf)) {
-  Fail "official manifest not found: $officialManifest"
-}
-$backup = Join-Path ([System.IO.Path]::GetTempPath()) 'dsh-web-package.pre-crew-bridge-removal.json'
-if ($PSCmdlet.ShouldProcess($officialManifest, "backup to $backup")) {
-  Copy-Item -LiteralPath $officialManifest -Destination $backup -Force
-  Write-Host "Backup: $backup"
-}
-
-$manifest = Get-Content -LiteralPath $officialManifest -Raw | ConvertFrom-Json -ErrorAction Stop
-if (-not $manifest.dependencies.$BridgePackage) {
-  Fail 'bridge dependency key absent; nothing to clean.'
-}
-if (-not ($manifest.dsh.profile.bundles -contains $BridgePackage)) {
-  Fail 'bridge bundle entry absent; nothing to clean.'
-}
-
-# 3. The link must be a symlink/junction pointing at an old Crew release bridge.
-$link = Get-Item -LiteralPath $bridgeLink -ErrorAction SilentlyContinue
-if (-not $link -or $link.LinkType -notin @('SymbolicLink', 'Junction')) {
-  Fail 'bridge link is not a symlink/junction; refusing to touch unknown state.'
-}
-$target = $link.Target
-if (-not $target) {
-  $target = (Get-Item -LiteralPath $bridgeLink).FullName
-}
-if ($target -notmatch 'dsh-crew.*official-web-bridge') {
-  Fail "bridge link target does not look like a Crew release bridge: $target"
-}
-
-# 4. Remove ONLY the dependency key, the bundle entry, and the link.
-if ($PSCmdlet.ShouldProcess($officialManifest, 'remove legacy bridge entries')) {
-  $raw = Get-Content -LiteralPath $officialManifest -Raw | ConvertFrom-Json
-  $raw.dependencies.PSObject.Properties.Remove($BridgePackage)
-  $raw.dsh.profile.bundles = @($raw.dsh.profile.bundles | Where-Object { $_ -ne $BridgePackage })
-  $raw | ConvertTo-Json -Depth 20 | Set-Content -LiteralPath $officialManifest -Encoding UTF8
-  Remove-Item -LiteralPath $bridgeLink -Force
-  Write-Host 'Removed bridge dependency key, bundle entry, and link.'
-}
-
-# 5. Remove Crew-owned legacy intent/state (Crew-owned path, safe to delete).
-if ($PSCmdlet.ShouldProcess($crewState, 'remove legacy Crew bridge state')) {
-  Remove-Item -LiteralPath $crewState -Force -ErrorAction SilentlyContinue
-  Write-Host 'Removed Crew-owned legacy bridge state (if present).'
-}
-
-Write-Host 'Done. Restart official 3080 natively; verify:'
-Write-Host '  - 3080 / is 2xx/3xx and /_dsh/dsh-crew/{ping,bridge-status,supervisor/restart} are gone'
-Write-Host '  - 3210 /_dsh/dsh-crew/extension identity is correct (Crew launcher owns 3210 directly)'
+# One-shot operator maintenance: remove the legacy official-web bridge state
+# left behind BEFORE the read-only policy. This script is NEVER invoked by
+# the dsh-crew installer; the product code never writes to ~/.dsh.
+#
+# Preconditions (fail closed unless ALL hold):
+#   1. Official 3080 is stopped and no longer listening.
+#   2. ~/.dsh/profiles/web/package.json dependencies["@ran-sh/dsh-crew-web-bridge"] exists.
+#   3. dsh.profile.bundles contains "@ran-sh/dsh-crew-web-bridge".
+#   4. node_modules/@ran-sh/dsh-crew-web-bridge is a symlink/junction whose
+#      target is an old Crew release official-web-bridge dir.
+# Usage:
+#   powershell -NoProfile -ExecutionPolicy Bypass -File scripts/remove-legacy-official-bridge.ps1 [-WhatIf]
+
+[CmdletBinding(SupportsShouldProcess = $true)]
+param()
+
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+
+$BridgePackage = '@ran-sh/dsh-crew-web-bridge'
+$officialManifest = Join-Path $env:USERPROFILE '.dsh\profiles\web\package.json'
+$bridgeLink = Join-Path $env:USERPROFILE '.dsh\profiles\web\node_modules\@ran-sh\dsh-crew-web-bridge'
+$crewState = Join-Path $env:USERPROFILE '.config\dsh-crew\official-web.json'
+
+function Fail($message) {
+  Write-Host "FAIL-CLOSED: $message" -ForegroundColor Red
+  exit 2
+}
+
+# 1. Official 3080 must be stopped.
+try {
+  $listeners = [System.Net.NetworkInformation.IPGlobalProperties]::GetIPGlobalProperties().GetActiveTcpListeners()
+  if (@($listeners | Where-Object Port -eq 3080).Count -gt 0) {
+    Fail 'official 3080 is still listening; stop it before cleanup.'
+  }
+} catch {
+  Fail "could not enumerate TCP listeners: $($_.Exception.Message)"
+}
+
+# 2. Read + back up the official manifest (backup goes OUTSIDE .dsh).
+if (-not (Test-Path -LiteralPath $officialManifest -PathType Leaf)) {
+  Fail "official manifest not found: $officialManifest"
+}
+$backup = Join-Path ([System.IO.Path]::GetTempPath()) 'dsh-web-package.pre-crew-bridge-removal.json'
+if ($PSCmdlet.ShouldProcess($officialManifest, "backup to $backup")) {
+  Copy-Item -LiteralPath $officialManifest -Destination $backup -Force
+  Write-Host "Backup: $backup"
+}
+
+$manifest = Get-Content -LiteralPath $officialManifest -Raw | ConvertFrom-Json -ErrorAction Stop
+if (-not $manifest.dependencies.$BridgePackage) {
+  Fail 'bridge dependency key absent; nothing to clean.'
+}
+if (-not ($manifest.dsh.profile.bundles -contains $BridgePackage)) {
+  Fail 'bridge bundle entry absent; nothing to clean.'
+}
+
+# 3. The link must be a symlink/junction pointing at an old Crew release bridge.
+$link = Get-Item -LiteralPath $bridgeLink -ErrorAction SilentlyContinue
+if (-not $link -or $link.LinkType -notin @('SymbolicLink', 'Junction')) {
+  Fail 'bridge link is not a symlink/junction; refusing to touch unknown state.'
+}
+$target = $link.Target
+if (-not $target) {
+  $target = (Get-Item -LiteralPath $bridgeLink).FullName
+}
+if ($target -notmatch 'dsh-crew.*official-web-bridge') {
+  Fail "bridge link target does not look like a Crew release bridge: $target"
+}
+
+# 4. Remove ONLY the dependency key, the bundle entry, and the link.
+if ($PSCmdlet.ShouldProcess($officialManifest, 'remove legacy bridge entries')) {
+  $raw = Get-Content -LiteralPath $officialManifest -Raw | ConvertFrom-Json
+  $raw.dependencies.PSObject.Properties.Remove($BridgePackage)
+  $raw.dsh.profile.bundles = @($raw.dsh.profile.bundles | Where-Object { $_ -ne $BridgePackage })
+  $raw | ConvertTo-Json -Depth 20 | Set-Content -LiteralPath $officialManifest -Encoding UTF8
+  Remove-Item -LiteralPath $bridgeLink -Force
+  Write-Host 'Removed bridge dependency key, bundle entry, and link.'
+}
+
+# 5. Remove Crew-owned legacy intent/state (Crew-owned path, safe to delete).
+if ($PSCmdlet.ShouldProcess($crewState, 'remove legacy Crew bridge state')) {
+  Remove-Item -LiteralPath $crewState -Force -ErrorAction SilentlyContinue
+  Write-Host 'Removed Crew-owned legacy bridge state (if present).'
+}
+
+Write-Host 'Done. Restart official 3080 natively; verify:'
+Write-Host '  - 3080 / is 2xx/3xx and /_dsh/dsh-crew/{ping,bridge-status,supervisor/restart} are gone'
+Write-Host '  - 3210 /_dsh/dsh-crew/extension identity is correct (Crew launcher owns 3210 directly)'