@steerable/agent-shell 0.6.39 → 0.6.40

package/LICENSE

@@ -1,91 +1,201 @@
-Apache License
-Version 2.0, January 2004
-http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction,
-and distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by
-the copyright owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all
-other entities that control, are controlled by, or are under common
-control with that entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity
-exercising permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications.
-
-"Object" form shall mean any form resulting from mechanical
-transformation or translation of a Source form.
-
-"Work" shall mean the work of authorship made available under the
-License.
-
-"Derivative Works" shall mean any work based on the Work.
-
-"Contribution" shall mean any work of authorship intentionally
-submitted to Licensor for inclusion in the Work.
-
-"Contributor" shall mean Licensor and any individual or Legal Entity
-on behalf of whom a Contribution has been received by Licensor.
-
-2. Grant of Copyright License.
-Subject to the terms and conditions of this License, each Contributor
-hereby grants to You a perpetual, worldwide, non-exclusive, no-charge,
-royalty-free, irrevocable copyright license to reproduce, prepare
-Derivative Works of, publicly display, publicly perform, sublicense,
-and distribute the Work and such Derivative Works in Source or Object
-form.
-
-3. Grant of Patent License.
-Subject to the terms and conditions of this License, each Contributor
-hereby grants to You a perpetual, worldwide, non-exclusive, no-charge,
-royalty-free, irrevocable patent license to make, have made, use,
-offer to sell, sell, import, and otherwise transfer the Work.
-
-4. Redistribution.
-You may reproduce and distribute copies of the Work or Derivative
-Works thereof in any medium, with or without modifications, and in
-Source or Object form, provided that You meet the following conditions:
-
-(a) You must give any other recipients of the Work or Derivative
-Works a copy of this License; and
-(b) You must cause any modified files to carry prominent notices
-stating that You changed the files; and
-(c) You must retain, in the Source form of any Derivative Works that
-You distribute, all copyright, patent, trademark, and attribution
-notices from the Source form of the Work; and
-(d) If the Work includes a "NOTICE" text file as part of its
-distribution, then any Derivative Works that You distribute must
-include a readable copy of the attribution notices contained within
-such NOTICE file.
-
-5. Submission of Contributions.
-Unless You explicitly state otherwise, any Contribution intentionally
-submitted for inclusion in the Work shall be under the terms and
-conditions of this License.
-
-6. Trademarks.
-This License does not grant permission to use the trade names,
-trademarks, service marks, or product names of the Licensor.
-
-7. Disclaimer of Warranty.
-Unless required by applicable law or agreed to in writing, Licensor
-provides the Work on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND.
-
-8. Limitation of Liability.
-In no event and under no legal theory shall any Contributor be liable
-to You for damages arising as a result of this License or out of the
-use or inability to use the Work.
-
-9. Accepting Warranty or Additional Liability.
-While redistributing the Work or Derivative Works thereof, You may
-choose to offer, and charge a fee for, acceptance of support, warranty,
-indemnity, or other liability obligations.
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/dist/host/visible-terminal-exec.js

@@ -25,6 +25,17 @@ export function mapSessionShell(shell) {
         return 'zsh';
     return process.platform === 'win32' ? 'powershell' : 'zsh';
 }
