@ran-sh/dsh-crew 1.0.3 → 1.1.0

package/official-web-bridge/package.json

@@ -15,9 +15,8 @@
     },
     "client": {
       "inject": [
-        "@deepseek-ai/dsh-client-runtime",
+        "@deepseek-ai/dsh-client-ui-renderer",
         "@deepseek-ai/dsh-client-locale",
-        "@deepseek-ai/dsh-client-ui-slots",
         "@deepseek-ai/dsh-client-ui-settings"
       ],
       "platform": "web"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ran-sh/dsh-crew",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "type": "module",
   "main": "./src/hub/entry.mjs",
   "bin": {
@@ -13,9 +13,8 @@
     },
     "client": {
       "inject": [
-        "@deepseek-ai/dsh-client-runtime",
+        "@deepseek-ai/dsh-client-ui-renderer",
         "@deepseek-ai/dsh-client-locale",
-        "@deepseek-ai/dsh-client-ui-slots",
         "@deepseek-ai/dsh-client-ui-settings"
       ],
       "platform": "web"
@@ -23,10 +22,10 @@
   },
   "scripts": {
     "mcp": "node src/server.mjs",
-    "build:client": "tsdown src/client/entry.tsx --format cjs --platform browser --target es2022 --tsconfig tsconfig.client.json --deps.never-bundle react --deps.never-bundle react/jsx-runtime --deps.never-bundle react-dom --deps.never-bundle react-dom/client --out-dir .client-build --clean --logLevel warn && node scripts/build-client.mjs",
+    "build:client": "tsdown src/client/entry.tsx src/client/quick-entry.tsx --format cjs --platform browser --target es2022 --tsconfig tsconfig.client.json --deps.never-bundle react --deps.never-bundle react/jsx-runtime --deps.never-bundle react-dom --deps.never-bundle react-dom/client --out-dir .client-build --clean --logLevel warn && node scripts/build-client.mjs",
     "verify:npm-install": "node scripts/verify-npm-install.mjs",
     "verify:npm-install:official": "node scripts/verify-npm-install.mjs --with-official-dsh",
-    "verify:official-bridge": "node scripts/verify-official-bridge-e2e.mjs"
+    "verify:official-bridge": "node scripts/verify-official-bridge-e2e.mjs --diagnostic-only"
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.25.4",
@@ -38,74 +37,138 @@
     "./package.json": "./package.json"
   },
   "peerDependencies": {
-    "@deepseek-ai/dsh-agent": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-agent-presets": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-agent-spine-demo": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-bash-local": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-compaction-basic": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-fs-local": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-fs-observation-policy": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-llm": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-llm-deepseek": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-sandbox-local": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-sandbox-policy": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-sdk-client": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-sdk-jsonrpc-demo": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-sdk-jsonrpc-server": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-session": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-session-persistence-jsonl": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-subprocess-local": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-token-meter": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-tool-fs": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-tool-todo": "0.1.1-rc.2",
+    "@deepseek-ai/dsh": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-agent": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-agent-loop": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-agent-presets": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-bash-local": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-locale": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-renderer": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-settings": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-compaction-basic": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-fs-local": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-fs-observation-policy": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-llm": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-llm-deepseek": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-sandbox-local": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-sandbox-policy": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-sdk-client": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-sdk-jsonrpc-server": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-sdk-minimal": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-session": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-session-persistence-jsonl": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-subprocess-local": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-token-meter": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-tool-fs": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-tool-todo": "0.1.2-rc.1",
     "react": "^18.0.0",
     "react-dom": "^18.0.0"
   },
   "peerDependenciesMeta": {
-    "@deepseek-ai/dsh-agent": { "optional": true },
-    "@deepseek-ai/dsh-agent-presets": { "optional": true },
-    "@deepseek-ai/dsh-agent-spine-demo": { "optional": true },
-    "@deepseek-ai/dsh-bash-local": { "optional": true },
-    "@deepseek-ai/dsh-compaction-basic": { "optional": true },
-    "@deepseek-ai/dsh-fs-local": { "optional": true },
-    "@deepseek-ai/dsh-fs-observation-policy": { "optional": true },
-    "@deepseek-ai/dsh-llm": { "optional": true },
-    "@deepseek-ai/dsh-llm-deepseek": { "optional": true },
-    "@deepseek-ai/dsh-sandbox-local": { "optional": true },
-    "@deepseek-ai/dsh-sandbox-policy": { "optional": true },
-    "@deepseek-ai/dsh-sdk-client": { "optional": true },
-    "@deepseek-ai/dsh-sdk-jsonrpc-demo": { "optional": true },
-    "@deepseek-ai/dsh-sdk-jsonrpc-server": { "optional": true },
-    "@deepseek-ai/dsh-session": { "optional": true },
-    "@deepseek-ai/dsh-session-persistence-jsonl": { "optional": true },
-    "@deepseek-ai/dsh-subprocess-local": { "optional": true },
-    "@deepseek-ai/dsh-token-meter": { "optional": true },
-    "@deepseek-ai/dsh-tool-fs": { "optional": true },
-    "@deepseek-ai/dsh-tool-todo": { "optional": true },
-    "react": { "optional": true },
-    "react-dom": { "optional": true }
+    "@deepseek-ai/dsh": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-agent": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-agent-loop": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-agent-presets": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-bash-local": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-client-locale": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-client-ui-renderer": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-client-ui-settings": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-compaction-basic": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-fs-local": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-fs-observation-policy": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-llm": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-llm-deepseek": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-sandbox-local": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-sandbox-policy": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-sdk-client": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-sdk-jsonrpc-server": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-sdk-minimal": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-session": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-session-persistence-jsonl": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-subprocess-local": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-token-meter": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-tool-fs": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-tool-todo": {
+      "optional": true
+    },
+    "react": {
+      "optional": true
+    },
+    "react-dom": {
+      "optional": true
+    }
   },
   "devDependencies": {
-    "@deepseek-ai/dsh-agent": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-agent-presets": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-agent-spine-demo": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-bash-local": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-compaction-basic": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-fs-local": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-fs-observation-policy": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-llm": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-llm-deepseek": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-sandbox-local": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-sandbox-policy": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-sdk-client": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-sdk-jsonrpc-demo": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-sdk-jsonrpc-server": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-session": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-session-persistence-jsonl": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-subprocess-local": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-token-meter": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-tool-fs": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-tool-todo": "0.1.1-rc.2",
+    "@deepseek-ai/dsh": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-agent": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-agent-loop": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-agent-presets": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-bash-local": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-locale": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-renderer": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-settings": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-compaction-basic": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-fs-local": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-fs-observation-policy": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-llm": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-llm-deepseek": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-sandbox-local": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-sandbox-policy": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-sdk-client": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-sdk-jsonrpc-server": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-sdk-minimal": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-session": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-session-persistence-jsonl": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-subprocess-local": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-token-meter": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-tool-fs": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-tool-todo": "0.1.2-rc.1",
     "@types/react": "^18.3.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

package/scripts/build-client.mjs

@@ -10,23 +10,38 @@ const root = dirname(dirname(fileURLToPath(import.meta.url)));
 const manifest = JSON.parse(await readFile(join(root, 'package.json'), 'utf8'));
 const pluginId = manifest.name;
 const buildDir = join(root, '.client-build');
-const compiledEntries = (await readdir(buildDir)).filter((name) => name.endsWith('.cjs'));
-if (compiledEntries.length !== 1) {
-  throw new Error(`expected exactly one compiled client entry in .client-build, found ${compiledEntries.length}: ${compiledEntries.join(', ')}`);
+
+// Dual entry: the full 3210 control plane (entry.cjs) and the narrow 3080
+// quick panel (quick-entry.cjs). They are wrapped under DIFFERENT module
+// ids so the official surface never receives full control-plane code.
+const fullEntry = 'entry.cjs';
+const quickEntry = 'quick-entry.cjs';
+const built = (await readdir(buildDir)).filter((name) => name.endsWith('.cjs'));
+for (const expected of [fullEntry, quickEntry]) {
+  if (!built.includes(expected)) {
+    throw new Error(`missing compiled client entry ${expected} in .client-build (found: ${built.join(', ')})`);
+  }
+}
+
+function wrap(source, id) {
+  return [
+    `window.__ModuleLoader__.load({ id: ${JSON.stringify(id)}, factory: (require) => {`,
+    'var module = { exports: {} }; var exports = module.exports;',
+    source.replace(/\n?\/\/# sourceMappingURL=.*$/u, ''),
+    'return module.exports; } });',
+    '',
+  ].join('\n');
 }
-const source = await readFile(join(buildDir, compiledEntries[0]), 'utf8');
-const wrapped = [
-  `window.__ModuleLoader__.load({ id: ${JSON.stringify(pluginId)}, factory: (require) => {`,
-  'var module = { exports: {} }; var exports = module.exports;',
-  source.replace(/\n?\/\/# sourceMappingURL=.*$/u, ''),
-  'return module.exports; } });',
-  '',
-].join('\n');
+
+const fullSource = await readFile(join(buildDir, fullEntry), 'utf8');
+const fullWrapped = wrap(fullSource, pluginId);
 await mkdir(join(root, 'lib'), { recursive: true });
-await writeFile(join(root, 'lib', 'client.js'), wrapped);
+await writeFile(join(root, 'lib', 'client.js'), fullWrapped);
+
 const bridgeManifest = JSON.parse(await readFile(join(root, 'official-web-bridge', 'package.json'), 'utf8'));
-const bridgeWrapped = wrapped.replace(JSON.stringify(pluginId), JSON.stringify(bridgeManifest.name));
+const quickSource = await readFile(join(buildDir, quickEntry), 'utf8');
+const quickWrapped = wrap(quickSource, bridgeManifest.name);
 await mkdir(join(root, 'official-web-bridge', 'lib'), { recursive: true });
-await writeFile(join(root, 'official-web-bridge', 'lib', 'client.js'), bridgeWrapped);
+await writeFile(join(root, 'official-web-bridge', 'lib', 'client.js'), quickWrapped);
 await rm(buildDir, { recursive: true, force: true });
-console.log(`built lib/client.js and official-web-bridge/lib/client.js (${wrapped.length} bytes) from ${compiledEntries[0]}`);
+console.log(`built lib/client.js (${fullWrapped.length} bytes) and official-web-bridge/lib/client.js (${quickWrapped.length} bytes) from ${fullEntry} + ${quickEntry}`);

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

@@ -0,0 +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)'