@steerable/agent-shell 0.6.56 → 0.6.58

package/dist/cli-install.d.ts

@@ -0,0 +1,27 @@
+/**
+ * 把产品命令行包装脚本写进用户 PATH 里一个可写的目录。
+ * 桌面安装包里的入口是 products/<bin>/cli.js；仓库里优先用 cli.mjs。
+ */
+export interface CliInstallResult {
+    path: string;
+    onPath: boolean;
+}
+export interface CliInstallLinkInput {
+    binName: string;
+    scriptPath: string;
+    nodePath: string;
+    home: string;
+    pathEnv: string;
+    platform: NodeJS.Platform;
+    exists(target: string): boolean;
+    canWrite(dir: string): boolean;
+    mkdir(dir: string): void;
+    writeFile(file: string, contents: string): void;
+    chmod(file: string, mode: number): void;
+}
+/** 在应用根下找命令行入口。 */
+export declare function resolveCliScript(appRoot: string, binName: string, exists: (target: string) => boolean): string | null;
+/** 写包装脚本。目录选用户主目录下、已经在 PATH 里、并且可写的那个。 */
+export declare function installCliLink(input: CliInstallLinkInput): CliInstallResult;
+/** 把名为 `binName` 的产品命令安装到 PATH。调用方传入命令名。 */
+export declare function installProductCli(binName: string): CliInstallResult;

package/dist/cli-install.js

@@ -0,0 +1,105 @@
+/**
+ * 把产品命令行包装脚本写进用户 PATH 里一个可写的目录。
+ * 桌面安装包里的入口是 products/<bin>/cli.js；仓库里优先用 cli.mjs。
+ */
+import { accessSync, chmodSync, constants, existsSync, mkdirSync, writeFileSync } from 'node:fs';
+import { homedir } from 'node:os';
+import path from 'node:path';
+import { getAppRootDir } from './runtime.js';
+/** 在应用根下找命令行入口。 */
+export function resolveCliScript(appRoot, binName, exists) {
+    const candidates = [
+        path.join(appRoot, 'products', binName, 'cli.mjs'),
+        path.join(appRoot, 'products', binName, 'cli.js'),
+        path.join(appRoot, 'dist', 'products', binName, 'cli.js'),
+    ];
+    return candidates.find((candidate) => exists(candidate)) ?? null;
+}
+/** 写包装脚本。目录选用户主目录下、已经在 PATH 里、并且可写的那个。 */
+export function installCliLink(input) {
+    if (input.binName.includes('/') || input.binName.includes('\\')) {
+        throw new Error(`command name "${input.binName}" cannot contain a path separator`);
+    }
+    const pathApi = input.platform === 'win32' ? path.win32 : path.posix;
+    const delimiter = input.platform === 'win32' ? ';' : ':';
+    const pathDirs = input.pathEnv.split(delimiter).filter((dir) => dir.length > 0);
+    const preferred = [
+        pathApi.join(input.home, '.local', 'bin'),
+        pathApi.join(input.home, 'bin'),
+    ];
+    const ordered = [];
+    const seen = new Set();
+    const push = (dir, onPath) => {
+        if (seen.has(dir))
+            return;
+        seen.add(dir);
+        ordered.push({ dir, onPath });
+    };
+    for (const dir of preferred) {
+        if (pathDirs.includes(dir))
+            push(dir, true);
+    }
+    for (const dir of pathDirs) {
+        if (dir === input.home || dir.startsWith(input.home + pathApi.sep))
+            push(dir, true);
+    }
+    push(preferred[0], pathDirs.includes(preferred[0]));
+    const chosen = ordered.find((entry) => input.canWrite(entry.dir));
+    if (!chosen) {
+        throw new Error('no writable directory on PATH under the home directory');
+    }
+    if (!input.exists(chosen.dir))
+        input.mkdir(chosen.dir);
+    const fileName = input.platform === 'win32' ? `${input.binName}.cmd` : input.binName;
+    const file = pathApi.join(chosen.dir, fileName);
+    const contents = input.platform === 'win32'
+        ? `@echo off\r\n${quoteCmd(input.nodePath)} ${quoteCmd(input.scriptPath)} %*\r\n`
+        : `#!/bin/sh\nexec ${quoteShell(input.nodePath)} ${quoteShell(input.scriptPath)} "$@"\n`;
+    input.writeFile(file, contents);
+    if (input.platform !== 'win32')
+        input.chmod(file, 0o755);
+    return { path: file, onPath: chosen.onPath };
+}
+/** 把名为 `binName` 的产品命令安装到 PATH。调用方传入命令名。 */
+export function installProductCli(binName) {
+    const name = binName.trim();
+    if (!name)
+        throw new Error('This product has no command-line name.');
+    const scriptPath = resolveCliScript(getAppRootDir(), name, existsSync);
+    if (!scriptPath)
+        throw new Error('The command-line tool is not included in this installation.');
+    return installCliLink({
+        binName: name,
+        scriptPath,
+        nodePath: process.execPath,
+        home: homedir(),
+        pathEnv: process.env.PATH ?? '',
+        platform: process.platform,
+        exists: existsSync,
+        canWrite: canWriteDir,
+        mkdir: (dir) => mkdirSync(dir, { recursive: true }),
+        writeFile: (file, contents) => writeFileSync(file, contents, 'utf8'),
+        chmod: (file, mode) => chmodSync(file, mode),
+    });
+}
+function canWriteDir(dir) {
+    try {
+        if (existsSync(dir)) {
+            accessSync(dir, constants.W_OK);
+            return true;
+        }
+        accessSync(path.dirname(dir), constants.W_OK);
+        return true;
+    }
+    catch (error) {
+        // 目录或其父目录不可写。
+        void error;
+        return false;
+    }
+}
+function quoteShell(value) {
+    return `'${value.replaceAll("'", "'\\''")}'`;
+}
+function quoteCmd(value) {
+    return `"${value.replaceAll('"', '""')}"`;
+}