+function commandInCwd(command, cwd, shell) {
+    if (/[\0\r\n]/.test(cwd))
+        return null;
+    if (shell === 'cmd')
+        return null;
+    if (shell === 'powershell') {
+        return `Set-Location -LiteralPath '${cwd.replace(/'/g, "''")}'; ${command}`;
+    }
+    const quoted = `'${cwd.replace(/'/g, `'\"'\"'`)}'`;
+    return `cd -- ${quoted} && ${command}`;
+}
 /**
  * Decide whether to route a shell command through the visible PTY instead of
  * the headless local-executor. Returns null to fall back headless. No renderer
@@ -80,8 +91,10 @@ export function createVisibleTerminalExec(deps) {
         // 项目模式（ToolRouter 会把项目根塞进 req.cwd）：可见 PTY 是共享交互
         // 会话，已有 session 不会随 ensurePrimary 改目录——显式 cd 过去。
         const commandForPty = req.cwd
-            ? `cd "${req.cwd.replace(/"/g, '\\"')}" && ${req.command}`
+            ? commandInCwd(req.command, req.cwd, resolvedShell)
             : req.command;
+        if (commandForPty === null)
+            return null;
         log.info('[terminal-exec] start', {
             sessionId: session.id,
             cwd: req.cwd || session.cwd,

package/dist/local-backend/llm-diagnose.js

@@ -120,7 +120,6 @@ export async function diagnoseLlmConnection(options) {
                     method: 'HEAD',
                     path: '/',
                     timeout: timeoutMs,
-                    rejectUnauthorized: false, // diagnosis only — we want to see the cert, not enforce it
                 }, (res) => {
                     res.resume();
                     resolve();
@@ -167,7 +166,6 @@ export async function diagnoseLlmConnection(options) {
                 method: 'GET',
                 path: modelsPath,
                 timeout: timeoutMs,
-                rejectUnauthorized: false,
                 headers: {
                     ...(apiKey ? { Authorization: `Bearer ${apiKey}` } : {}),
                     Accept: 'application/json',
@@ -227,7 +225,6 @@ export async function diagnoseLlmConnection(options) {
                     method: 'POST',
                     path: chatPath,
                     timeout: timeoutMs,
-                    rejectUnauthorized: false,
                     headers: {
                         'Content-Type': 'application/json',
                         ...(apiKey ? { Authorization: `Bearer ${apiKey}` } : {}),

package/dist/mcp-executor.js

@@ -1,4 +1,4 @@
-import { execSync } from 'child_process';
+import { execFileSync } from 'child_process';
 import { createRequire } from 'module';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
@@ -35,7 +35,7 @@ const COMMAND_HINTS = {
 function commandExists(cmd) {
     try {
         const which = process.platform === 'win32' ? 'where' : 'which';
-        execSync(`${which} ${cmd}`, { stdio: 'ignore' });
+        execFileSync(which, [cmd], { stdio: 'ignore' });
         return true;
     }
     catch {

package/dist/server/http-server.js

@@ -145,10 +145,9 @@ export function createBsServer(deps) {
                 log.info(`[bs] stream ${request.method} ${pathname} -> ${result.status}`);
             }
             catch (err) {
-                const message = err instanceof Error ? err.message : String(err);
                 log.error(`[bs] stream ${request.method} ${pathname} threw`, err);
                 try {
-                    res.write(`event: error\ndata: ${JSON.stringify({ message })}\n\n`);
+                    res.write(`event: error\ndata: ${JSON.stringify({ message: 'internal error' })}\n\n`);
                 }
                 catch { /* client gone */ }
             }
@@ -164,7 +163,7 @@ export function createBsServer(deps) {
         }
         catch (err) {
             log.error(`[bs] ${request.method} ${pathname} threw`, err);
-            sendJson(res, 500, { detail: err instanceof Error ? err.message : String(err) });
+            sendJson(res, 500, { detail: 'internal error' });
         }
     }
     /** `/host/*`：preload direct-IPC 的 HTTP 等价物。全部 POST JSON，除标记 GET 的。 */
