@steerable/agent-shell 0.6.52 → 0.6.53

package/dist/host/runtime.js

@@ -16,6 +16,7 @@ import { LocalScriptRegistry } from '../local-script-registry.js';
 import { TerminalManager } from '../terminal-manager.js';
 import { ToolRouter } from '../tool-router.js';
 import { McpServerRegistry, } from '../mcp-server-registry.js';
+import { mcpExecutor } from '../mcp-executor.js';
 import { ProjectRegistry } from '../project-registry.js';
 import { getProductConfig } from '../product-config.js';
 import { LocalBackendRouter } from '../local-backend/router.js';
@@ -264,6 +265,7 @@ export async function createHostRuntime(options) {
             for (const handle of [...packHandles.values()].reverse()) {
                 await handle.dispose?.();
             }
+            await mcpExecutor.shutdownAll();
             await shutdownHostSidecar();
             await closeStorage();
         },

package/dist/local-backend/portable-bundle.d.ts

@@ -69,9 +69,14 @@ export interface PortableWebSearchSection {
 }
 export interface PortableMcpSection {
     name: string;
-    command: string;
-    args: string[];
+    transport: 'stdio' | 'streamable-http';
+    command?: string;
+    args?: string[];
     cwd?: string;
+    url?: string;
+    headers?: Record<string, string>;
+    headersFromEnv?: Record<string, string>;
+    bearerTokenEnvVar?: string;
     enabled: boolean;
     envIncluded: boolean;
     env?: Record<string, string>;
@@ -178,11 +183,20 @@ export declare function webSearchSectionFromSettings(settings: {
 }, includeSecrets: boolean): PortableWebSearchSection;
 export declare function mcpSectionFromServer(server: {
     name: string;
+    transport: 'stdio';
     command: string;
     args: string[];
     cwd?: string;
     enabled: boolean;
     env: Record<string, string>;
+} | {
+    name: string;
+    transport: 'streamable-http';
+    url: string;
+    headers: Record<string, string>;
+    headersFromEnv: Record<string, string>;
+    bearerTokenEnvVar?: string;
+    enabled: boolean;
 }, includeSecrets: boolean): PortableMcpSection;
 /**
  * 把消息正文和 metadata 里的旧附件绝对路径换成新会话里的路径。

package/dist/local-backend/portable-bundle.js

@@ -106,15 +106,27 @@ export function webSearchSectionFromSettings(settings, includeSecrets) {
     };
 }
 export function mcpSectionFromServer(server, includeSecrets) {
-    return {
-        name: server.name,
-        command: server.command,
-        args: [...server.args],
-        cwd: server.cwd,
-        enabled: server.enabled,
-        envIncluded: includeSecrets,
-        ...(includeSecrets ? { env: { ...server.env } } : {}),
-    };
+    return server.transport === 'stdio'
+        ? {
+            name: server.name,
+            transport: 'stdio',
+            command: server.command,
+            args: [...server.args],
+            cwd: server.cwd,
+            enabled: server.enabled,
+            envIncluded: includeSecrets,
+            ...(includeSecrets ? { env: { ...server.env } } : {}),
+        }
+        : {
+            name: server.name,
+            transport: 'streamable-http',
+            url: server.url,
+            headers: { ...server.headers },
+            headersFromEnv: { ...server.headersFromEnv },
+            bearerTokenEnvVar: server.bearerTokenEnvVar,
+            enabled: server.enabled,
+            envIncluded: false,
+        };
 }
 /**
  * 把消息正文和 metadata 里的旧附件绝对路径换成新会话里的路径。

package/dist/local-backend/portable-service.js

@@ -180,22 +180,36 @@ async function applyMcp(mcp, servers) {
         return 'MCP 注册表不可用';
     for (const server of servers) {
         const name = server.name?.trim();
-        const command = server.command?.trim();
-        if (!name || !command)
+        if (!name)
             continue;
-        const input = {
-            name,
-            command,
-            args: Array.isArray(server.args) ? server.args.map((arg) => String(arg)) : [],
-            cwd: server.cwd,
-            enabled: server.enabled !== false,
-            ...(server.envIncluded && server.env ? { env: server.env } : {}),
-        };
+        const input = server.transport === 'streamable-http'
+            ? {
+                name,
+                transport: 'streamable-http',
+                url: server.url?.trim() ?? '',
+                headers: server.headers ?? {},
+                headersFromEnv: server.headersFromEnv ?? {},
+                bearerTokenEnvVar: server.bearerTokenEnvVar,
+                enabled: server.enabled !== false,
+            }
+            : {
+                name,
+                transport: 'stdio',
+                command: server.command?.trim() ?? '',
+                args: Array.isArray(server.args) ? server.args.map((arg) => String(arg)) : [],
+                cwd: server.cwd,
+                enabled: server.enabled !== false,
+                ...(server.envIncluded && server.env ? { env: server.env } : {}),
+            };
+        if ((input.transport === 'stdio' && !input.command) ||
+            (input.transport === 'streamable-http' && !input.url)) {
+            continue;
+        }
         const existing = mcp.list().find((item) => item.name.toLowerCase() === name.toLowerCase());
         if (existing)
             mcp.update(existing.id, input);
         else
-            mcp.create({ ...input, env: input.env ?? {} });
+            mcp.create(input);
     }
     return null;
 }

package/dist/local-backend/router.js

@@ -51,6 +51,14 @@ import { matchPackBackendRoute } from './pack-backend-routes.js';
 import { collectTurnFiles } from './turn-files.js';
 import { resolveMentionedPaths } from './mentioned-paths.js';
 import { getAuthProvider } from '../auth/index.js';
+function stringRecord(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        return {};
+    return Object.fromEntries(Object.entries(value).map(([key, item]) => [
+        key,
+        String(item),
+    ]));
+}
 function parseSourceFolders(value) {
     if (!Array.isArray(value))
         return [];
@@ -1140,7 +1148,7 @@ export class LocalBackendRouter {
             const servers = registry.list().map((s) => {
                 const cached = registry.getCachedTools(s.id);
                 return {
-                    ...s,
+                    ...registry.toPublicEntry(s),
                     serverKey: registry.serverKey(s),
                     toolCount: cached?.tools.length ?? 0,
                     toolsPreview: cached?.tools.slice(0, 8).map((t) => t.name) ?? [],
@@ -1156,19 +1164,35 @@ export class LocalBackendRouter {
                 return { status: 503, data: { error: 'MCP 注册表不可用' } };
             try {
                 const payload = this.toRecord(request.body);
-                const entry = registry.create({
-                    name: String(payload.name ?? ''),
-                    command: String(payload.command ?? ''),
-                    args: Array.isArray(payload.args) ? payload.args.map((a) => String(a)) : [],
-                    env: payload.env && typeof payload.env === 'object' && !Array.isArray(payload.env)
-                        ? Object.fromEntries(Object.entries(payload.env).map(([k, v]) => [k, String(v)]))
-                        : {},
-                    cwd: typeof payload.cwd === 'string' ? payload.cwd : undefined,
-                    enabled: payload.enabled !== false,
-                });
+                const entry = payload.transport === 'streamable-http'
+                    ? registry.create({
+                        name: String(payload.name ?? ''),
+                        transport: 'streamable-http',
+                        url: String(payload.url ?? ''),
+                        headers: stringRecord(payload.headers),
+                        headersFromEnv: stringRecord(payload.headersFromEnv),
+                        bearerTokenEnvVar: typeof payload.bearerTokenEnvVar === 'string'
+                            ? payload.bearerTokenEnvVar
+                            : undefined,
+                        reconnect: payload.reconnect &&
+                            typeof payload.reconnect === 'object' &&
+                            !Array.isArray(payload.reconnect)
+                            ? payload.reconnect
+                            : undefined,
+                        enabled: payload.enabled !== false,
+                    })
+                    : registry.create({
+                        name: String(payload.name ?? ''),
+                        transport: 'stdio',
+                        command: String(payload.command ?? ''),
+                        args: Array.isArray(payload.args) ? payload.args.map((a) => String(a)) : [],
+                        env: stringRecord(payload.env),
+                        cwd: typeof payload.cwd === 'string' ? payload.cwd : undefined,
+                        enabled: payload.enabled !== false,
+                    });
                 // 后台拉一次工具列表，下一轮对话即可用；失败不阻塞创建
                 void registry.refreshTools(entry.id).catch(() => { });
-                return { status: 200, data: { server: entry } };
+                return { status: 200, data: { server: registry.toPublicEntry(entry) } };
             }
             catch (err) {
                 return { status: 400, data: { error: err instanceof Error ? err.message : String(err) } };
@@ -1188,7 +1212,7 @@ export class LocalBackendRouter {
                 return {
                     status: 200,
                     data: {
-                        added: result.added,
+                        added: result.added.map((entry) => registry.toPublicEntry(entry)),
                         skipped: result.skipped,
                     },
                 };
@@ -1211,17 +1235,32 @@ export class LocalBackendRouter {
                     const payload = this.toRecord(request.body);
                     const updated = registry.update(serverId, {
                         name: typeof payload.name === 'string' ? payload.name : undefined,
+                        transport: payload.transport === 'stdio' || payload.transport === 'streamable-http'
+                            ? payload.transport
+                            : undefined,
                         command: typeof payload.command === 'string' ? payload.command : undefined,
                         args: Array.isArray(payload.args) ? payload.args.map((a) => String(a)) : undefined,
                         env: payload.env && typeof payload.env === 'object' && !Array.isArray(payload.env)
-                            ? Object.fromEntries(Object.entries(payload.env).map(([k, v]) => [k, String(v)]))
+                            ? stringRecord(payload.env)
                             : undefined,
                         cwd: typeof payload.cwd === 'string' ? payload.cwd : undefined,
+                        url: typeof payload.url === 'string' ? payload.url : undefined,
+                        headers: payload.headers && typeof payload.headers === 'object' && !Array.isArray(payload.headers)
+                            ? stringRecord(payload.headers)
+                            : undefined,
+                        headersFromEnv: payload.headersFromEnv &&
+                            typeof payload.headersFromEnv === 'object' &&
+                            !Array.isArray(payload.headersFromEnv)
+                            ? stringRecord(payload.headersFromEnv)
+                            : undefined,
+                        bearerTokenEnvVar: typeof payload.bearerTokenEnvVar === 'string'
+                            ? payload.bearerTokenEnvVar
+                            : undefined,
                         enabled: typeof payload.enabled === 'boolean' ? payload.enabled : undefined,
                     });
                     if (updated.enabled)
                         void registry.refreshTools(updated.id).catch(() => { });
-                    return { status: 200, data: { server: updated } };
+                    return { status: 200, data: { server: registry.toPublicEntry(updated) } };
                 }
                 catch (err) {
                     return { status: 400, data: { error: err instanceof Error ? err.message : String(err) } };

package/dist/local-executor.d.ts

@@ -1,3 +1,4 @@
+import { type ExecDecisionName, type ExecPolicy, type ShellEndpoint, type ShellProcessBackend } from './shell-exec.js';
 import { type ApplyEditsResult, type EditOp } from './local-edit.js';
 export declare function getWineCommand(): string | null;
 export declare function rewriteExeCommandIfNeeded(command: string): string;
@@ -8,6 +9,10 @@ export interface LocalExecRequest {
     timeout?: number;
     env?: Record<string, string>;
     shell?: ShellType;
+    /** 在伪终端里跑。缺省走管道，调用方要终端语义时显式打开。 */
+    pty?: boolean;
+    /** 用户已经批准一次 prompt 决定。不能放过 forbidden。 */
+    execApproval?: 'allow';
 }
 export interface LocalExecResult {
     success: boolean;
@@ -25,6 +30,14 @@ export interface LocalExecResult {
      * "程序已启动并在运行" 对启动类命令就是成功，不能让 LLM 当失败重试。
      */
     stillRunning?: boolean;
+    /** 前缀策略的决定。forbidden 不启动进程；prompt 在批准前也不启动。 */
+    execDecision?: ExecDecisionName;
+    /** prompt 时为 true，让模型把决定交给用户而不是改写命令重试。 */
+    needsFollowup?: boolean;
+    /** 这次命令跑在本机还是 SSH 对端。 */
+    transport?: 'local' | 'ssh';
+    /** 这次启动是否分配了伪终端。 */
+    pty?: boolean;
 }
 export interface LocalFileReadRequest {
     path: string;
@@ -208,7 +221,14 @@ export declare class LocalExecutor {
      * 重灌此集合（与框架一致：resume 只重建 version 证据，门退化为 CAS）。
      */
     private readonly partialReadPaths;
+    private execPolicy;
+    private shellEndpoint;
+    private shellBackend;
     constructor(maxOutputBytes?: number, applyEditsFn?: ApplyEditsFn);
+    setExecPolicy(policy: ExecPolicy): void;
+    setShellEndpoint(endpoint: ShellEndpoint): void;
+    /** 测试和嵌入方替换真正的进程启动。缺省用本机管道或 PTY。 */
+    setShellBackend(backend: ShellProcessBackend | null): void;
     updateSafetyConfig(config: CommandSafetyConfigPayload): void;
     /**
      * P2b：会话恢复时重灌 read-before-write 证据。sidecar 扫描持久记录里的
@@ -227,6 +247,8 @@ export declare class LocalExecutor {
         osArch: string;
     };
     executeShell(request: LocalExecRequest): Promise<LocalExecResult>;
+    private holdForExecPolicy;
+    private runPlannedShell;
     readLocalFile(request: LocalFileReadRequest, projectRoot?: string | null, additionalReadRoots?: string[] | null): Promise<LocalFileReadResult>;
     writeLocalFile(request: LocalFileWriteRequest, projectRoot?: string | null, additionalWriteRoots?: string[] | null): Promise<LocalFileWriteResult>;
     /**

package/dist/local-executor.js

@@ -7,6 +7,8 @@ import { spawn, execSync } from 'child_process';
 import log from 'electron-log';
 import { constants as fsConstants } from 'fs';
 import { adaptCommandForPowerShell } from './shell-adapt.js';
+import { evaluateExecPolicy, planSshArgv, } from './shell-exec.js';
+import { nodeShellBackend } from './shell-process.js';
 import { applyEdits, EditError } from './local-edit.js';
 // `he` ships as CommonJS and does not expose ESM named exports, so we have to
 // take the default import and destructure at runtime in this ESM module.
@@ -241,6 +243,16 @@ const BUILTIN_DANGEROUS = [
     { id: 'win_del_force', pattern: '\\bdel\\s+\\/f\\s+\\/s\\s+\\/q\\s+[a-z]:\\\\', platform: 'windows' },
     { id: 'win_rd_force', pattern: '\\brd\\s+\\/s\\s+\\/q\\s+[a-z]:\\\\', platform: 'windows' },
 ];
+function stringEnv(extra) {
+    const env = {};
+    for (const [key, value] of Object.entries(process.env)) {
+        if (typeof value === 'string')
+            env[key] = value;
+    }
+    if (extra)
+        Object.assign(env, extra);
+    return env;
+}
 function toWslPath(input) {
     const normalized = input.replace(/\\/g, '/');
     const winDriveMatch = normalized.match(/^([A-Za-z]):\/(.*)$/);
@@ -273,11 +285,24 @@ export class LocalExecutor {
      * 重灌此集合（与框架一致：resume 只重建 version 证据，门退化为 CAS）。
      */
     partialReadPaths = new Set();
+    execPolicy = { rules: [] };
+    shellEndpoint = { kind: 'local' };
+    shellBackend = null;
     constructor(maxOutputBytes = DEFAULT_MAX_OUTPUT_BYTES, applyEditsFn = applyEdits) {
         this.maxOutputBytes = maxOutputBytes;
         this.applyEditsFn = applyEditsFn;
         this.defaultShell = this.computeDefaultShell();
     }
+    setExecPolicy(policy) {
+        this.execPolicy = policy;
+    }
+    setShellEndpoint(endpoint) {
+        this.shellEndpoint = endpoint;
+    }
+    /** 测试和嵌入方替换真正的进程启动。缺省用本机管道或 PTY。 */
+    setShellBackend(backend) {
+        this.shellBackend = backend;
+    }
     updateSafetyConfig(config) {
         const disabled = new Set(config.disabledPatternIds);
         const isWin = process.platform === 'win32';
@@ -355,8 +380,12 @@ export class LocalExecutor {
             if (dangerousReason) {
                 return { success: false, error: `Blocked dangerous command: ${dangerousReason}` };
             }
+            const held = this.holdForExecPolicy(command, request);
+            if (held)
+                return held;
+            const useSsh = this.shellEndpoint.kind === 'ssh';
             const resolvedShell = this.resolveShell(request.shell);
-            if (resolvedShell.type === 'powershell') {
+            if (!useSsh && resolvedShell.type === 'powershell') {
                 // LLM 经常混写 cmd / bash 方言（&&、||、%VAR%）；Windows PowerShell 5.1
                 // 不支持这些语法，执行前做确定性转换，避免整条命令直接报解析错误。
                 const adapted = adaptCommandForPowerShell(command);
@@ -382,6 +411,17 @@ export class LocalExecutor {
             const timeout = Math.max(1000, rawTimeout);
             const cwd = this.resolveCwd(request.cwd, resolvedShell.type);
             const env = { ...process.env, ...(request.env || {}) };
+            if (this.shellBackend || useSsh || request.pty) {
+                return await this.runPlannedShell({
+                    command,
+                    request,
+                    resolvedShell,
+                    useSsh,
+                    guiCommand,
+                    timeout,
+                    cwd,
+                });
+            }
             const stdoutChunks = [];
             const stderrChunks = [];
             let stdoutBytes = 0;
@@ -486,6 +526,83 @@ export class LocalExecutor {
             return { success: false, error: message, platform: process.platform };
         }
     }
+    holdForExecPolicy(command, request) {
+        const evaluation = evaluateExecPolicy(command, this.execPolicy);
+        if (evaluation.decision === 'allow')
+            return null;
+        if (evaluation.decision === 'prompt' && request.execApproval === 'allow')
+            return null;
+        const shown = evaluation.command.join(' ');
+        const why = evaluation.rule?.justification ? ` (${evaluation.rule.justification})` : '';
+        if (evaluation.decision === 'forbidden') {
+            return {
+                success: false,
+                error: `exec policy forbids: ${shown}${why}`,
+                execDecision: 'forbidden',
+                platform: process.platform,
+            };
+        }
+        return {
+            success: false,
+            error: `exec policy requires approval: ${shown}${why}`,
+            execDecision: 'prompt',
+            needsFollowup: true,
+            platform: process.platform,
+        };
+    }
+    async runPlannedShell(input) {
+        const pty = input.request.pty === true;
+        const spec = input.useSsh
+            ? planSshArgv({
+                command: input.command,
+                cwd: input.request.cwd ? input.cwd : undefined,
+                pty,
+                shell: input.resolvedShell.type === 'powershell' ? 'powershell' : undefined,
+                endpoint: this.shellEndpoint,
+            })
+            : {
+                file: input.resolvedShell.shell,
+                args: [...input.resolvedShell.args, input.command],
+                cwd: input.cwd,
+                env: stringEnv(input.request.env),
+                pty,
+                transport: 'local',
+            };
+        if (input.useSsh) {
+            spec.cwd = os.homedir();
+            spec.env = stringEnv();
+        }
+        const backend = this.shellBackend ?? nodeShellBackend;
+        const outcome = await backend.run(spec, {
+            timeoutMs: input.timeout,
+            maxOutputBytes: this.maxOutputBytes,
+            gui: input.guiCommand,
+        });
+        const launched = outcome.stillRunning === true;
+        return {
+            success: launched || (!outcome.error && outcome.exitCode === 0),
+            stdout: launched
+                ? `${outcome.stdout}\n[GUI 程序已启动，仍在运行（等待 ${input.timeout}ms 后未退出，进程未被终止）。请在打开的界面中继续操作；不要重新执行同一条启动命令。]`
+                : outcome.stdout,
+            stderr: outcome.stderr,
+            exitCode: outcome.exitCode,
+            error: launched
+                ? undefined
+                : outcome.timedOut
+                    ? `Command timed out after ${input.timeout}ms (shell terminated; a launched GUI app may still be running). ` +
+                        'DO NOT blindly re-run the same launch command — if this launched a GUI/long-running program, ' +
+                        'first check whether it is already running, or re-run with a larger `timeout`, ' +
+                        'or start it detached (e.g. PowerShell Start-Process) so it does not block.'
+                    : outcome.error,
+            truncated: outcome.truncated,
+            timedOut: outcome.timedOut,
+            stillRunning: outcome.stillRunning,
+            shell: input.resolvedShell.type,
+            platform: process.platform,
+            transport: spec.transport,
+            pty: spec.pty,
+        };
+    }
     async readLocalFile(request, projectRoot, additionalReadRoots) {
         try {
             const filePath = this.resolvePath(request.path);

package/dist/mcp-executor.d.ts

@@ -1,13 +1,35 @@
+import { type StreamableHTTPReconnectionOptions } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
+export declare const MAX_MCP_SERVER_TOOLS = 64;
 /**
  * 给超时类错误追加可操作的排查提示。独立成纯函数便于单测。
  */
 export declare function withMcpTroubleshootHint(message: string): string;
-export interface McpServerConfig {
+export interface StdioMcpServerConfig {
+    transport: 'stdio';
     command: string;
     args?: string[];
     env?: Record<string, string>;
     cwd?: string;
 }
+export interface StreamableHttpMcpServerConfig {
+    transport: 'streamable-http';
+    url: string;
+    /** Non-sensitive literal headers. Authorization must come from an env reference. */
+    headers?: Record<string, string>;
+    /** Header name -> environment variable name. */
+    headersFromEnv?: Record<string, string>;
+    bearerTokenEnvVar?: string;
+    reconnect?: Partial<StreamableHTTPReconnectionOptions>;
+}
+export type McpServerConfig = StdioMcpServerConfig | StreamableHttpMcpServerConfig;
+export type LegacyMcpServerConfig = Omit<StdioMcpServerConfig, 'transport'>;
+export interface ListedTool {
+    name: string;
+    description: string;
+    inputSchema?: unknown;
+}
+export declare function resolveHttpHeaders(config: StreamableHttpMcpServerConfig, env?: Record<string, string | undefined>): Record<string, string>;
+export declare function mcpConfigKey(rawConfig: McpServerConfig | LegacyMcpServerConfig, env?: Record<string, string | undefined>): string;
 /**
  * Pure eviction predicate, split out so it's unit-testable without spinning
  * up a real MCP child process (`McpExecutor` isn't otherwise exported —
@@ -17,29 +39,39 @@ export declare function shouldEvictMcpConnection(entry: {
     lastUsed: number;
     inflight: number;
 }, now: number, idleTimeoutMs: number): boolean;
-declare class McpExecutor {
+export interface McpExecutorLike {
+    executeTool(config: McpServerConfig | LegacyMcpServerConfig, toolName: string, toolArgs: Record<string, unknown>): Promise<{
+        success: boolean;
+        text?: string;
+        error?: string;
+    }>;
+    listTools(config: McpServerConfig | LegacyMcpServerConfig, onChanged?: (tools: ListedTool[]) => void, onUnavailable?: (error: string) => void): Promise<{
+        success: boolean;
+        tools?: ListedTool[];
+        error?: string;
+    }>;
+}
+export declare class McpExecutor implements McpExecutorLike {
     private pool;
     private cleanupTimer;
     constructor();
-    executeTool(config: McpServerConfig, toolName: string, toolArgs: Record<string, unknown>): Promise<{
+    executeTool(rawConfig: McpServerConfig | LegacyMcpServerConfig, toolName: string, toolArgs: Record<string, unknown>): Promise<{
         success: boolean;
         text?: string;
         error?: string;
     }>;
-    listTools(config: McpServerConfig): Promise<{
+    listTools(rawConfig: McpServerConfig | LegacyMcpServerConfig, onChanged?: (tools: ListedTool[]) => void, onUnavailable?: (error: string) => void): Promise<{
         success: boolean;
-        tools?: {
-            name: string;
-            description: string;
-            inputSchema?: unknown;
-        }[];
+        tools?: ListedTool[];
         error?: string;
     }>;
     private getOrCreate;
+    private createTransport;
+    private refreshEntryTools;
+    private fetchEntryTools;
     private closeEntry;
     /** 关闭连接池中的所有连接（应用退出 / 测试收尾时调用）。 */
     shutdownAll(): Promise<void>;
     private evictIdle;
 }
 export declare const mcpExecutor: McpExecutor;
-export {};