package/dist/goal-store.js

@@ -4,9 +4,11 @@
  * 修订号做乐观并发：update_goal 必须带上一次读到的 revision。
  */
 import { randomUUID } from 'node:crypto';
-import { mkdir, readFile, writeFile } from 'node:fs/promises';
+import { mkdir, readFile, rename, writeFile } from 'node:fs/promises';
 import path from 'node:path';
 import { getUserDataDir } from './runtime.js';
+import { fileLockPath } from './storage/process-locks.js';
+import { acquireWriteLease } from './storage/write-lease.js';
 export const GOAL_ACTIONS = [
     'edit',
     'pause',
@@ -87,7 +89,16 @@ export class GoalStore {
         });
     }
     queue(fn) {
-        const run = this.pending.then(fn, fn);
+        const runLocked = async () => {
+            const lease = acquireWriteLease(fileLockPath(getUserDataDir(), 'goals'), 5_000);
+            try {
+                return await fn();
+            }
+            finally {
+                lease.release();
+            }
+        };
+        const run = this.pending.then(runLocked, runLocked);
         this.pending = run.then(() => undefined, () => undefined);
         return run;
     }
@@ -111,7 +122,9 @@ export class GoalStore {
     }
     async write(data) {
         await mkdir(path.dirname(this.filePath), { recursive: true });
-        await writeFile(this.filePath, `${JSON.stringify(data, null, 2)}\n`, 'utf8');
+        const tmp = `${this.filePath}.${process.pid}.tmp`;
+        await writeFile(tmp, `${JSON.stringify(data, null, 2)}\n`, 'utf8');
+        await rename(tmp, this.filePath);
     }
 }
 function applyAction(current, action, objective, reason) {

package/dist/host/http-routes.d.ts

@@ -10,6 +10,14 @@ import type { HttpRouteContribution, HttpRouteRequest } from '../scenario/pack.j
 export type { HttpRouteContribution, HttpRouteRequest };
 /** 注册包 HTTP 路由；路径越出包前缀直接抛错（组装期失败，不进运行时）。 */
 export declare function registerPackHttpRoutes(packId: string, routes: readonly HttpRouteContribution[]): void;
+/**
+ * 进程内路由器调用包的 `/host/<packId>/*` 路由。
+ * 处理器直接返回数据，这里包成 `{ status, data }`。
+ */
+export declare function invokePackHttpRoute(method: string, pathname: string, body: unknown): Promise<{
+    status: number;
+    data: unknown;
+} | null>;
 /** 测试钩子：清空注册表。 */
 export declare function resetPackHttpRoutes(): void;
 /**

package/dist/host/http-routes.js

@@ -16,9 +16,27 @@ function assertPackRoutePath(packId, path) {
 export function registerPackHttpRoutes(packId, routes) {
     for (const route of routes) {
         assertPackRoutePath(packId, route.path);
+        const already = packHttpRoutes.some((existing) => existing.method === route.method && existing.path === route.path);
+        if (already)
+            continue;
         packHttpRoutes.push(route);
     }
 }
+/**
+ * 进程内路由器调用包的 `/host/<packId>/*` 路由。
+ * 处理器直接返回数据，这里包成 `{ status, data }`。
+ */
+export async function invokePackHttpRoute(method, pathname, body) {
+    const match = matchPackHttpRoute(method, pathname);
+    if (!match)
+        return null;
+    const data = await match.route.handler({
+        params: match.params,
+        query: {},
+        body,
+    });
+    return { status: 200, data };
+}
 /** 测试钩子：清空注册表。 */
 export function resetPackHttpRoutes() {
     packHttpRoutes.length = 0;

package/dist/host/pack-cli.d.ts

@@ -0,0 +1,19 @@
+/**
+ * 包命令行注册表。产品组装根在启动 CLI 前注册；agent-cli 在内置命令之后分发。
+ * 注册发生在 import 期或 createCli 的当次调用，不依赖宿主装配。
+ */
+import type { CliCommandSpec } from '../scenario/pack.js';
+export type { CliCommandSpec };
+/** 名字必须是小写命令，且不能占用内置命令。 */
+export declare function assertPackCliCommandName(name: string): void;
+/** 注册一个包的命令。同包或同名重复注册抛错。 */
+export declare function registerPackCliCommands(packId: string, commands: readonly CliCommandSpec[]): void;
+/** 已注册命令，按注册序。 */
+export declare function listPackCliCommands(): readonly CliCommandSpec[];
+/**
+ * 合并注册表和本次调用额外传入的命令。额外命令不写入注册表，
+ * 所以 createCli 可以重复调用。
+ */
+export declare function collectPackCliCommands(extra?: readonly CliCommandSpec[]): CliCommandSpec[];
+/** 测试钩子。 */
+export declare function resetPackCliCommands(): void;

package/dist/host/pack-cli.js

@@ -0,0 +1,56 @@
+/**
+ * 包命令行注册表。产品组装根在启动 CLI 前注册；agent-cli 在内置命令之后分发。
+ * 注册发生在 import 期或 createCli 的当次调用，不依赖宿主装配。
+ */
+const RESERVED = new Set(['run', 'chat', 'skills', 'mcp', 'config', 'doctor', 'tui']);
+const NAME = /^[a-z][a-z0-9-]*$/;
+const byPack = new Map();
+/** 名字必须是小写命令，且不能占用内置命令。 */
+export function assertPackCliCommandName(name) {
+    if (!NAME.test(name)) {
+        throw new Error(`[pack-cli] command name "${name}" must match ${NAME}`);
+    }
+    if (RESERVED.has(name)) {
+        throw new Error(`[pack-cli] command "${name}" is reserved`);
+    }
+}
+/** 注册一个包的命令。同包或同名重复注册抛错。 */
+export function registerPackCliCommands(packId, commands) {
+    if (byPack.has(packId)) {
+        throw new Error(`[pack-cli] duplicate registration for pack: ${packId}`);
+    }
+    const taken = new Set(listPackCliCommands().map((command) => command.name));
+    for (const command of commands) {
+        assertPackCliCommandName(command.name);
+        if (taken.has(command.name)) {
+            throw new Error(`[pack-cli] duplicate command: ${command.name}`);
+        }
+        taken.add(command.name);
+    }
+    byPack.set(packId, commands);
+}
+/** 已注册命令，按注册序。 */
+export function listPackCliCommands() {
+    return [...byPack.values()].flat();
+}
+/**
+ * 合并注册表和本次调用额外传入的命令。额外命令不写入注册表，
+ * 所以 createCli 可以重复调用。
+ */
+export function collectPackCliCommands(extra = []) {
+    const merged = [...listPackCliCommands()];
+    const taken = new Set(merged.map((command) => command.name));
+    for (const command of extra) {
+        assertPackCliCommandName(command.name);
+        if (taken.has(command.name)) {
+            throw new Error(`[pack-cli] duplicate command: ${command.name}`);
+        }
+        taken.add(command.name);
+        merged.push(command);
+    }
+    return merged;
+}
+/** 测试钩子。 */
+export function resetPackCliCommands() {
+    byPack.clear();
+}

package/dist/host/runtime.js

@@ -22,7 +22,9 @@ import { getProductConfig } from '../product-config.js';
 import { LocalBackendRouter } from '../local-backend/router.js';
 import { WorktreeService } from '../local-backend/worktree-service.js';
 import { TaskService } from '../local-backend/task-service.js';
-import { LOCAL_SCOPE, closeStorage, getPackDbAccess, getScopedStore, initializeStorage, } from '../storage/driver.js';
+import { LOCAL_SCOPE, closeStorage, getPackDbAccess, getScopedStore, initializeStorage, watchStorageChanges, } from '../storage/driver.js';
+import { getUserDataDir } from '../runtime.js';
+import { acquireInstanceLease, bindStorageInstance, } from '../storage/process-locks.js';
 import { createApprovalBridge } from '../sidecar/reverse-approval.js';
 import { createAskUserBridge } from '../sidecar/reverse-ask-user.js';
 import { startHostSidecar, shutdownHostSidecar } from '../sidecar/boot.js';
@@ -35,10 +37,12 @@ import { recordInsightTurn } from '../insights/record.js';
 import { llmService } from '../llm/index.js';
 import { isProductLlmLocked, resolveRuntimeLlmSettings } from '../host-tools-runtime.js';
 import { getPackAssemblies, } from './pack-assembly.js';
+import { registerPackHttpRoutes } from './http-routes.js';
 export async function createHostRuntime(options) {
     const { broadcast, hasWindow, onLog } = options;
     const broadcastMain = options.broadcastMain ?? broadcast;
     await initializeStorage();
+    watchStorageChanges(() => broadcast('store:changed', {}));
     const scope = options.scope ?? LOCAL_SCOPE;
     const defaultStore = getScopedStore(scope);
     let localBackendRouter;
@@ -154,6 +158,11 @@ export async function createHostRuntime(options) {
                 packHandles.set(packId, handle);
         }
     }
+    for (const [packId, handle] of packHandles) {
+        const routes = handle.httpRoutes?.();
+        if (routes && routes.length > 0)
+            registerPackHttpRoutes(packId, routes);
+    }
     const worktreeService = new WorktreeService({ resolveProject: resolveChatProjectRoot });
     const taskService = new TaskService({
         store: () => localBackendRouter?.activeStore ?? defaultStore,
@@ -189,6 +198,8 @@ export async function createHostRuntime(options) {
         onLog: (line) => onLog(line),
     });
     let started = false;
+    let instanceLease = null;
+    let warmTimer = null;
     return {
         store: defaultStore,
         localExecutor,
@@ -208,8 +219,9 @@ export async function createHostRuntime(options) {
             if (started)
                 return;
             started = true;
-            // 4.6a：上次进程崩溃/强杀留下的 running 任务不是真相——任务流随进程
-            // 一起死了，启动时落成 failed，任务面板据此显示"重启中断"。
+            instanceLease = acquireInstanceLease(getUserDataDir());
+            bindStorageInstance(instanceLease.instanceId);
+            // 只清扫所属进程已经退出的任务。本进程的实例锁还在，不会扫到自己。
             const sweptTasks = await defaultStore.failRunningTasks(options.taskSweepReason);
             if (sweptTasks > 0) {
                 onLog(`[task] swept ${sweptTasks} stale running task(s)`);
@@ -250,7 +262,8 @@ export async function createHostRuntime(options) {
             // 后台刷新已启用 MCP 服务的工具列表（连接慢的 server 不阻塞启动）。
             void mcpServerRegistry.refreshAllEnabled();
             // 预热共享可见 PTY：首条 agent 命令不必付 shell 启动成本。
-            setTimeout(() => {
+            // 短命进程在这两秒内退出时必须取消，否则定时器会在关停之后再拉起一个 shell。
+            warmTimer = setTimeout(() => {
                 try {
                     terminalManager.ensurePrimary();
                 }
@@ -260,6 +273,10 @@ export async function createHostRuntime(options) {
             }, 2_000);
         },
         async shutdown() {
+            if (warmTimer) {
+                clearTimeout(warmTimer);
+                warmTimer = null;
+            }
             terminalManager.killAll();
             // 包装配逆序关停（后装配的先停）。
             for (const handle of [...packHandles.values()].reverse()) {
@@ -267,6 +284,9 @@ export async function createHostRuntime(options) {
             }
             await mcpExecutor.shutdownAll();
             await shutdownHostSidecar();
+            instanceLease?.release();
+            instanceLease = null;
+            bindStorageInstance(null);
             await closeStorage();
         },
     };

package/dist/insights/flush.js

@@ -88,7 +88,7 @@ export async function flushInsightsOutbox(store) {
         return { uploaded: 0, skipped: 0, failed: 0 };
     }
     const settings = await store.ensureInsightsSettings();
-    const pending = await store.listInsightOutbox({ uploaded: false, limit: MAX_BATCH });
+    const pending = await store.claimInsightsForUpload(MAX_BATCH);
     const { upload, skipped } = rowsEligibleForAutoUpload(settings, pending);
     let uploaded = 0;
     let failed = 0;

package/dist/json-store.js

@@ -9,11 +9,27 @@
  */
 import ConfImport from 'conf';
 import { getUserDataDir } from './runtime.js';
+import { fileLockPath } from './storage/process-locks.js';
+import { acquireWriteLease } from './storage/write-lease.js';
 const Conf = ConfImport;
 export function createJsonStore(options) {
-    return new Conf({
+    const store = new Conf({
         cwd: getUserDataDir(),
         name: options.name,
         defaults: options.defaults,
     });
+    const lockPath = fileLockPath(getUserDataDir(), options.name);
+    return {
+        get: store.get.bind(store),
+        // set is wrapped below so two processes cannot clobber a read-modify-write.
+        set(key, value) {
+            const lease = acquireWriteLease(lockPath, 5_000);
+            try {
+                store.set(key, value);
+            }
+            finally {
+                lease.release();
+            }
+        },
+    };
 }

package/dist/local-backend/router.d.ts

@@ -169,6 +169,9 @@ export declare class LocalBackendRouter {
      */
     private briefResult;
     private briefScalar;
+    private chatBusy;
+    private tryChatLock;
+    private withChatWriteLock;
     private sse;
     /**
      * A4 CoreLoop turn: the sidecar runs the whole agent loop; this method