@@ -222,11 +221,12 @@ export function createBsServer(deps) {
                 sendJson(res, 200, result);
             }
             catch (err) {
+                log.error('[bs] terminal execution failed', err);
                 sendJson(res, 200, {
                     success: false,
                     exitCode: -1,
                     stdout: '',
-                    stderr: err instanceof Error ? err.message : String(err),
+                    stderr: 'terminal execution failed',
                     truncated: false,
                     durationMs: 0,
                 });

package/dist/storage/llm-settings.d.ts

@@ -76,7 +76,8 @@ export interface LlmSettings {
 }
 export declare const DEFAULT_SYSTEM_PROMPT: string;
 export declare const OPENAI_COMPAT_DEFAULTS: LlmSettings;
-export declare const EXPIRED_BAKED_API_KEY = "sk-b1383d225ee44f118ad99e359ec9e5d8";
+export declare const EXPIRED_BAKED_API_KEY_SHA256 = "5b761efc05315a24cb86e83a8a9e50fa773d3dc33a8ece4713faeae20ccd75e4";
+export declare function apiKeyMatchesFingerprint(apiKey: string | undefined, sha256: string): boolean;
 /** 已存设置是否还挂着作废的出厂内置 key。 */
 export declare function llmSettingsCarryExpiredBakedKey(s: LlmSettings): boolean;
 export declare const OLLAMA_DEFAULTS: LlmSettings;

package/dist/storage/llm-settings.js

@@ -5,6 +5,7 @@
  * calls `app.getPath()` and loads the Electron-ABI-compiled native module —
  * neither works under plain Node/vitest).
  */
+import { createHash } from 'node:crypto';
 import { getBrand } from '../brand.js';
 export const DEFAULT_SYSTEM_PROMPT = `你是 ${getBrand().agentName}，${getBrand().tagline}，优先给出可执行建议并在需要时调用本地工具。`;
 // ─── Per-provider 预设 ──────────────────────────────────────────────────────
@@ -26,13 +27,15 @@ export const OPENAI_COMPAT_DEFAULTS = {
     systemPrompt: DEFAULT_SYSTEM_PROMPT,
     maxTotalTokens: 60000,
 };
-// 0.0.35 及之前打包进客户端的内置 DeepSeek key（已作废，上游返回 401）。
-// 保留常量仅作迁移指纹：老安装的已存设置若还带着它，升级后静默清空，
-// 否则用户永远拿着一把死 key，报 401 也不知道为什么。
-export const EXPIRED_BAKED_API_KEY = 'sk-b1383d225ee44f118ad99e359ec9e5d8';
+// 0.0.35 及之前打包进客户端的内置 DeepSeek key 已作废。只保留不可逆
+// SHA-256 指纹用于清理老安装；公开源码和新客户端不再携带原始凭据。
+export const EXPIRED_BAKED_API_KEY_SHA256 = '5b761efc05315a24cb86e83a8a9e50fa773d3dc33a8ece4713faeae20ccd75e4';
+export function apiKeyMatchesFingerprint(apiKey, sha256) {
+    return !!apiKey && createHash('sha256').update(apiKey).digest('hex') === sha256;
+}
 /** 已存设置是否还挂着作废的出厂内置 key。 */
 export function llmSettingsCarryExpiredBakedKey(s) {
-    return !!s.apiKey && s.apiKey === EXPIRED_BAKED_API_KEY;
+    return apiKeyMatchesFingerprint(s.apiKey, EXPIRED_BAKED_API_KEY_SHA256);
 }
 // Ollama 预设：用户切到 Ollama provider 时的默认连接参数（指向本机默认端口
 // + 常用的 llama3.1:8b 镜像）。同时也充当"判断老安装是否还停留在出厂 Ollama

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steerable/agent-shell",
-  "version": "0.6.39",
+  "version": "0.6.40",
   "description": "Steerable framework — product-neutral desktop/headless agent host (Tier 5). Electron main + preload + headless HTTP server (BS) sharing one storage/sidecar/tooling core; scenario packs extend it through the @steerable/pack-sdk contract and are composed at build time by the consuming product.",
   "license": "Apache-2.0",
   "homepage": "https://steerableframework.com/",
@@ -55,9 +55,9 @@
     "he": "^1.2.0",
     "node-pty": "^1.1.0",
     "semver": "^7.8.0",
-    "@steerable/pack-sdk": "0.6.39",
-    "@steerable/agent-protocol": "0.6.39",
-    "@steerable/agent-harness": "0.6.39"
+    "@steerable/agent-harness": "0.6.40",
+    "@steerable/pack-sdk": "0.6.40",
+    "@steerable/agent-protocol": "0.6.40"
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.13",