@simonyea/holysheep-cli 2.1.68 → 2.1.70

package/dist/configure-worker.js

@@ -4135,11 +4135,11 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@simonyea/holysheep-cli",
-      version: "2.1.68",
+      version: "2.1.70",
       description: "Claude Code/Cursor/Cline API relay for China \u2014 \xA51=$1, WeChat/Alipay payment, no credit card, no VPN. One command setup for all AI coding tools.",
       scripts: {
         build: "node scripts/build.mjs",
-        test: "node tests/droid.test.js && node tests/workspace-store.test.js && node tests/runtime-stale-upgrade.test.js && node tests/hermes.test.js && node tests/preflight.test.js && node tests/opencode-auth-purge.test.js && node tests/shell-winpath.test.js && node tests/openclaw-atomic-write.test.js && node tests/openclaw-disable-auth-direct.test.js && node tests/opencode-default-model.test.js && node tests/paths-bundled.test.js && node tests/aionui-runtime-resources.test.js && node tests/aionui-wrapper-claude-proxy.test.js && node tests/aionui-wrapper-probe.test.js && node tests/aionui-wrapper-proxy-integration.test.js && node tests/aionui-wrapper-all-clis-autoconf.test.js && node tests/aionui-wrapper-env-signal.test.js && node tests/aionui-wrapper-csp-rewrite.test.js && node tests/aionui-wrapper-version-status.test.js && node tests/claude-proxy-daemon.test.js && node tests/claude-proxy-vscode-settings.test.js && node tests/claude-proxy-vscode-env.test.js && node tests/acptypes-patch.test.js && node tests/codex-approval-policy.test.js && node tests/version-check.test.js && node tests/runclaude-missing-binary.test.js && node tests/claude-code-configure-preserve.test.js",
+        test: "node tests/droid.test.js && node tests/workspace-store.test.js && node tests/runtime-stale-upgrade.test.js && node tests/hermes.test.js && node tests/preflight.test.js && node tests/opencode-auth-purge.test.js && node tests/shell-winpath.test.js && node tests/openclaw-atomic-write.test.js && node tests/openclaw-disable-auth-direct.test.js && node tests/opencode-default-model.test.js && node tests/paths-bundled.test.js && node tests/aionui-runtime-resources.test.js && node tests/aionui-wrapper-claude-proxy.test.js && node tests/aionui-wrapper-probe.test.js && node tests/aionui-wrapper-proxy-integration.test.js && node tests/aionui-wrapper-all-clis-autoconf.test.js && node tests/aionui-wrapper-env-signal.test.js && node tests/aionui-wrapper-csp-rewrite.test.js && node tests/aionui-wrapper-version-status.test.js && node tests/claude-proxy-daemon.test.js && node tests/claude-proxy-vscode-settings.test.js && node tests/claude-proxy-vscode-env.test.js && node tests/acptypes-patch.test.js && node tests/codex-approval-policy.test.js && node tests/version-check.test.js && node tests/runclaude-missing-binary.test.js && node tests/claude-code-configure-preserve.test.js && node tests/webui-claude-proxy-virtual-tool.test.js && node tests/webui-claude-proxy-ui.test.js && node tests/webui-response-consumer.test.js",
         prepublishOnly: "npm run build && npm test && node scripts/check-tarball-size.js"
       },
       keywords: [

package/dist/index.html

@@ -470,6 +470,27 @@ button { cursor: pointer; }
   color: var(--muted);
   line-height: 1.6;
 }
