@steerable/agent-shell 0.6.31 → 0.6.32

package/dist/host/runtime.js

@@ -28,6 +28,7 @@ import { createVisibleTerminalExec } from './visible-terminal-exec.js';
 import { createJsonStore } from '../json-store.js';
 import { bindWorkspaceSkillRoots } from '../local-backend/skill-loader.js';
 import { getChatAttachmentsDir } from '../attachments.js';
+import { ensureChatWorkspace } from '../project-home.js';
 import { recordInsightTurn } from '../insights/record.js';
 import { llmService } from '../llm/index.js';
 import { getPackAssemblies, } from './pack-assembly.js';
@@ -150,6 +151,12 @@ export async function createHostRuntime(options) {
         toolRouter,
         worktreeService,
         resolveChatProject: resolveChatProjectRoot,
+        resolveChatWorkspaceRoot: async (chatId) => {
+            const project = await resolveChatProjectRoot(chatId);
+            if (project)
+                return project.folderPath;
+            return ensureChatWorkspace(chatId);
+        },
         broadcast,
     });
     toolRouter.setTaskServices({ taskService, worktreeService });
@@ -204,7 +211,7 @@ export async function createHostRuntime(options) {
             void startHostSidecar({
                 store: defaultStore,
                 toolRouter,
-                resolveProjectRoot: async (chatId) => (await localBackendRouter.resolveChatProject(chatId))?.folderPath ?? null,
+                resolveProjectRoot: async (chatId) => localBackendRouter.resolveChatWorkspaceRoot(chatId),
                 // 项目模式下文件读写被围栏在项目目录内；会话附件目录是额外放行的
                 // 只读根，保证用户上传的文件即使在项目会话里也能被 agent 读回。
                 resolveAdditionalReadRoots: async (chatId) => {

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

@@ -98,16 +98,19 @@ export declare class LocalBackendRouter {
     private runTitleGenInBackground;
     /**
      * 解析当前对话绑定的项目（项目模式）。chat 没绑项目、项目已被删除、或
-     * 注册表未注入时都返回 null（= 不沙箱，行为同旧版本）。
-     *
-     * Public: main.ts 的反向通道（reverse-tools.ts）经它给 CoreLoop 路径的
-     * 工具调用补上 projectRoot 围栏。
+     * 注册表未注入时都返回 null。无项目对话的可写根见
+     * {@link LocalBackendRouter.resolveChatWorkspaceRoot}。
      */
     resolveChatProject(chatId: string): Promise<{
         name: string;
         folderPath: string;
         sourceFolders: string[];
     } | null>;
+    /**
+     * 本对话的可写根：绑了项目用项目家目录，否则在
+     * `Documents/<应用名>/conversations/<chatId>/` 建对话工作区。
+     */
+    resolveChatWorkspaceRoot(chatId: string): Promise<string>;
     /**
      * 解析本轮生效的智能体：人设前言、技能勾选、工具策略同源于这一次解析。
      *

package/dist/local-backend/router.js

@@ -38,7 +38,7 @@ import { detectInterruptedTurn } from './interrupted-helper.js';
 import { dropCurrentUserMessage } from './history-helper.js';
 import { parseImageAttachments, processImageAttachments } from '../image-attachment.js';
 import { loadProjectRuleFiles } from '../project-rules.js';
-import { allocateProjectHome, ensureProjectHome } from '../project-home.js';
+import { allocateProjectHome, ensureChatWorkspace, ensureProjectHome, } from '../project-home.js';
 import { registerLiveStream, getLiveStream, removeLiveStream } from './live-stream.js';
 import { beginPackTurnObservers, collectPackExecWritableRoots, collectPackForcedSkillVars, collectPackWorldState, } from './pack-turn-hooks.js';
 import { matchPackBackendRoute } from './pack-backend-routes.js';
@@ -1749,7 +1749,7 @@ export class LocalBackendRouter {
         }
         // 正文里提到的路径能否点击打开：渲染层把行内代码里「像路径」的字面量
         // 批量送来，这里落地成绝对路径并 stat 验证，只有真实存在的才回。相对
-        // 路径按对话绑定的项目根解析，无项目时按 home（同 exec 缺省 cwd 的回落）。
+        // 路径按对话绑定的项目根解析，无项目时按对话工作区。
         if (method === 'POST' && pathname === '/api/v2/local/resolve-paths') {
             const payload = this.toRecord(request.body);
             const candidates = Array.isArray(payload.candidates)
@@ -1759,7 +1759,9 @@ export class LocalBackendRouter {
                 return { status: 200, data: { resolved: [] } };
             }
             const chatId = typeof payload.chatId === 'string' ? payload.chatId : '';
-            const baseDir = (chatId ? (await this.resolveChatProject(chatId))?.folderPath : null) ?? os.homedir();
+            const baseDir = chatId
+                ? await this.resolveChatWorkspaceRoot(chatId)
+                : os.homedir();
             const resolved = await resolveMentionedPaths({ candidates, baseDir });
             return { status: 200, data: { resolved } };
         }
@@ -2190,10 +2192,8 @@ export class LocalBackendRouter {
     }
     /**
      * 解析当前对话绑定的项目（项目模式）。chat 没绑项目、项目已被删除、或
-     * 注册表未注入时都返回 null（= 不沙箱，行为同旧版本）。
-     *
-     * Public: main.ts 的反向通道（reverse-tools.ts）经它给 CoreLoop 路径的
-     * 工具调用补上 projectRoot 围栏。
+     * 注册表未注入时都返回 null。无项目对话的可写根见
+     * {@link LocalBackendRouter.resolveChatWorkspaceRoot}。
      */
     async resolveChatProject(chatId) {
         const projectId = (await this.store.getChat(chatId))?.projectId;
@@ -2208,6 +2208,16 @@ export class LocalBackendRouter {
             sourceFolders: project.sourceFolders ?? [],
         };
     }
+    /**
+     * 本对话的可写根：绑了项目用项目家目录，否则在
+     * `Documents/<应用名>/conversations/<chatId>/` 建对话工作区。
+     */
+    async resolveChatWorkspaceRoot(chatId) {
+        const project = await this.resolveChatProject(chatId);
+        if (project)
+            return project.folderPath;
+        return ensureChatWorkspace(chatId);
+    }
     /**
      * 解析本轮生效的智能体：人设前言、技能勾选、工具策略同源于这一次解析。
      *
@@ -2396,6 +2406,9 @@ export class LocalBackendRouter {
         // 都追加）。硬围栏在 ToolRouter/LocalExecutor，这里让模型事先知道边界，
         // 减少越界尝试。
         const chatProject = await this.resolveChatProject(chatId);
+        const workspaceRoot = chatProject
+            ? chatProject.folderPath
+            : await this.resolveChatWorkspaceRoot(chatId);
         if (chatProject) {
             systemPrompt +=
                 `\n\n【项目模式】当前对话绑定项目「${chatProject.name}」，家目录：${chatProject.folderPath}\n` +
@@ -2423,6 +2436,14 @@ export class LocalBackendRouter {
                 }
             }
         }
+        else {
+            systemPrompt +=
+                `\n\n【对话工作区】当前对话没有绑定项目。工作区：${workspaceRoot}\n` +
+                    `你的文件写入（local_write_file）和命令执行（local_exec_shell）都被限制在该目录内：` +
+                    `写入路径越界会被拒绝；命令默认在工作区下运行，显式指定的 cwd 越界也会被拒绝。` +
+                    `请一律使用工作区内的路径（相对路径按工作区解析）。` +
+                    `用户若要把对话绑到已有项目，可在输入框上方选择项目。`;
+        }
         // @引用的历史对话（payload.referencedChatIds）：把被引用对话的最近消息
         // 摘录注入为 user 消息，放在本对话历史之前。
         const referencedChatMessages = await this.buildReferencedChatContextMessages(payload, chatId);
@@ -2877,16 +2898,18 @@ export class LocalBackendRouter {
         // spec (default.harness.yaml) is the single source of truth for
         // maxRounds / maxToolErrors, and an explicit request param overrides it.
         // W4-2: per-exec sandbox for shell tool calls, default-on. Writable
-        // roots = the chat's project root (project mode) — unbound chats get an
-        // empty list, so writes confine to system scratch dirs only.
+        // roots = 项目家目录，或无项目时 Documents/<应用>/conversations/<chatId>。
         // `execPolicy: 'full'`（输入框「完整权限」）关闭这一层，让 mkdir
-        // Downloads 这类项目外写入不再被 Seatbelt 拦成 Operation not permitted。
+        // Downloads 这类工作区外写入不再被 Seatbelt 拦成 Operation not permitted。
         const chatProject = await this.resolveChatProject(chatId);
+        const workspaceRoot = chatProject
+            ? chatProject.folderPath
+            : await this.resolveChatWorkspaceRoot(chatId);
         const execSandbox = buildExecSandbox([
             // 场景包声明的每会话可写根（如文档包在项目根之外落盘产物的
             // 工作区）。
             ...collectPackExecWritableRoots(chatId),
-            ...(chatProject ? [chatProject.folderPath] : []),
+            workspaceRoot,
         ], { policy: parseExecPolicy(payload.execPolicy) });
         // W4-1: approval algebra, host mode — every tool call is gated by the
         // Electron approval UI over the reverse channel. The durable scope
@@ -2929,7 +2952,7 @@ export class LocalBackendRouter {
         const turnStartedAtMs = Date.now();
         const turnFileRoots = [
             ...collectPackExecWritableRoots(chatId),
-            ...(chatProject ? [chatProject.folderPath] : []),
+            workspaceRoot,
         ];
         try {
             const coreLoopOptions = {
@@ -3219,7 +3242,7 @@ export class LocalBackendRouter {
                 roots: turnFileRoots,
                 sinceMs: turnStartedAtMs,
                 actions: executedActions,
-                projectRoot: chatProject?.folderPath ?? null,
+                projectRoot: workspaceRoot,
             });
         }
         catch (turnFilesErr) {

package/dist/local-backend/task-service.d.ts

@@ -55,6 +55,11 @@ export interface TaskServiceDeps {
         name: string;
         folderPath: string;
     } | null>;
+    /**
+     * 无项目对话的可写根（Documents/<应用>/conversations/<chatId>）。
+     * 测试可不传，围栏回落为仅 scratch。
+     */
+    resolveChatWorkspaceRoot?: (chatId: string) => Promise<string>;
     /** 任务终态 / 推理过程广播（renderer 任务面板与右侧过程栏）。 */
     broadcast?: (eventName: 'task-updated' | 'task-process', payload: Record<string, unknown>) => void;
     /** 测试缝：替换真实流驱动（默认 streamCoreLoopTurn）。 */

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

@@ -272,8 +272,12 @@ export class TaskService {
         const settings = llmService.getSettings();
         const project = await this.deps.resolveChatProject(chatId);
         // 4.6b 整合：worktree 任务的围栏根 = worktree 路径（更紧——任务摸不到
-        // 主检出）；否则沿用项目根。writableRoots 同理收窄。
-        const fenceRoot = worktreePath ?? project?.folderPath ?? null;
+        // 主检出）；否则项目家目录，再否则对话工作区。
+        const fenceRoot = worktreePath ??
+            project?.folderPath ??
+            (this.deps.resolveChatWorkspaceRoot
+                ? await this.deps.resolveChatWorkspaceRoot(chatId)
+                : null);
         const execSandbox = buildExecSandbox(fenceRoot ? [fenceRoot] : []);
         const approval = process.env.STEERABLE_APPROVAL === '0'
             ? undefined

package/dist/native-folder-dialog.d.ts

@@ -0,0 +1,14 @@
+export interface NativeFolderDialogResult {
+    canceled: boolean;
+    filePaths: string[];
+}
+export interface NativeFolderDialogOptions {
+    title?: string;
+}
+export interface NativeFolderDialogDeps {
+    platform?: NodeJS.Platform;
+    run?: (cmd: string, args: readonly string[]) => Promise<{
+        stdout: string;
+    }>;
+}
+export declare function selectNativeDirectory(options?: NativeFolderDialogOptions, deps?: NativeFolderDialogDeps): Promise<NativeFolderDialogResult>;

package/dist/native-folder-dialog.js

@@ -0,0 +1,62 @@
+/**
+ * BS 宿主没有 Electron `dialog.showOpenDialog`（`ELECTRON_RUN_AS_NODE=1`）。
+ * 本模块用各平台系统选择器弹出「选文件夹」，返回与 preload
+ * `local.selectDirectory` 相同的 `{ canceled, filePaths }`。
+ *
+ * 取消、无 DISPLAY、命令不存在都记为 canceled，让 UI 走手动输入路径。
+ */
+import { execFile } from 'node:child_process';
+import { promisify } from 'node:util';
+const execFileAsync = promisify(execFile);
+function sanitizePrompt(title) {
+    const raw = (title ?? '选择文件夹').replace(/[\r\n]+/g, ' ').slice(0, 80);
+    return raw.replace(/["\\]/g, '');
+}
+function picked(stdout) {
+    const folder = stdout.trim().replace(/[/\\]+$/, '');
+    return folder ? { canceled: false, filePaths: [folder] } : { canceled: true, filePaths: [] };
+}
+export async function selectNativeDirectory(options = {}, deps = {}) {
+    const platform = deps.platform ?? process.platform;
+    const run = deps.run ?? ((cmd, args) => execFileAsync(cmd, [...args]));
+    const title = sanitizePrompt(options.title);
+    try {
+        if (platform === 'darwin') {
+            const { stdout } = await run('osascript', [
+                '-e',
+                `POSIX path of (choose folder with prompt "${title}")`,
+            ]);
+            return picked(stdout);
+        }
+        if (platform === 'win32') {
+            const escaped = title.replace(/'/g, "''");
+            const script = [
+                'Add-Type -AssemblyName System.Windows.Forms',
+                '$d = New-Object System.Windows.Forms.FolderBrowserDialog',
+                `$d.Description = '${escaped}'`,
+                'if ($d.ShowDialog() -eq [System.Windows.Forms.DialogResult]::OK) { $d.SelectedPath }',
+            ].join('; ');
+            const { stdout } = await run('powershell.exe', ['-NoProfile', '-Command', script]);
+            return picked(stdout);
+        }
+        try {
+            const { stdout } = await run('zenity', [
+                '--file-selection',
+                '--directory',
+                `--title=${title}`,
+            ]);
+            return picked(stdout);
+        }
+        catch {
+            const { stdout } = await run('kdialog', [
+                '--getexistingdirectory',
+                process.env.HOME || '/',
+                title,
+            ]);
+            return picked(stdout);
+        }
+    }
+    catch {
+        return { canceled: true, filePaths: [] };
+    }
+}

package/dist/project-home.d.ts

@@ -5,6 +5,8 @@
  * 家目录由本模块分配并创建。用户另加的源文件夹是附加只读根，
  * 不替代这个家目录。
  */
+/** 把 `~` / `~/…` 展开成绝对路径；其它输入原样（已 trim）。 */
+export declare function expandUserPath(folder: string): string;
 export declare function sanitizeProjectDirName(name: string): string;
 /** `Documents/<应用显示名>`：该应用下所有托管项目的父目录。 */
 export declare function appProjectsRoot(options?: {
@@ -21,3 +23,18 @@ export declare function allocateProjectHome(projectName: string, options?: {
     exists?: (folderPath: string) => boolean;
 }): string;
 export declare function ensureProjectHome(folderPath: string): void;
+/** 无项目对话的工作区子目录名（与托管项目家目录并列，避免撞名）。 */
+export declare const CHAT_WORKSPACES_DIR = "conversations";
+/**
+ * 无项目对话的工作区路径：`Documents/<应用名>/conversations/<chatId>/`。
+ * 不落盘；调用方用 {@link ensureChatWorkspace} 创建。
+ */
+export declare function chatWorkspacePath(chatId: string, options?: {
+    documentsDir?: string;
+    appFolderName?: string;
+}): string;
+/** 确保无项目对话工作区存在，返回绝对路径。 */
+export declare function ensureChatWorkspace(chatId: string, options?: {
+    documentsDir?: string;
+    appFolderName?: string;
+}): string;

package/dist/project-home.js

@@ -6,10 +6,21 @@
  * 不替代这个家目录。
  */
 import fs from 'node:fs';
+import os from 'node:os';
 import path from 'node:path';
 import { getBrand } from './brand.js';
 import { getDocumentsDir } from './runtime.js';
 const UNSAFE_DIR_CHARS = /[\\/:*?"<>|]/g;
+/** 把 `~` / `~/…` 展开成绝对路径；其它输入原样（已 trim）。 */
+export function expandUserPath(folder) {
+    const trimmed = folder.trim();
+    if (trimmed === '~')
+        return os.homedir();
+    if (trimmed.startsWith('~/') || trimmed.startsWith('~\\')) {
+        return path.join(os.homedir(), trimmed.slice(2));
+    }
+    return trimmed;
+}
 export function sanitizeProjectDirName(name) {
     const trimmed = name
         .trim()
@@ -45,3 +56,19 @@ export function allocateProjectHome(projectName, options) {
 export function ensureProjectHome(folderPath) {
     fs.mkdirSync(folderPath, { recursive: true });
 }
+/** 无项目对话的工作区子目录名（与托管项目家目录并列，避免撞名）。 */
+export const CHAT_WORKSPACES_DIR = 'conversations';
+/**
+ * 无项目对话的工作区路径：`Documents/<应用名>/conversations/<chatId>/`。
+ * 不落盘；调用方用 {@link ensureChatWorkspace} 创建。
+ */
+export function chatWorkspacePath(chatId, options) {
+    const id = sanitizeProjectDirName(chatId);
+    return path.join(appProjectsRoot(options), CHAT_WORKSPACES_DIR, id);
+}
+/** 确保无项目对话工作区存在，返回绝对路径。 */
+export function ensureChatWorkspace(chatId, options) {
+    const folderPath = chatWorkspacePath(chatId, options);
+    ensureProjectHome(folderPath);
+    return folderPath;
+}

package/dist/server/http-server.js

@@ -34,6 +34,7 @@ import { getSidecarSupervisor } from '../llm/index.js';
 import { matchPackHttpRoute } from '../host/http-routes.js';
 import { getBrand } from '../brand.js';
 import { saveAttachmentFiles } from '../attachments.js';
+import { selectNativeDirectory } from '../native-folder-dialog.js';
 import { getAuthProvider } from '../auth/index.js';
 /** 与 router.handleStream 内部的路由正则保持一致——只有这些路径是流式。 */
 const STREAM_PATH_PATTERNS = [
@@ -250,6 +251,11 @@ export function createBsServer(deps) {
             return;
         }
         // ─── local（对齐 local:* IPC） ───
+        if (method === 'POST' && pathname === '/host/local/select-directory') {
+            const title = typeof body.title === 'string' ? body.title : undefined;
+            sendJson(res, 200, await selectNativeDirectory({ title }));
+            return;
+        }
         if (method === 'POST' && pathname === '/host/local/exec-shell') {
             const request = body;
             const viaTerminal = await maybeExecInTerminal(request);

package/dist/sidecar/boot.d.ts

@@ -5,7 +5,7 @@ import type { SidecarReverseHandler } from './types.js';
 export interface HostSidecarDeps {
     store: ScopedStore;
     toolRouter: ToolRouter;
-    /** W4-2 项目模式围栏：chatId → 项目根（无项目对话返回 null）。 */
+    /** W4-2 围栏：chatId → 项目家目录或无项目对话工作区。 */
     resolveProjectRoot: (chatId: string) => Promise<string | null>;
     /**
      * 项目模式之外额外放行的只读根（会话附件目录等）。文件写入仍只受

package/dist/sidecar/reverse-tools.d.ts

@@ -16,7 +16,7 @@ export interface ReverseToolDeps {
     }) => void;
     /**
      * 项目模式：按 chatId 解析项目根（绝对路径），无绑定/已删除返回 null。
-     * main.ts 注入 LocalBackendRouter.resolveChatProject 的适配；未注入时
+     * main.ts 注入对话可写根（项目家目录或无项目对话工作区）；未注入时
      * 项目围栏不生效（CLI/test 场景）。
      */
     resolveProjectRoot?: (chatId: string) => Promise<string | null>;

package/dist/storage/index.d.ts

@@ -12,7 +12,7 @@ export interface ChatSessionRecord {
     title: string;
     userId: string;
     agentId: string | null;
-    /** 项目模式：绑定的项目 id（ProjectRegistry）。null = 无项目对话（不沙箱）。 */
+    /** 项目模式：绑定的项目 id（ProjectRegistry）。null = 无项目对话（用对话工作区）。 */
     projectId: string | null;
     createdAt: string;
     updatedAt: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steerable/agent-shell",
-  "version": "0.6.31",
+  "version": "0.6.32",
   "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/",
@@ -49,9 +49,9 @@
     "electron-store": "^8.1.0",
     "he": "^1.2.0",
     "node-pty": "^1.1.0",
-    "@steerable/agent-harness": "0.6.31",
-    "@steerable/pack-sdk": "0.6.31",
-    "@steerable/agent-protocol": "0.6.31"
+    "@steerable/agent-protocol": "0.6.32",
+    "@steerable/pack-sdk": "0.6.32",
+    "@steerable/agent-harness": "0.6.32"
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.13",