@steerable/agent-shell 0.6.48 → 0.6.50

package/dist/sidecar/supervisor.js

@@ -25,8 +25,6 @@ const READY_PREFIX = '__SIDECAR_READY__:';
 const DEFAULT_BOOT_TIMEOUT_MS = 15_000;
 const DEFAULT_HEALTH_INTERVAL_MS = 5_000;
 const DEFAULT_RESTART_AFTER_FAILED_PINGS = 3;
-export const RUST_SIDECAR_ENV = 'STEERABLE_RUST_SIDECAR';
-export const RUST_SIDECAR_BIN_ENV = 'STEERABLE_RUST_SIDECAR_BIN';
 // Only /usr/bin/sandbox-exec is trusted — a PATH-relative lookup could
 // resolve to an attacker-planted binary (codex's rule).
 const SEATBELT_EXECUTABLE = '/usr/bin/sandbox-exec';
@@ -384,23 +382,10 @@ export class SidecarSupervisor extends EventEmitter {
     // Internal: boot
     // ------------------------------------------------------------------
     async boot() {
-        const useRustSidecar = rustSidecarEnabled();
-        const rustBin = useRustSidecar
-            ? resolveRustSidecarBin(this.options.rustSidecarBin)
-            : undefined;
-        let spawnPlan;
-        if (rustBin) {
-            spawnPlan = await this.resolveSandboxedSpawn(rustBin, this.options.args ?? []);
-        }
-        else if (useRustSidecar) {
-            throw new Error('STEERABLE_RUST_SIDECAR is enabled but the Rust sidecar binary is missing');
-        }
-        else {
-            const py = this.resolvePythonBinary();
-            const entry = this.options.entryModule ?? 'steerable_sidecar';
-            const args = ['-m', entry, ...(this.options.args ?? [])];
-            spawnPlan = await this.resolveSandboxedSpawn(py, args);
-        }
+        const py = this.resolvePythonBinary();
+        const entry = this.options.entryModule ?? 'steerable_sidecar';
+        const args = ['-m', entry, ...(this.options.args ?? [])];
+        const spawnPlan = await this.resolveSandboxedSpawn(py, args);
         // Profile generation is asynchronous. A quit can begin while it runs;
         // never spawn a new child after shutdown has claimed the supervisor.
         if (this.shuttingDown) {
@@ -502,12 +487,7 @@ export class SidecarSupervisor extends EventEmitter {
                 ...(webEgress ? ['--allow-web-egress'] : []),
                 ...(allowResolver ? ['--allow-resolver'] : []),
             ];
-            const rustBin = rustSidecarEnabled()
-                ? resolveRustSidecarBin(this.options.rustSidecarBin)
-                : undefined;
-            const { stdout } = rustBin
-                ? await execFileAsync(rustBin, ['sandbox', 'profile', ...flags], { timeout: 10_000 })
-                : await execFileAsync(command, ['-m', 'steerable_sidecar.sandbox', 'profile', ...flags], { timeout: 10_000 });
+            const { stdout } = await execFileAsync(command, ['-m', 'steerable_sidecar.sandbox', 'profile', ...flags], { timeout: 10_000 });
             const profile = stdout.trim();
             if (!profile.includes('(deny default)')) {
                 throw new Error('generated profile is not a Seatbelt policy');
@@ -552,29 +532,17 @@ export class SidecarSupervisor extends EventEmitter {
         // 都透传环境）+ sidecar 应用层域名名单强制，网络命名空间保持共享。
         // 这里如实记录，不假装接上了实际不强制的参数。
         const egressViaProxy = this.options.env?.STEERABLE_EGRESS_CONFINED === '1';
-        const rustBin = rustSidecarEnabled()
-            ? resolveRustSidecarBin(this.options.rustSidecarBin)
-            : undefined;
-        const wrapArgs = rustBin
-            ? [
-                'sandbox',
-                'linux-wrap',
-                ...writableRoots.flatMap((root) => ['--writable-root', root]),
-                '--',
-                command,
-                ...args,
-            ]
-            : [
-                '-m',
-                'steerable_sidecar.sandbox',
-                'linux-wrap',
-                ...writableRoots.flatMap((root) => ['--writable-root', root]),
-                '--',
-                command,
-                ...args,
-            ];
+        const wrapArgs = [
+            '-m',
+            'steerable_sidecar.sandbox',
+            'linux-wrap',
+            ...writableRoots.flatMap((root) => ['--writable-root', root]),
+            '--',
+            command,
+            ...args,
+        ];
         try {
-            const { stdout } = await execFileAsync(rustBin ?? command, wrapArgs, { timeout: 15_000 });
+            const { stdout } = await execFileAsync(command, wrapArgs, { timeout: 15_000 });
             const plan = JSON.parse(stdout.trim());
             if (!Array.isArray(plan.argv) || plan.argv.length < 1 || typeof plan.argv[0] !== 'string') {
                 throw new Error('linux-wrap did not return an argv');
@@ -976,49 +944,5 @@ export function resolveSidecarPython(pythonExecutable) {
         if (existsSync(candidate))
             return candidate;
     }
-    // Fallback to system python (developer machines).
-    return process.platform === 'win32' ? 'python' : 'python3';
-}
-function envFlag(name) {
-    const raw = (process.env[name] ?? '').trim().toLowerCase();
-    return raw === '1' || raw === 'true' || raw === 'yes' || raw === 'on';
-}
-export function rustSidecarEnabled() {
-    if ((process.env[RUST_SIDECAR_ENV] ?? '').trim()) {
-        return envFlag(RUST_SIDECAR_ENV);
-    }
-    return resolveRustSidecarBin() !== undefined;
-}
-/**
- * Resolve the Rust sidecar binary from an explicit path, a packaged engine,
- * or a framework source checkout. Boot fails when Rust was explicitly
- * enabled but no binary resolves.
- */
-export function resolveRustSidecarBin(explicit) {
-    if (explicit) {
-        return existsSync(explicit) ? explicit : undefined;
-    }
-    const fromEnv = process.env[RUST_SIDECAR_BIN_ENV];
-    if (fromEnv) {
-        return existsSync(fromEnv) ? fromEnv : undefined;
-    }
-    const exe = process.platform === 'win32' ? 'steerable-sidecar.exe' : 'steerable-sidecar';
-    const resourcesPath = process.resourcesPath;
-    if (resourcesPath) {
-        const packaged = join(resourcesPath, 'engine', exe);
-        if (existsSync(packaged))
-            return packaged;
-    }
-    const relatives = [
-        join('..', '..', '..', '..', 'sidecar', 'rs', 'target', 'debug', exe),
-        join('..', '..', '..', '..', '..', 'sidecar', 'rs', 'target', 'debug', exe),
-        join('..', '..', '..', '..', 'sidecar', 'rs', 'target', 'release', exe),
-        join('..', '..', '..', '..', '..', 'sidecar', 'rs', 'target', 'release', exe),
-    ];
-    for (const rel of relatives) {
-        const candidate = join(__dirname, rel);
-        if (existsSync(candidate))
-            return candidate;
-    }
-    return undefined;
+    throw new Error('portable Python sidecar runtime not found; prepare python-runtime or set STEERABLE_SIDECAR_PYTHON');
 }

package/dist/sidecar/types.d.ts

@@ -21,8 +21,6 @@ export interface SidecarSandboxPosture {
 export interface SidecarStartOptions {
     /** Override the python binary; defaults to the bundled portable runtime. */
     pythonExecutable?: string;
-    /** Optional Rust sidecar binary; used when STEERABLE_RUST_SIDECAR is on. */
-    rustSidecarBin?: string;
     /** Override the entrypoint module; defaults to ``steerable_sidecar``. */
     entryModule?: string;
     /** Extra arguments appended after ``-m <entryModule>``. */

package/dist/tool-router.d.ts

@@ -76,7 +76,13 @@ export declare const WEB_TOOL_RPC_TIMEOUT_MS = 130000;
  * 由 PluginRegistry 背书。宿主只持 schema 并经此 delegate 直调——与 web 工具
  * 不同，这些是普通 RPC 而非 tool.invoke（不经过模型工具分发层）。
  */
-export type PluginRpcDelegate = (method: 'plugin.list' | 'plugin.enable' | 'plugin.disable' | 'plugin.reload', params?: Record<string, unknown>) => Promise<unknown>;
+export type PluginRpcDelegate = (method: 'plugin.list' | 'plugin.enable' | 'plugin.disable' | 'plugin.reload' | 'plugin.tools.describe', params?: Record<string, unknown>) => Promise<unknown>;
+/**
+ * 插件自带工具的执行缝：唯一实现在 sidecar 的插件路由上，宿主只持
+ * `plugin.tools.describe` 给出的 schema，调用经 `tool.invoke` 前转（与 web
+ * 工具同一模式）。审批已在 sidecar CoreLoop 的 ApprovalExecutor 完成。
+ */
+export type PluginToolDelegate = (name: string, args: Record<string, unknown>) => Promise<unknown>;
 /**
  * 本机是否提供网络读取工具（`STEERABLE_WEB_TOOLS=0` 关闭）。
  *
@@ -142,7 +148,18 @@ export declare class ToolRouter {
      * plugin_* 工具一个 schema 都不出——模型看不到不可用的工具。
      */
     private pluginRpc;
-    setPluginRpc(delegate: PluginRpcDelegate | null): void;
+    private pluginToolInvoke;
+    /** 已启用插件的工具（名字 → schema），由 refreshPluginTools 从 sidecar 同步。 */
+    private pluginToolSchemas;
+    setPluginRpc(delegate: PluginRpcDelegate | null, invokeTool?: PluginToolDelegate | null): void;
+    private pluginToolsEnabled;
+    /**
+     * 从 sidecar 拉取已启用插件的工具描述，替换宿主侧的插件工具集。
+     * 启动握手后和每次 plugin_enable / plugin_disable / plugin_reload 成功后
+     * 调用，保证模型看到的集合与 sidecar 路由上可分发的集合一致。
+     * 与内置 / 场景包工具重名的插件工具被跳过并告警——内置工具优先。
+     */
+    refreshPluginTools(): Promise<void>;
     listSchemas(): ToolSchema[];
     /**
      * 插件生命周期工具（框架 plugin.* RPC 的模型面）。全在 deferred 层：

package/dist/tool-router.js

@@ -6,6 +6,7 @@ import { rankTools, resolveMaxResults, TOOL_SEARCH_DEFAULT_MAX_RESULTS, } from '
 import { maybeAutoInstallWrittenSkill } from './local-backend/skill-install.js';
 import { filterToolsByPolicy, isToolAllowed, } from './local-backend/agent-capability.js';
 import { processViewImage } from './image-attachment.js';
+import { PRESENT_FILES_SCHEMA, PRESENT_FILES_TOOL_NAME, executePresentFiles, } from './present-files.js';
 import { isHostToolCapabilityEnabled } from './host-tools.js';
 import { getResolvedHostTools } from './host-tools-runtime.js';
 /** 已注册 MCP 服务的动态工具名前缀：`mcp__<serverKey>__<toolName>`。 */
@@ -22,6 +23,7 @@ export const MCP_DYNAMIC_TOOL_PREFIX = 'mcp__';
 export const TOOL_SEARCH_TOOL_NAME = 'tool_search';
 /** 前转 RPC 超时：sidecar 侧单次请求上限默认 30s（可配到 600s），这里给足余量。 */
 export const WEB_TOOL_RPC_TIMEOUT_MS = 130_000;
+const PLUGIN_TOOL_MODES = new Set(['read', 'safe_write', 'destructive']);
 /**
  * 本机是否提供网络读取工具（`STEERABLE_WEB_TOOLS=0` 关闭）。
  *
@@ -107,8 +109,52 @@ export class ToolRouter {
      * plugin_* 工具一个 schema 都不出——模型看不到不可用的工具。
      */
     pluginRpc = null;
-    setPluginRpc(delegate) {
+    pluginToolInvoke = null;
+    /** 已启用插件的工具（名字 → schema），由 refreshPluginTools 从 sidecar 同步。 */
+    pluginToolSchemas = new Map();
+    setPluginRpc(delegate, invokeTool = null) {
         this.pluginRpc = delegate;
+        this.pluginToolInvoke = delegate ? invokeTool : null;
+        if (!delegate)
+            this.pluginToolSchemas = new Map();
+    }
+    pluginToolsEnabled() {
+        return getResolvedHostTools().plugins.capability;
+    }
+    /**
+     * 从 sidecar 拉取已启用插件的工具描述，替换宿主侧的插件工具集。
+     * 启动握手后和每次 plugin_enable / plugin_disable / plugin_reload 成功后
+     * 调用，保证模型看到的集合与 sidecar 路由上可分发的集合一致。
+     * 与内置 / 场景包工具重名的插件工具被跳过并告警——内置工具优先。
+     */
+    async refreshPluginTools() {
+        if (!this.pluginRpc || !this.pluginToolInvoke) {
+            this.pluginToolSchemas = new Map();
+            return;
+        }
+        const result = (await this.pluginRpc('plugin.tools.describe'));
+        this.pluginToolSchemas = new Map();
+        const taken = new Set(this.listSchemas().map((s) => s.name));
+        const next = new Map();
+        for (const tool of result?.tools ?? []) {
+            if (!tool || typeof tool.name !== 'string' || !tool.name)
+                continue;
+            if (taken.has(tool.name)) {
+                console.warn(`[tool-router] plugin tool ${tool.name} (${tool.plugin ?? 'unknown plugin'}) shadows a host tool; skipped`);
+                continue;
+            }
+            const owner = tool.plugin ? `[plugin:${tool.plugin}] ` : '';
+            next.set(tool.name, {
+                name: tool.name,
+                description: `${owner}${tool.description || tool.name}`,
+                inputSchema: tool.schema && typeof tool.schema === 'object'
+                    ? tool.schema
+                    : { type: 'object', properties: {} },
+                mode: (tool.mode && PLUGIN_TOOL_MODES.has(tool.mode) ? tool.mode : 'external'),
+                exposure: 'deferred',
+            });
+        }
+        this.pluginToolSchemas = next;
     }
     listSchemas() {
         return [
@@ -240,6 +286,7 @@ export class ToolRouter {
                     required: ['path', 'edits'],
                 },
             },
+            PRESENT_FILES_SCHEMA,
             {
                 name: 'local_open_path',
                 description: 'Open local path or URL',
@@ -374,6 +421,9 @@ export class ToolRouter {
             ...this.listWebToolSchemas(),
             ...this.listRegisteredMcpToolSchemas(),
             ...this.listPluginToolSchemas(),
+            // 插件自带的工具：与 MCP 动态工具同在 deferred 层，经 tool_search 发现。
+            // 名字不带族前缀，按名归族会漏过 plugins 能力开关，这里显式判定。
+            ...(this.pluginToolsEnabled() ? this.pluginToolSchemas.values() : []),
             // ─── 场景包贡献的工具（0.3a 开槽） ─────────────────
             ...[...this.contributedTools.values()].map((c) => ({
                 name: c.name,
@@ -747,6 +797,8 @@ export class ToolRouter {
                 this.autoInstallSkillOnSuccess(edited, args.path);
                 return edited;
             }
+            case PRESENT_FILES_TOOL_NAME:
+                return await executePresentFiles(args, projectRoot);
             case 'local_open_path':
                 return await this.localExecutor.openLocalTarget({
                     target: String(args.target || ''),
@@ -802,7 +854,10 @@ export class ToolRouter {
                 }
                 const method = call.name.replace('_', '.');
                 const params = call.name === 'plugin_list' ? undefined : { name: String(args.name || '') };
-                return await this.pluginRpc(method, params);
+                const result = await this.pluginRpc(method, params);
+                if (call.name !== 'plugin_list')
+                    await this.refreshPluginTools();
+                return result;
             }
             case 'task_run': {
                 const chatId = this.requireTaskContext(context);
@@ -857,6 +912,12 @@ export class ToolRouter {
                 if (contributed) {
                     return await contributed.handler(args, context ?? {});
                 }
+                if (this.pluginToolSchemas.has(call.name) && this.pluginToolInvoke) {
+                    if (!this.pluginToolsEnabled()) {
+                        throw new Error(`工具 ${call.name} 未在本产品引入`);
+                    }
+                    return await this.pluginToolInvoke(call.name, args);
+                }
                 return { success: false, error: `Unknown tool: ${call.name}` };
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steerable/agent-shell",
-  "version": "0.6.48",
+  "version": "0.6.50",
   "description": "Steerable framework — product-neutral Node HostRuntime and headless HTTP server shared by Tauri desktop and browser deployments; scenario packs extend it through @steerable/pack-sdk.",
   "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/agent-harness": "0.6.48",
-    "@steerable/pack-sdk": "0.6.48",
-    "@steerable/agent-protocol": "0.6.48"
+    "@steerable/agent-harness": "0.6.50",
+    "@steerable/pack-sdk": "0.6.50",
+    "@steerable/agent-protocol": "0.6.50"
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.13",