+.tool-substatus {
+  margin-top: 12px;
+  border: 1px solid var(--line);
+  background: rgba(208, 110, 43, 0.08);
+  border-radius: 14px;
+  padding: 12px;
+  display: flex;
+  justify-content: space-between;
+  gap: 12px;
+  align-items: center;
+}
+.tool-substatus-title {
+  font-size: 13px;
+  font-weight: 700;
+  color: var(--text);
+}
+.tool-substatus-meta {
+  margin-top: 4px;
+  font-size: 12px;
+  color: var(--muted);
+}
 .tool-actions {
   margin-top: 16px;
   display: flex;
@@ -563,7 +584,7 @@ button { cursor: pointer; }
       <button class="nav-item" data-route="dashboard"><span class="nav-dot"></span><span>Dashboard</span></button>
       <button class="nav-item" data-route="workspace"><span class="nav-dot"></span><span>Conversations</span></button>
       <button class="nav-item" data-route="tasks"><span class="nav-dot"></span><span>Scheduled Tasks</span></button>
-      <button class="nav-item" data-route="tools"><span class="nav-dot"></span><span>Tools & MCP</span></button>
+      <button class="nav-item" data-route="tools"><span class="nav-dot"></span><span>CLI 管理</span></button>
       <button class="nav-item" data-route="account"><span class="nav-dot"></span><span>HolySheep Account</span></button>
     </div>
     <div class="sidebar-card">
@@ -625,8 +646,8 @@ const pageMeta = {
     subtitle: 'Manage recurring prompts and maintain the default HolySheep API config directly below the task list.',
   },
   tools: {
-    title: 'Tools & MCP',
-    subtitle: 'Inspect local CLI adapters, launch tools, and run one-click configuration from the same shell.',
+    title: 'CLI 管理',
+    subtitle: 'Manage local AI CLI adapters, MCP, and the VS Code Claude proxy from one place.',
   },
   account: {
     title: 'HolySheep Account',
@@ -658,16 +679,81 @@ function formatDate(value) {
   return date.toLocaleString()
 }
 
-function api(path, options) {
-  return fetch(path.startsWith('/api/') ? path : `/api/${path}`, options).then(async (response) => {
+function contentTypeOf(response) {
+  return (response.headers.get('content-type') || '').toLowerCase()
+}
+
+async function parseResponseBody(response) {
+  const contentType = contentTypeOf(response)
+  if (contentType.includes('text/event-stream')) {
+    const text = await response.text()
+    return { kind: 'sse', events: parseSseText(text), text }
+  }
+  if (contentType.includes('application/json')) {
     const payload = await response.json().catch(() => ({}))
-    if (!response.ok) {
-      const error = new Error(payload.error || payload.message || `HTTP ${response.status}`)
-      error.payload = payload
-      throw error
+    return { kind: 'json', payload }
+  }
+  const text = await response.text().catch(() => '')
+  return { kind: 'text', text }
+}
+
+function parseSseText(text) {
+  return String(text || '').split('\n\n').map((chunk) => {
+    const lines = chunk.split('\n').filter((line) => line.startsWith('data:'))
+    if (!lines.length) return null
+    const data = lines.map((line) => line.slice(5).trim()).join('\n')
+    try { return JSON.parse(data) }
+    catch { return { type: 'output', text: data } }
+  }).filter(Boolean)
+}
+
+async function api(path, options) {
+  const response = await fetch(path.startsWith('/api/') ? path : `/api/${path}`, options)
+  const parsed = await parseResponseBody(response)
+  const payload = parsed.kind === 'json' ? parsed.payload : parsed
+  if (!response.ok) {
+    const error = new Error(payload.error || payload.message || payload.text || `HTTP ${response.status}`)
+    error.payload = payload
+    throw error
+  }
+  return payload
+}
+
+function appendSseEventToConsole(payload) {
+  if (payload.type === 'output') appendConsole(payload.text || '', '')
+  else if (payload.type === 'progress') appendConsole(payload.message || JSON.stringify(payload), payload.status === 'error' ? 'error' : payload.status === 'ok' ? 'ok' : 'warn')
+  else if (payload.type === 'done') appendConsole(payload.message || 'Done.', payload.success === false ? 'error' : 'ok')
+  else appendConsole(JSON.stringify(payload), '')
+}
+
+async function postMaybeSse(path, body, title) {
+  openConsole(title)
+  const response = await fetch(path.startsWith('/api/') ? path : `/api/${path}`, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify(body || {}),
+  })
+  const contentType = contentTypeOf(response)
+  if (contentType.includes('text/event-stream')) {
+    const events = await consumeSseResponse(response)
+    const failed = events.some((event) => event.type === 'done' && event.success === false)
+    if (!response.ok || failed) {
+      const lastError = [...events].reverse().find((event) => event.error || event.message)
+      throw new Error(lastError?.error || lastError?.message || `HTTP ${response.status}`)
+    }
+    return { kind: 'sse', events }
+  }
+  const parsed = await parseResponseBody(response)
+  if (parsed.kind === 'json') {
+    const payload = parsed.payload
+    if (!response.ok || payload.ok === false || payload.success === false) {
+      throw new Error(payload.error || payload.message || `HTTP ${response.status}`)
     }
     return payload
-  })
+  }
+  if (!response.ok) throw new Error(parsed.text || `HTTP ${response.status}`)
+  if (parsed.text) appendConsole(parsed.text, '')
+  return parsed
 }
 
 async function loadBaseState() {
@@ -791,7 +877,7 @@ function renderDashboard() {
           </div>
           <div style="margin-top:16px;" class="inline-actions">
             <button class="btn primary" onclick="setRoute('tasks')">Open Scheduled Tasks</button>
-            <button class="btn" onclick="setRoute('tools')">Manage CLI tools</button>
+            <button class="btn" onclick="setRoute('tools')">打开 CLI 管理</button>
           </div>
         </div>
       </section>
@@ -1033,12 +1119,12 @@ function renderTools() {
     <section class="panel">
       <div class="panel-header">
         <div>
-          <h2>Tools & MCP</h2>
-          <p>Use the existing HolySheep automation endpoints from inside the new workspace shell.</p>
+          <h2>CLI 管理</h2>
+          <p>统一管理本地 AI CLI、MCP 与 VS Code Claude 代理；代理作为 Claude Code 的子状态展示。</p>
         </div>
       </div>
       <div class="panel-body tool-grid">
-        ${tools.map((tool) => `
+        ${tools.filter((tool) => tool.id !== 'claude-proxy').map((tool) => `
           <div class="tool-card">
             <div class="tool-head">
               <div>
@@ -1055,6 +1141,7 @@ function renderTools() {
               </div>
             </div>
             <div class="tool-hint">${esc(tool.hint || 'No additional hint')}</div>
+            ${tool.id === 'claude-code' ? renderClaudeProxySubstatus(tool.vsCodeProxy) : ''}
           </div>
         `).join('')}
       </div>
@@ -1062,6 +1149,25 @@ function renderTools() {
   `
 }
 
+function renderClaudeProxySubstatus(proxy) {
+  const running = !!proxy?.running
+  const meta = running
+    ? `127.0.0.1:${proxy.port || '?'} · PID ${proxy.pid || '?'}`
+    : '未启动 · Windows 启动后需要完全退出 Code.exe 再重开 VS Code'
+  return `
+    <div class="tool-substatus">
+      <div>
+        <div class="tool-substatus-title">VS Code Claude 代理</div>
+        <div class="tool-substatus-meta">${esc(meta)}</div>
+      </div>
+      <div class="inline-actions">
+        <button class="btn ${running ? '' : 'primary'}" onclick="startClaudeProxy()">${running ? '重新校准' : '启动代理'}</button>
+        ${running ? '<button class="btn danger" onclick="stopClaudeProxy()">停止</button>' : ''}
+      </div>
+    </div>
+  `
+}
+
 function renderAccount() {
   const status = state.status || {}
   const balance = state.balance || {}
@@ -1344,6 +1450,7 @@ function copyLoginKey() {
 }
 
 async function launchTool(toolId) {
+  if (toolId === 'claude-proxy') return startClaudeProxy()
   const result = await api('tool/launch', {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
@@ -1352,6 +1459,31 @@ async function launchTool(toolId) {
   if (result?.url) alert(`Opened: ${result.url}`)
 }
 
+async function startClaudeProxy() {
+  try {
+    appendConsole('正在启动 claude-proxy...', 'warn')
+    const result = await postMaybeSse('claude-proxy/start', {}, 'Start VS Code Claude proxy')
+    if (result.kind !== 'sse') appendConsole(result.message || `代理已启动: 127.0.0.1:${result.port || '?'}`, 'ok')
+    appendConsole('Windows 用户：请完全退出所有 Code.exe，再重新打开 VS Code。', 'warn')
+    await loadBaseState()
+    render()
+  } catch (error) {
+    appendConsole(error.message, 'error')
+  }
+}
+
+async function stopClaudeProxy() {
+  try {
+    appendConsole('正在停止 claude-proxy...', 'warn')
+    const result = await postMaybeSse('claude-proxy/stop', {}, 'Stop VS Code Claude proxy')
+    if (result.kind !== 'sse') appendConsole(result.message || '代理已停止', 'ok')
+    await loadBaseState()
+    render()
+  } catch (error) {
+    appendConsole(error.message, 'error')
+  }
+}
+
 async function launchCurrentTool() {
   if (!state.currentConversation?.toolId) return
   return launchTool(state.currentConversation.toolId)
@@ -1376,32 +1508,33 @@ document.getElementById('console-close').onclick = () => {
   document.getElementById('console-drawer').classList.remove('open')
 }
 
-async function consumeSse(path, body, title) {
-  openConsole(title)
-  const response = await fetch(`/api/${path}`, {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify(body),
-  })
+async function consumeSseResponse(response) {
   const reader = response.body.getReader()
   const decoder = new TextDecoder()
+  const events = []
   let buffer = ''
+  async function flush(chunk, final = false) {
+    buffer += chunk
+    const chunks = buffer.split('\n\n')
+    buffer = final ? '' : chunks.pop()
+    for (const part of chunks) {
+      for (const payload of parseSseText(part + '\n\n')) {
+        events.push(payload)
+        appendSseEventToConsole(payload)
+      }
+    }
+  }
   while (true) {
     const { value, done } = await reader.read()
     if (done) break
-    buffer += decoder.decode(value, { stream: true })
-    const chunks = buffer.split('\n\n')
-    buffer = chunks.pop()
-    for (const chunk of chunks) {
-      const line = chunk.split('\n').find((entry) => entry.startsWith('data:'))
-      if (!line) continue
-      const payload = JSON.parse(line.slice(5).trim())
-      if (payload.type === 'output') appendConsole(payload.text, '')
-      else if (payload.type === 'progress') appendConsole(payload.message || JSON.stringify(payload), payload.status === 'error' ? 'error' : payload.status === 'ok' ? 'ok' : 'warn')
-      else if (payload.type === 'done') appendConsole('Done.', payload.success === false ? 'error' : 'ok')
-      else appendConsole(JSON.stringify(payload), '')
-    }
+    await flush(decoder.decode(value, { stream: true }))
   }
+  if (buffer) await flush(buffer, true)
+  return events
+}
+
+async function consumeSse(path, body, title) {
+  await postMaybeSse(path, body, title)
 }
 
 function configureTool(toolId) {

package/dist/index.js

@@ -12,11 +12,11 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@simonyea/holysheep-cli",
-      version: "2.1.68",
+      version: "2.1.70",
       description: "Claude Code/Cursor/Cline API relay for China \u2014 \xA51=$1, WeChat/Alipay payment, no credit card, no VPN. One command setup for all AI coding tools.",
       scripts: {
         build: "node scripts/build.mjs",
-        test: "node tests/droid.test.js && node tests/workspace-store.test.js && node tests/runtime-stale-upgrade.test.js && node tests/hermes.test.js && node tests/preflight.test.js && node tests/opencode-auth-purge.test.js && node tests/shell-winpath.test.js && node tests/openclaw-atomic-write.test.js && node tests/openclaw-disable-auth-direct.test.js && node tests/opencode-default-model.test.js && node tests/paths-bundled.test.js && node tests/aionui-runtime-resources.test.js && node tests/aionui-wrapper-claude-proxy.test.js && node tests/aionui-wrapper-probe.test.js && node tests/aionui-wrapper-proxy-integration.test.js && node tests/aionui-wrapper-all-clis-autoconf.test.js && node tests/aionui-wrapper-env-signal.test.js && node tests/aionui-wrapper-csp-rewrite.test.js && node tests/aionui-wrapper-version-status.test.js && node tests/claude-proxy-daemon.test.js && node tests/claude-proxy-vscode-settings.test.js && node tests/claude-proxy-vscode-env.test.js && node tests/acptypes-patch.test.js && node tests/codex-approval-policy.test.js && node tests/version-check.test.js && node tests/runclaude-missing-binary.test.js && node tests/claude-code-configure-preserve.test.js",
+        test: "node tests/droid.test.js && node tests/workspace-store.test.js && node tests/runtime-stale-upgrade.test.js && node tests/hermes.test.js && node tests/preflight.test.js && node tests/opencode-auth-purge.test.js && node tests/shell-winpath.test.js && node tests/openclaw-atomic-write.test.js && node tests/openclaw-disable-auth-direct.test.js && node tests/opencode-default-model.test.js && node tests/paths-bundled.test.js && node tests/aionui-runtime-resources.test.js && node tests/aionui-wrapper-claude-proxy.test.js && node tests/aionui-wrapper-probe.test.js && node tests/aionui-wrapper-proxy-integration.test.js && node tests/aionui-wrapper-all-clis-autoconf.test.js && node tests/aionui-wrapper-env-signal.test.js && node tests/aionui-wrapper-csp-rewrite.test.js && node tests/aionui-wrapper-version-status.test.js && node tests/claude-proxy-daemon.test.js && node tests/claude-proxy-vscode-settings.test.js && node tests/claude-proxy-vscode-env.test.js && node tests/acptypes-patch.test.js && node tests/codex-approval-policy.test.js && node tests/version-check.test.js && node tests/runclaude-missing-binary.test.js && node tests/claude-code-configure-preserve.test.js && node tests/webui-claude-proxy-virtual-tool.test.js && node tests/webui-claude-proxy-ui.test.js && node tests/webui-response-consumer.test.js",
         prepublishOnly: "npm run build && npm test && node scripts/check-tarball-size.js"
       },
       keywords: [
@@ -7685,7 +7685,7 @@ var require_server = __commonJS({
     async function buildToolSummary(tool) {
       var _a, _b;
       const installed = await detectToolInstalled(tool);
-      return {
+      const summary = {
         id: tool.id,
         name: tool.name,
         installed,
@@ -7698,6 +7698,18 @@ var require_server = __commonJS({
         canUpgrade: !!UPGRADABLE_TOOLS.find((item) => item.id === tool.id),
         npmPkg: ((_b = UPGRADABLE_TOOLS.find((item) => item.id === tool.id)) == null ? void 0 : _b.npmPkg) || null
       };
+      if (tool.id === "claude-code") {
+        const proxyState = isClaudeProxyRunning();
+        summary.vsCodeProxy = {
+          running: proxyState.running,
+          configured: proxyState.running,
+          port: proxyState.port || null,
+          pid: proxyState.pid || null,
+          launchCmd: "hs claude-proxy --daemon",
+          hint: proxyState.running ? `VS Code \u4EE3\u7406\u8FD0\u884C\u4E2D\uFF1A127.0.0.1:${proxyState.port}` : "VS Code Claude Code \u9700\u8981\u542F\u52A8\u672C\u5730\u4EE3\u7406\uFF1B\u542F\u52A8\u540E\u8BF7\u5B8C\u5168\u9000\u51FA\u5E76\u91CD\u5F00 VS Code\u3002"
+        };
+      }
+      return summary;
     }
     __name(buildToolSummary, "buildToolSummary");
     function json(res, data, status = 200) {
@@ -7943,23 +7955,85 @@ var require_server = __commonJS({
     __name(isClaudeProxyRunning, "isClaudeProxyRunning");
     async function handleTools(_req, res) {
       const tools = await Promise.all(TOOLS.map((tool) => buildToolSummary(tool)));
-      const proxyState = isClaudeProxyRunning();
-      tools.push({
-        id: "claude-proxy",
-        name: "Claude \u4EE3\u7406\uFF08VS Code\uFF09",
-        installed: true,
-        configured: proxyState.running,
-        version: proxyState.running ? `\u7AEF\u53E3 ${proxyState.port}` : null,
-        installCmd: null,
-        hint: "\u542F\u52A8\u540E VS Code Claude \u6269\u5C55\u5373\u53EF\u901A\u8FC7 HolySheep \u4F7F\u7528",
-        launchCmd: "hs claude-proxy",
-        canAutoInstall: false,
-        canUpgrade: false,
-        isProxy: true
-      });
       json(res, tools);
     }
     __name(handleTools, "handleTools");
+    function isClaudeProxyToolId(toolId) {
+      return toolId === "claude-proxy";
+    }
+    __name(isClaudeProxyToolId, "isClaudeProxyToolId");
+    function emitClaudeProxyUnsupportedSse(res, action) {
+      sseStart(res);
+      sseEmit(res, {
+        type: "progress",
+        status: "error",
+        message: `Claude Code / VS Code \u4EE3\u7406\u4E0D\u652F\u6301 ${action}\uFF1B\u8BF7\u4F7F\u7528\u201C\u542F\u52A8 VS Code \u4EE3\u7406\u201D\u6216\u8FD0\u884C hs claude-proxy --daemon\u3002`
+      });
+      sseEmit(res, { type: "done", success: false, message: "unsupported-claude-proxy-action" });
+      res.end();
+    }
+    __name(emitClaudeProxyUnsupportedSse, "emitClaudeProxyUnsupportedSse");
+    async function handleClaudeProxyToolStart(res) {
+      sseStart(res);
+      const state = isClaudeProxyRunning();
+      if (state.running) {
+        sseEmit(res, { type: "progress", status: "ok", message: `VS Code \u4EE3\u7406\u5DF2\u5728\u8FD0\u884C\uFF1A127.0.0.1:${state.port} (PID ${state.pid})` });
+        sseEmit(res, { type: "done", success: true, port: state.port, pid: state.pid });
+        return res.end();
+      }
+      try {
+        sseEmit(res, { type: "progress", message: "\u6B63\u5728\u542F\u52A8 VS Code \u4EE3\u7406..." });
+        const claudeProxy = require_claude_proxy();
+        await claudeProxy(["--daemon"]);
+        await new Promise((r) => setTimeout(r, 1200));
+        const newState = isClaudeProxyRunning();
+        if (!newState.running) {
+          throw new Error("claude-proxy daemon \u542F\u52A8\u540E\u672A\u5199\u5165\u5065\u5EB7 PID\uFF1B\u8BF7\u67E5\u770B ~/.holysheep/claude-proxy.log");
+        }
+        sseEmit(res, { type: "progress", status: "ok", message: `VS Code \u4EE3\u7406\u5DF2\u542F\u52A8\uFF1A127.0.0.1:${newState.port} (PID ${newState.pid})` });
+        sseEmit(res, { type: "progress", message: "Windows \u7528\u6237\uFF1A\u8BF7\u5B8C\u5168\u9000\u51FA\u6240\u6709 Code.exe\uFF0C\u518D\u91CD\u65B0\u6253\u5F00 VS Code\u3002" });
+        sseEmit(res, { type: "done", success: true, port: newState.port, pid: newState.pid });
+        res.end();
+      } catch (e) {
+        sseEmit(res, { type: "progress", status: "error", message: e && e.message ? e.message : String(e) });
+        sseEmit(res, { type: "done", success: false, error: e && e.message ? e.message : String(e) });
+        res.end();
+      }
+    }
+    __name(handleClaudeProxyToolStart, "handleClaudeProxyToolStart");
+    async function handleClaudeProxyToolStop(res) {
+      sseStart(res);
+      try {
+        const claudeProxy = require_claude_proxy();
+        await claudeProxy(["--stop"]);
+        sseEmit(res, { type: "progress", status: "ok", message: "VS Code \u4EE3\u7406\u5DF2\u505C\u6B62" });
+        sseEmit(res, { type: "done", success: true });
+        res.end();
+      } catch (e) {
+        sseEmit(res, { type: "progress", status: "error", message: e && e.message ? e.message : String(e) });
+        sseEmit(res, { type: "done", success: false, error: e && e.message ? e.message : String(e) });
+        res.end();
+      }
+    }
+    __name(handleClaudeProxyToolStop, "handleClaudeProxyToolStop");
+    async function handleClaudeProxyVirtualToolAction(req, res, action) {
+      const body = await parseBody(req);
+      if (!isClaudeProxyToolId(body.toolId)) return false;
+      if (action === "launch" || action === "configure" || action === "install") {
+        await handleClaudeProxyToolStart(res);
+        return true;
+      }
+      if (action === "reset") {
+        await handleClaudeProxyToolStop(res);
+        return true;
+      }
+      if (action === "upgrade" || action === "rollback") {
+        emitClaudeProxyUnsupportedSse(res, "\u5347\u7EA7/\u56DE\u9000");
+        return true;
+      }
+      return false;
+    }
+    __name(handleClaudeProxyVirtualToolAction, "handleClaudeProxyVirtualToolAction");
     async function handleSetup(req, res) {
       const body = await parseBody(req);
       const { apiKey, models, toolIds, autoInstall } = body;
@@ -8135,6 +8209,7 @@ var require_server = __commonJS({
     }
     __name(handleUpgrade, "handleUpgrade");
     async function handleToolInstall(req, res) {
+      if (await handleClaudeProxyVirtualToolAction(req, res, "install")) return;
       const body = await parseBody(req);
       const { toolId } = body;
       if (!toolId || !AUTO_INSTALL[toolId]) {
@@ -8293,6 +8368,7 @@ ${installCmd}
     }
     __name(handleToolInstall, "handleToolInstall");
     async function handleToolConfigure(req, res) {
+      if (await handleClaudeProxyVirtualToolAction(req, res, "configure")) return;
       const body = await parseBody(req);
       const { toolId } = body;
       const apiKey = getApiKey();
@@ -8352,6 +8428,7 @@ ${installCmd}
     __name(handleToolConfigure, "handleToolConfigure");
     async function handleToolUpgrade(req, res) {
       var _a;
+      if (await handleClaudeProxyVirtualToolAction(req, res, "upgrade")) return;
       const body = await parseBody(req);
       const { toolId } = body;
       const entry = UPGRADABLE_TOOLS.find((t) => t.id === toolId);
@@ -8459,6 +8536,7 @@ ${installCmd}
     __name(handleToolUpgrade, "handleToolUpgrade");
     async function handleToolRollback(req, res) {
       var _a;
+      if (await handleClaudeProxyVirtualToolAction(req, res, "rollback")) return;
       const body = await parseBody(req);
       const { toolId } = body;
       const entry = UPGRADABLE_TOOLS.find((t) => t.id === toolId);
@@ -8613,6 +8691,7 @@ ${installCmd}
     }
     __name(handleToolRollback, "handleToolRollback");
     async function handleToolReset(req, res) {
+      if (await handleClaudeProxyVirtualToolAction(req, res, "reset")) return;
       const body = await parseBody(req);
       const { toolId } = body;
       const tool = TOOLS.find((t) => t.id === toolId);
@@ -8627,6 +8706,7 @@ ${installCmd}
     __name(handleToolReset, "handleToolReset");
     async function handleToolLaunch(req, res) {
       var _a, _b;
+      if (await handleClaudeProxyVirtualToolAction(req, res, "launch")) return;
       const body = await parseBody(req);
       const { toolId } = body;
       const tool = TOOLS.find((t) => t.id === toolId);
@@ -8676,7 +8756,10 @@ ${installCmd}
         await claudeProxy(["--daemon"]);
         await new Promise((r) => setTimeout(r, 2e3));
         const newState = isClaudeProxyRunning();
-        json(res, { ok: newState.running, port: newState.port, pid: newState.pid });
+        if (!newState.running) {
+          return json(res, { ok: false, error: "claude-proxy daemon \u542F\u52A8\u540E\u672A\u5199\u5165\u5065\u5EB7 PID\uFF1B\u8BF7\u67E5\u770B ~/.holysheep/claude-proxy.log" }, 500);
+        }
+        json(res, { ok: true, port: newState.port, pid: newState.pid });
       } catch (e) {
         json(res, { ok: false, error: e.message }, 500);
       }
@@ -9091,6 +9174,8 @@ ${installCmd}
       handleToolReset,
       handleToolLaunch,
       handleToolUpgrade,
+      handleClaudeProxyStart,
+      handleClaudeProxyStop,
       handleUpgrade,
       handleBalance,
       handleDoctor,
@@ -9627,16 +9712,16 @@ var require_aionui_wrapper = __commonJS({
     d.addEventListener('click',function(){if(d.parentNode)d.parentNode.removeChild(d);sessionStorage.setItem(DISMISS_KEY,'1')});
     setTimeout(function(){if(d.parentNode)d.parentNode.removeChild(d);},30000);
   })();
-  // [v2.1.59] CLI upgrade panel \u2014 floating "\u{1F527} CLI \u5DE5\u5177" button bottom-left
+  // [v2.1.70] Single CLI management panel \u2014 floating "\u{1F527} CLI \u7BA1\u7406" button bottom-left
   (function(){
-    var btn=el('div','position:fixed;bottom:16px;left:16px;z-index:99998;background:#2d3748;color:#fff;padding:8px 14px;border-radius:20px;font-size:12px;cursor:pointer;box-shadow:0 2px 8px rgba(0,0,0,.2);user-select:none','\u{1F527} CLI \u5DE5\u5177');
-    btn.title='\u67E5\u770B/\u5347\u7EA7\u6240\u6709 CLI \u5DE5\u5177';
+    var btn=el('div','position:fixed;bottom:16px;left:16px;z-index:99998;background:#2d3748;color:#fff;padding:8px 14px;border-radius:20px;font-size:12px;cursor:pointer;box-shadow:0 2px 8px rgba(0,0,0,.2);user-select:none','\u{1F527} CLI \u7BA1\u7406');
+    btn.title='\u7EDF\u4E00\u7BA1\u7406 CLI\u3001MCP \u4E0E VS Code Claude \u4EE3\u7406';
     document.body.appendChild(btn);
     var panel=null;
     btn.addEventListener('click',function(){
       if(panel){if(panel.parentNode)panel.parentNode.removeChild(panel);panel=null;return}
       panel=el('div','position:fixed;bottom:56px;left:16px;z-index:99998;background:#fff;color:#222;width:420px;max-height:70vh;overflow-y:auto;border-radius:8px;box-shadow:0 4px 20px rgba(0,0,0,.25);padding:16px;font-size:13px',
-        '<div style="display:flex;justify-content:space-between;align-items:center;margin-bottom:12px"><b>CLI \u5DE5\u5177\u7BA1\u7406</b><span id="hs-cli-close" style="cursor:pointer;font-size:16px;color:#999">\xD7</span></div>'+
+        '<div style="display:flex;justify-content:space-between;align-items:center;margin-bottom:12px"><b>CLI \u7BA1\u7406</b><span id="hs-cli-close" style="cursor:pointer;font-size:16px;color:#999">\xD7</span></div>'+
         '<div id="hs-cli-list" style="color:#666">\u52A0\u8F7D\u4E2D...</div>'+
         '<div id="hs-cli-log" style="margin-top:12px;font-size:11px;background:#1e1e1e;color:#0f0;padding:8px;border-radius:4px;max-height:200px;overflow-y:auto;display:none;font-family:monospace;white-space:pre-wrap"></div>');
       document.body.appendChild(panel);
@@ -9656,7 +9741,13 @@ var require_aionui_wrapper = __commonJS({
           if(t.installed&&!t.configured)btns+='<button data-act="configure" data-id="'+t.id+'" style="'+btnSty+';background:#8b5cf6">\u914D\u7F6E</button>';
           // [v2.1.63] \u542F\u52A8 button \u2014 installed + has launchCmd (covers OpenClaw etc.)
           if(t.installed&&t.launchCmd)btns+='<button data-act="launch" data-id="'+t.id+'" style="'+btnSty+';background:#f59e0b">\u542F\u52A8</button>';
-          return '<div style="padding:8px 0;border-bottom:1px solid #eee;display:flex;justify-content:space-between;align-items:center"><div><b>'+t.name+'</b> '+statusBadge+' '+verText+'</div><div>'+btns+'</div></div>';
+          var proxy='';
+          if(t.id==='claude-code'&&t.vsCodeProxy){
+            var p=t.vsCodeProxy;
+            var pText=p.running?('\u8FD0\u884C\u4E2D 127.0.0.1:'+p.port+' \xB7 PID '+p.pid):'\u672A\u542F\u52A8\uFF08Windows \u542F\u52A8\u540E\u9700\u5B8C\u5168\u9000\u51FA Code.exe \u518D\u91CD\u5F00 VS Code\uFF09';
+            proxy='<div style="margin-top:6px;padding:6px 8px;background:#fff7ed;border:1px solid #fed7aa;border-radius:6px;font-size:11px;color:#9a3412">VS Code \u4EE3\u7406\uFF1A'+pText+' <button data-act="launch" data-id="claude-proxy" style="'+btnSty+';background:#f59e0b">'+(p.running?'\u91CD\u65B0\u6821\u51C6':'\u542F\u52A8\u4EE3\u7406')+'</button>'+(p.running?' <button data-act="reset" data-id="claude-proxy" style="'+btnSty+';background:#dc2626">\u505C\u6B62</button>':'')+'</div>';
+          }
+          return '<div style="padding:8px 0;border-bottom:1px solid #eee"><div style="display:flex;justify-content:space-between;align-items:center"><div><b>'+t.name+'</b> '+statusBadge+' '+verText+'</div><div>'+btns+'</div></div>'+proxy+'</div>';
         }).join('')+'<div style="padding-top:10px"><button id="hs-cli-upgrade-all" style="width:100%;padding:8px;background:#16a34a;color:#fff;border:0;border-radius:4px;cursor:pointer;font-weight:600">\u4E00\u952E\u5347\u7EA7\u5168\u90E8\u5DF2\u5B89\u88C5\u7684 CLI</button></div>';
         Array.prototype.forEach.call(panel.querySelectorAll('button[data-act]'),function(b){
           b.addEventListener('click',function(){runAction(b.dataset.act,b.dataset.id,b)});
@@ -9665,36 +9756,21 @@ var require_aionui_wrapper = __commonJS({
         if(allBtn)allBtn.addEventListener('click',function(){runAllUpgrade(allBtn)});
       }
       function runAction(act,id,b){
-        // [v2.1.63] launch returns plain JSON (not SSE) with { url, ... }
         if(act==='launch'){
           b.disabled=true;b.style.opacity='.5';b.textContent='\u542F\u52A8\u4E2D...';
-          logEl.style.display='block';logEl.textContent='\u6B63\u5728\u542F\u52A8 '+id+'...\\n';
-          fetch('/api/holysheep/tool/launch',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({toolId:id})})
-            .then(function(r){return r.json()})
-            .then(function(j){
-              b.disabled=false;b.style.opacity='1';
-              if(j&&j.url){
-                logEl.textContent+='\u5DF2\u542F\u52A8: '+j.url+'\\n';
-                b.textContent='\u2713 \u5DF2\u542F\u52A8';
-                try{ window.open(j.url,'_blank') }catch(e){}
-              }else if(j&&j.success===false){
-                logEl.textContent+='\u542F\u52A8\u5931\u8D25: '+(j.message||j.error||'unknown')+'\\n';
-                b.textContent='\u2717 \u5931\u8D25 (\u91CD\u8BD5)';
-              }else{
-                logEl.textContent+=JSON.stringify(j)+'\\n';
-                b.textContent='\u2713 \u5DF2\u542F\u52A8';
-              }
-              setTimeout(loadTools,500);
-            })
-            .catch(function(e){
-              b.disabled=false;b.style.opacity='1';b.textContent='\u2717 \u5931\u8D25 (\u91CD\u8BD5)';
-              logEl.textContent+='\u8BF7\u6C42\u5931\u8D25: '+e.message+'\\n';
-            });
+          logEl.style.display='block';logEl.textContent='\u6B63\u5728\u542F\u52A8 '+id+'...
+';
+          postMaybeSse('/api/holysheep/tool/launch',{toolId:id},logEl,function(ok,j){
+            b.disabled=false;b.style.opacity='1';
+            if(j&&j.url){try{ window.open(j.url,'_blank') }catch(e){}}
+            b.textContent=ok?'\u2713 \u5DF2\u542F\u52A8':'\u2717 \u5931\u8D25 (\u91CD\u8BD5)';
+            setTimeout(loadTools,500);
+          });
           return;
         }
         b.disabled=true;b.style.opacity='.5';b.textContent=act==='install'?'\u5B89\u88C5\u4E2D...':act==='upgrade'?'\u5347\u7EA7\u4E2D...':'\u914D\u7F6E\u4E2D...';
         logEl.style.display='block';logEl.textContent='';
-        var path=act==='install'?'tool/install':act==='upgrade'?'tool/upgrade':'tool/configure';
+        var path=act==='install'?'tool/install':act==='upgrade'?'tool/upgrade':act==='reset'?'tool/reset':'tool/configure';
         consumeSse('/api/holysheep/'+path,{toolId:id},logEl,function(ok){
           b.disabled=false;b.style.opacity='1';b.textContent=ok?'\u2713 \u5B8C\u6210':'\u2717 \u5931\u8D25 (\u91CD\u8BD5)';
           setTimeout(loadTools,500);
@@ -9708,31 +9784,56 @@ var require_aionui_wrapper = __commonJS({
           setTimeout(loadTools,500);
         });
       }
-      function consumeSse(url,body,logEl,done){
+      function contentTypeOf(r){return String((r.headers&&r.headers.get&&r.headers.get('content-type'))||'').toLowerCase()}
+      function appendSseEvent(ev,logEl){
+        if(ev.type==='output'&&ev.text){logEl.textContent+=ev.text;logEl.scrollTop=logEl.scrollHeight}
+        else if(ev.type==='progress'&&ev.message){logEl.textContent+='\u2192 '+ev.message+'
+';logEl.scrollTop=logEl.scrollHeight}
+        else if(ev.type==='tool'&&ev.status){logEl.textContent+='['+ev.name+'] '+ev.status+(ev.newVer?' v'+ev.newVer:'')+'
+'}
+        else if(ev.type==='done'&&ev.success===false){logEl.textContent+='\u2717 '+(ev.message||ev.error||'\u5931\u8D25')+'
+'}
+      }
+      function consumeSseResponse(r,logEl,done){
+        var reader=r.body.getReader();var dec=new TextDecoder();var buf='';var ok=true;
+        function handlePart(p){
+          var line=p.split('
+').find(function(l){return l.startsWith('data:')});
+          if(!line)return;
+          try{var ev=JSON.parse(line.slice(5).trim());if(ev.type==='done'&&ev.success===false)ok=false;appendSseEvent(ev,logEl)}catch(e){logEl.textContent+=line.slice(5).trim()+'
+'}
+        }
+        function pump(){
+          reader.read().then(function(s){
+            if(s.done){if(buf)handlePart(buf);return done(ok)}
+            buf+=dec.decode(s.value,{stream:true});
+            var parts=buf.split('
+
+');buf=parts.pop();parts.forEach(handlePart);pump();
+          }).catch(function(e){logEl.textContent+='
+[\u9519\u8BEF] '+e.message;done(false)})
+        }
+        pump();
+      }
+      function postMaybeSse(url,body,logEl,done){
         fetch(url,{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body||{})}).then(function(r){
-          var reader=r.body.getReader();var dec=new TextDecoder();var buf='';var ok=true;
-          function pump(){
-            reader.read().then(function(s){
-              if(s.done){return done(ok)}
-              buf+=dec.decode(s.value,{stream:true});
-              var parts=buf.split('\\n\\n');buf=parts.pop();
-              parts.forEach(function(p){
-                var line=p.split('\\n').find(function(l){return l.startsWith('data:')});
-                if(!line)return;
-                try{
-                  var ev=JSON.parse(line.slice(5).trim());
-                  if(ev.type==='output'&&ev.text){logEl.textContent+=ev.text;logEl.scrollTop=logEl.scrollHeight}
-                  else if(ev.type==='progress'&&ev.message){logEl.textContent+='\u2192 '+ev.message+'\\n';logEl.scrollTop=logEl.scrollHeight}
-                  else if(ev.type==='tool'&&ev.status){logEl.textContent+='['+ev.name+'] '+ev.status+(ev.newVer?' v'+ev.newVer:'')+'\\n'}
-                  else if(ev.type==='done'){if(ev.success===false)ok=false}
-                }catch(e){}
-              });
-              pump();
-            }).catch(function(e){logEl.textContent+='\\n[\u9519\u8BEF] '+e.message;done(false)})
-          }
-          pump();
-        }).catch(function(e){logEl.textContent='\u8BF7\u6C42\u5931\u8D25: '+e.message;done(false)});
+          var ct=contentTypeOf(r);
+          if(ct.indexOf('text/event-stream')>=0)return consumeSseResponse(r,logEl,done);
+          if(ct.indexOf('application/json')>=0)return r.json().then(function(j){
+            if(j&&j.url)logEl.textContent+='\u5DF2\u542F\u52A8: '+j.url+'
+';
+            else if(j&&(j.ok===false||j.success===false))logEl.textContent+='\u5931\u8D25: '+(j.message||j.error||'unknown')+'
+';
+            else logEl.textContent+=JSON.stringify(j)+'
+';
+            done(!(j&&(j.ok===false||j.success===false)),j);
+          });
+          return r.text().then(function(t){logEl.textContent+=t+'
+';done(r.ok)})
+        }).catch(function(e){logEl.textContent+='\u8BF7\u6C42\u5931\u8D25: '+e.message+'
+';done(false)});
       }
+      function consumeSse(url,body,logEl,done){postMaybeSse(url,body,logEl,done)}
       function loadTools(){
         fetch('/api/holysheep/tools').then(function(r){return r.json()}).then(renderTools).catch(function(e){listEl.innerHTML='<i style="color:#dc2626">\u52A0\u8F7D\u5931\u8D25: '+e.message+'</i>'});
       }

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "2.1.68",
+  "version": "2.1.70",
   "description": "Claude Code/Cursor/Cline API relay for China — ¥1=$1, WeChat/Alipay payment, no credit card, no VPN. One command setup for all AI coding tools.",
   "scripts": {
     "build": "node scripts/build.mjs",
-    "test": "node tests/droid.test.js && node tests/workspace-store.test.js && node tests/runtime-stale-upgrade.test.js && node tests/hermes.test.js && node tests/preflight.test.js && node tests/opencode-auth-purge.test.js && node tests/shell-winpath.test.js && node tests/openclaw-atomic-write.test.js && node tests/openclaw-disable-auth-direct.test.js && node tests/opencode-default-model.test.js && node tests/paths-bundled.test.js && node tests/aionui-runtime-resources.test.js && node tests/aionui-wrapper-claude-proxy.test.js && node tests/aionui-wrapper-probe.test.js && node tests/aionui-wrapper-proxy-integration.test.js && node tests/aionui-wrapper-all-clis-autoconf.test.js && node tests/aionui-wrapper-env-signal.test.js && node tests/aionui-wrapper-csp-rewrite.test.js && node tests/aionui-wrapper-version-status.test.js && node tests/claude-proxy-daemon.test.js && node tests/claude-proxy-vscode-settings.test.js && node tests/claude-proxy-vscode-env.test.js && node tests/acptypes-patch.test.js && node tests/codex-approval-policy.test.js && node tests/version-check.test.js && node tests/runclaude-missing-binary.test.js && node tests/claude-code-configure-preserve.test.js",
+    "test": "node tests/droid.test.js && node tests/workspace-store.test.js && node tests/runtime-stale-upgrade.test.js && node tests/hermes.test.js && node tests/preflight.test.js && node tests/opencode-auth-purge.test.js && node tests/shell-winpath.test.js && node tests/openclaw-atomic-write.test.js && node tests/openclaw-disable-auth-direct.test.js && node tests/opencode-default-model.test.js && node tests/paths-bundled.test.js && node tests/aionui-runtime-resources.test.js && node tests/aionui-wrapper-claude-proxy.test.js && node tests/aionui-wrapper-probe.test.js && node tests/aionui-wrapper-proxy-integration.test.js && node tests/aionui-wrapper-all-clis-autoconf.test.js && node tests/aionui-wrapper-env-signal.test.js && node tests/aionui-wrapper-csp-rewrite.test.js && node tests/aionui-wrapper-version-status.test.js && node tests/claude-proxy-daemon.test.js && node tests/claude-proxy-vscode-settings.test.js && node tests/claude-proxy-vscode-env.test.js && node tests/acptypes-patch.test.js && node tests/codex-approval-policy.test.js && node tests/version-check.test.js && node tests/runclaude-missing-binary.test.js && node tests/claude-code-configure-preserve.test.js && node tests/webui-claude-proxy-virtual-tool.test.js && node tests/webui-claude-proxy-ui.test.js && node tests/webui-response-consumer.test.js",
     "prepublishOnly": "npm run build && npm test && node scripts/check-tarball-size.js"
   },
   "keywords": [