@co0ontty/wand 4.39.0 → 4.40.0

package/dist/storage.js

@@ -255,12 +255,65 @@ function mapWorktreeMergeFields(row) {
 }
 function sessionSelectFields() {
     return `id, session_source, automation_id, provider, session_kind, runner, command, cwd, mode, status, exit_code, started_at, ended_at, output, pty_output_seq, archived, archived_at, claude_session_id, messages, queued_messages, queued_message_skills, structured_state
-             , resumed_from_session_id, auto_recovered, worktree_enabled, worktree_info, worktree_merge_status, worktree_merge_info, title, description, session_options`;
+             , resumed_from_session_id, auto_recovered, worktree_enabled, worktree_info, worktree_merge_status, worktree_merge_info, title, description, session_options, workspace_id, workspace_task_id`;
+}
+function mapWorkspaceRow(row) {
+    return {
+        id: row.id,
+        name: row.name,
+        cwd: row.cwd,
+        defaultProvider: (row.default_provider ?? undefined),
+        layout: row.layout_json ? safeJsonParse(row.layout_json) ?? null : null,
+        createdAt: row.created_at,
+        lastOpenedAt: row.last_opened_at,
+    };
+}
+function mapWorkspaceTaskWorktree(raw) {
+    const parsed = safeJsonParse(raw);
+    if (!parsed || typeof parsed.path !== "string" || typeof parsed.branch !== "string")
+        return null;
+    return parsed;
+}
+function firstLayoutTabId(node) {
+    if (node.type === "pane")
+        return node.tabs[node.active]?.id ?? node.tabs[0]?.id;
+    return firstLayoutTabId(node.children[0]) ?? firstLayoutTabId(node.children[1]);
+}
+/** 读取旧版单棵分屏树时就地包成一个工作窗口，避免升级后丢失布局。 */
+function mapWorkspaceTaskLayout(raw) {
+    const parsed = safeJsonParse(raw);
+    if (!parsed || typeof parsed !== "object")
+        return null;
+    const record = parsed;
+    if (record.type === "windows" && Array.isArray(record.windows)) {
+        return parsed;
+    }
+    if (record.type === "pane" || record.type === "split") {
+        const legacy = parsed;
+        return {
+            type: "windows",
+            windows: [{ id: "window-legacy", layout: legacy, activeTabId: firstLayoutTabId(legacy) }],
+            activeWindowId: "window-legacy",
+        };
+    }
+    return null;
+}
+function mapWorkspaceTaskRow(row) {
+    return {
+        id: row.id,
+        workspaceId: row.workspace_id,
+        name: row.name,
+        worktree: mapWorkspaceTaskWorktree(row.worktree_json),
+        layout: mapWorkspaceTaskLayout(row.layout_json),
+        status: (row.status === "done" ? "done" : "active"),
+        createdAt: row.created_at,
+        lastOpenedAt: row.last_opened_at,
+    };
 }
 function sessionPersistFields() {
     return `id, session_source, automation_id, command, cwd, mode, status, exit_code, started_at, ended_at, output, pty_output_seq
              , archived, archived_at, claude_session_id, provider, session_kind, runner, messages, queued_messages, queued_message_skills, structured_state
-             , resumed_from_session_id, auto_recovered, worktree_enabled, worktree_info, worktree_merge_status, worktree_merge_info, title, description, session_options`;
+             , resumed_from_session_id, auto_recovered, worktree_enabled, worktree_info, worktree_merge_status, worktree_merge_info, title, description, session_options, workspace_id, workspace_task_id`;
 }
 function sessionPersistAssignments() {
     return `session_source = excluded.session_source,
@@ -292,7 +345,9 @@ function sessionPersistAssignments() {
              worktree_merge_info = excluded.worktree_merge_info,
              title = excluded.title,
              description = excluded.description,
-             session_options = excluded.session_options`;
+             session_options = excluded.session_options,
+             workspace_id = excluded.workspace_id,
+             workspace_task_id = excluded.workspace_task_id`;
 }
 function sessionRuntimeMetadataAssignments() {
     return `session_source = ?, automation_id = ?,
@@ -337,6 +392,8 @@ function sessionPersistValues(snapshot) {
         snapshot.title ?? null,
         snapshot.description ?? null,
         serializeSessionOptions(snapshot),
+        snapshot.workspaceId ?? null,
+        snapshot.workspaceTaskId ?? null,
     ];
 }
 function sessionRuntimeMetadataValues(snapshot) {
@@ -404,6 +461,8 @@ function mapSessionCore(row) {
         worktree: parseWorktreeInfo(row.worktree_info) ?? null,
         title: row.title ?? undefined,
         description: row.description ?? undefined,
+        workspaceId: row.workspace_id ?? undefined,
+        workspaceTaskId: row.workspace_task_id ?? undefined,
         ...mapWorktreeMergeFields(row),
         ...sessionOptions,
         ...(Object.prototype.hasOwnProperty.call(sessionOptions, "pendingEscalation")
@@ -566,6 +625,34 @@ const INIT_SQL = `
   CREATE UNIQUE INDEX IF NOT EXISTS idx_mission_attempts_session ON mission_attempts(session_id) WHERE session_id IS NOT NULL;
   CREATE INDEX IF NOT EXISTS idx_mission_comments_attempt ON mission_review_comments(attempt_id, status);
   CREATE INDEX IF NOT EXISTS idx_agent_activity_state ON agent_activity(state, updated_at);
+
+  CREATE TABLE IF NOT EXISTS workspaces (
+    id TEXT PRIMARY KEY,
+    name TEXT NOT NULL,
+    cwd TEXT NOT NULL,
+    default_provider TEXT,
+    layout_json TEXT,
+    created_at TEXT NOT NULL,
+    last_opened_at TEXT
+  );
+
+  CREATE INDEX IF NOT EXISTS idx_workspaces_cwd ON workspaces(cwd);
+  CREATE INDEX IF NOT EXISTS idx_workspaces_last_opened ON workspaces(last_opened_at);
+
+  CREATE TABLE IF NOT EXISTS workspace_tasks (
+    id TEXT PRIMARY KEY,
+    workspace_id TEXT NOT NULL,
+    name TEXT NOT NULL,
+    worktree_json TEXT,
+    layout_json TEXT,
+    status TEXT NOT NULL DEFAULT 'active',
+    created_at TEXT NOT NULL,
+    last_opened_at TEXT,
+    FOREIGN KEY (workspace_id) REFERENCES workspaces(id) ON DELETE CASCADE
+  );
+
+  CREATE INDEX IF NOT EXISTS idx_workspace_tasks_workspace ON workspace_tasks(workspace_id);
+  CREATE INDEX IF NOT EXISTS idx_workspace_tasks_last_opened ON workspace_tasks(last_opened_at);
 `;
 export function ensureDatabaseFile(dbPath) {
     const dir = path.dirname(dbPath);
@@ -689,6 +776,174 @@ export class WandStorage {
            updated_at = excluded.updated_at`)
             .run(normalizedPath, normalizedName, nowIso());
     }
+    // ============ Workspaces（多标签 / 分屏项目）============
+    listWorkspaces() {
+        const rows = this.db
+            .prepare("SELECT id, name, cwd, default_provider, layout_json, created_at, last_opened_at FROM workspaces ORDER BY COALESCE(last_opened_at, created_at) DESC")
+            .all();
+        return rows.map(mapWorkspaceRow);
+    }
+    getWorkspace(id) {
+        const row = this.db
+            .prepare("SELECT id, name, cwd, default_provider, layout_json, created_at, last_opened_at FROM workspaces WHERE id = ?")
+            .get(id);
+        return row ? mapWorkspaceRow(row) : null;
+    }
+    createWorkspace(input) {
+        const id = crypto.randomUUID();
+        const createdAt = nowIso();
+        this.db
+            .prepare(`INSERT INTO workspaces (id, name, cwd, default_provider, layout_json, created_at, last_opened_at)
+         VALUES (?, ?, ?, ?, NULL, ?, NULL)`)
+            .run(id, input.name, input.cwd, input.defaultProvider ?? null, createdAt);
+        return {
+            id,
+            name: input.name,
+            cwd: input.cwd,
+            defaultProvider: input.defaultProvider,
+            layout: null,
+            createdAt,
+            lastOpenedAt: null,
+        };
+    }
+    updateWorkspace(id, patch) {
+        const assignments = [];
+        const values = [];
+        if (patch.name !== undefined) {
+            assignments.push("name = ?");
+            values.push(patch.name);
+        }
+        if (patch.cwd !== undefined) {
+            assignments.push("cwd = ?");
+            values.push(patch.cwd);
+        }
+        if (patch.defaultProvider !== undefined) {
+            assignments.push("default_provider = ?");
+            values.push(patch.defaultProvider ?? null);
+        }
+        if (assignments.length === 0)
+            return;
+        this.db.prepare(`UPDATE workspaces SET ${assignments.join(", ")} WHERE id = ?`).run(...values, id);
+    }
+    saveWorkspaceLayout(id, layout) {
+        this.db
+            .prepare("UPDATE workspaces SET layout_json = ? WHERE id = ?")
+            .run(layout ? JSON.stringify(layout) : null, id);
+    }
+    touchWorkspace(id) {
+        this.db.prepare("UPDATE workspaces SET last_opened_at = ? WHERE id = ?").run(nowIso(), id);
+    }
+    deleteWorkspace(id, options = {}) {
+        if (options.cascade) {
+            this.db.prepare(`DELETE FROM command_sessions
+         WHERE workspace_id = ?
+            OR workspace_task_id IN (SELECT id FROM workspace_tasks WHERE workspace_id = ?)`).run(id, id);
+        }
+        else {
+            // 解绑：保留会话，同时清空 workspace 与即将级联删除的 task 归属。
+            this.db.prepare(`UPDATE command_sessions
+         SET workspace_id = NULL, workspace_task_id = NULL
+         WHERE workspace_id = ?
+            OR workspace_task_id IN (SELECT id FROM workspace_tasks WHERE workspace_id = ?)`).run(id, id);
+        }
+        this.db.prepare("DELETE FROM workspaces WHERE id = ?").run(id);
+    }
+    listSessionsByWorkspace(workspaceId) {
+        const rows = this.db
+            .prepare(`${sessionRowQuery("SELECT")}
+         FROM command_sessions
+         WHERE workspace_id = ?
+         ORDER BY started_at DESC`)
+            .all(workspaceId);
+        return rows.map((row) => this.mapSessionRow(row));
+    }
+    /** 显式更新某会话的工作空间归属（用于创建时绑定）。 */
+    setSessionWorkspaceId(sessionId, workspaceId) {
+        this.db.prepare("UPDATE command_sessions SET workspace_id = ? WHERE id = ?").run(workspaceId, sessionId);
+    }
+    // ── Workspace tasks（任务 = 命名 + 独立 worktree + 一组标签）──
+    listWorkspaceTasks(workspaceId) {
+        const rows = this.db
+            .prepare(`SELECT id, workspace_id, name, worktree_json, layout_json, status, created_at, last_opened_at
+         FROM workspace_tasks WHERE workspace_id = ?
+         ORDER BY COALESCE(last_opened_at, created_at) DESC`)
+            .all(workspaceId);
+        return rows.map(mapWorkspaceTaskRow);
+    }
+    getWorkspaceTask(id) {
+        const row = this.db
+            .prepare(`SELECT id, workspace_id, name, worktree_json, layout_json, status, created_at, last_opened_at
+         FROM workspace_tasks WHERE id = ?`)
+            .get(id);
+        return row ? mapWorkspaceTaskRow(row) : null;
+    }
+    createWorkspaceTask(input) {
+        const id = crypto.randomUUID();
+        const createdAt = nowIso();
+        const status = input.status ?? "active";
+        this.db
+            .prepare(`INSERT INTO workspace_tasks (id, workspace_id, name, worktree_json, layout_json, status, created_at, last_opened_at)
+         VALUES (?, ?, ?, ?, NULL, ?, ?, NULL)`)
+            .run(id, input.workspaceId, input.name, input.worktree ? JSON.stringify(input.worktree) : null, status, createdAt);
+        return {
+            id,
+            workspaceId: input.workspaceId,
+            name: input.name,
+            worktree: input.worktree ?? null,
+            layout: null,
+            status,
+            createdAt,
+            lastOpenedAt: null,
+        };
+    }
+    updateWorkspaceTask(id, patch) {
+        const assignments = [];
+        const values = [];
+        if (patch.name !== undefined) {
+            assignments.push("name = ?");
+            values.push(patch.name);
+        }
+        if (patch.status !== undefined) {
+            assignments.push("status = ?");
+            values.push(patch.status);
+        }
+        if (patch.worktree !== undefined) {
+            assignments.push("worktree_json = ?");
+            values.push(patch.worktree ? JSON.stringify(patch.worktree) : null);
+        }
+        if (assignments.length === 0)
+            return;
+        this.db.prepare(`UPDATE workspace_tasks SET ${assignments.join(", ")} WHERE id = ?`).run(...values, id);
+    }
+    saveWorkspaceTaskLayout(id, layout) {
+        this.db
+            .prepare("UPDATE workspace_tasks SET layout_json = ? WHERE id = ?")
+            .run(layout ? JSON.stringify(layout) : null, id);
+    }
+    touchWorkspaceTask(id) {
+        this.db.prepare("UPDATE workspace_tasks SET last_opened_at = ? WHERE id = ?").run(nowIso(), id);
+    }
+    deleteWorkspaceTask(id, options = {}) {
+        if (options.cascade) {
+            this.db.prepare("DELETE FROM command_sessions WHERE workspace_task_id = ?").run(id);
+        }
+        else {
+            this.db.prepare("UPDATE command_sessions SET workspace_task_id = NULL WHERE workspace_task_id = ?").run(id);
+        }
+        this.db.prepare("DELETE FROM workspace_tasks WHERE id = ?").run(id);
+    }
+    listSessionsByWorkspaceTask(taskId) {
+        const rows = this.db
+            .prepare(`${sessionRowQuery("SELECT")}
+         FROM command_sessions
+         WHERE workspace_task_id = ?
+         ORDER BY started_at DESC`)
+            .all(taskId);
+        return rows.map((row) => this.mapSessionRow(row));
+    }
+    setSessionWorkspaceTaskId(sessionId, taskId) {
+        this.db.prepare("UPDATE command_sessions SET workspace_task_id = ? WHERE id = ?").run(taskId, sessionId);
+    }
     /** Get password from database */
     getPassword() {
         return this.getConfigValue("password");
@@ -954,7 +1209,7 @@ export class WandStorage {
         this.db
             .prepare(`INSERT INTO command_sessions (
          ${sessionPersistFields()}
-         ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+         ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
          ON CONFLICT(id) DO UPDATE SET
            ${sessionPersistAssignments()}`)
             .run(...sessionPersistValues(snapshot));
@@ -1148,6 +1403,8 @@ const SCHEMA_MIGRATIONS = [
     ["description", "ALTER TABLE command_sessions ADD COLUMN description TEXT"],
     ["pty_output_seq", "ALTER TABLE command_sessions ADD COLUMN pty_output_seq INTEGER NOT NULL DEFAULT 0"],
     ["session_options", `ALTER TABLE command_sessions ADD COLUMN session_options TEXT NOT NULL DEFAULT '{"schemaVersion":1}'`],
+    ["workspace_id", "ALTER TABLE command_sessions ADD COLUMN workspace_id TEXT"],
+    ["workspace_task_id", "ALTER TABLE command_sessions ADD COLUMN workspace_task_id TEXT"],
 ];
 const AUTH_SESSION_MIGRATIONS = [
     ["kind", "ALTER TABLE auth_sessions ADD COLUMN kind TEXT NOT NULL DEFAULT 'browser-admin'"],

package/dist/structured-session-manager.d.ts

@@ -26,6 +26,10 @@ interface CreateStructuredSessionOptions {
     thinkingEffort?: SessionSnapshot["thinkingEffort"];
     sessionSource?: SessionSource;
     automationId?: string;
+    /** 所属工作空间 ID（多标签 / 分屏项目）。 */
+    workspaceId?: string;
+    /** 所属工作空间任务 ID（任务 = 独立 worktree + 一组标签）。 */
+    workspaceTaskId?: string;
     /**
      * 恢复用的初始会话 id：
      *   - Codex：历史 thread id，首条消息即 `codex exec ... resume <id>` 续接。

package/dist/structured-session-manager.js

@@ -545,6 +545,8 @@ export class StructuredSessionManager {
             sessionKind: "structured",
             sessionSource: options.sessionSource ?? "interactive",
             automationId: options.automationId,
+            workspaceId: options.workspaceId,
+            workspaceTaskId: options.workspaceTaskId,
             provider,
             runner,
             command: provider === "codex"

package/dist/types.d.ts

@@ -324,6 +324,10 @@ export interface CommandRequest {
     rows?: number;
     /** 思考深度。null/缺省 视为 off（不启用思考）。 */
     thinkingEffort?: ThinkingEffort | null;
+    /** 创建会话时绑定到的工作空间 ID（多标签 / 分屏项目）。 */
+    workspaceId?: string;
+    /** 创建会话时绑定到的工作空间任务 ID（任务 = 独立 worktree + 一组标签）。 */
+    workspaceTaskId?: string;
 }
 export interface InputRequest {
     input?: string;
@@ -490,6 +494,10 @@ export interface SessionSnapshot {
     sessionSource?: SessionSource;
     /** 自动化创建会话时关联的自动化任务 ID。 */
     automationId?: string;
+    /** 所属工作空间 ID（多标签 / 分屏项目）。会话在该工作空间窗口内作为一个标签。 */
+    workspaceId?: string;
+    /** 所属工作空间任务 ID；任务独占一个 worktree，其下所有会话共享该 worktree 目录。 */
+    workspaceTaskId?: string;
     sessionKind?: SessionKind;
     provider?: SessionProvider;
     /** True while the provider CLI owns the PTY; false after it returns to the persistent shell. */
@@ -574,6 +582,80 @@ export interface SessionSnapshot {
     /** Internal shell-wrapper marker needed to keep parsing a daemon-owned PTY after reattach. */
     ptyLaunchMarkerToken?: string | null;
 }
+/** 工作空间默认 IDE；新建 Agent 标签时缺省回落到该 provider。 */
+export type WorkspaceDefaultProvider = SessionProvider;
+/** 工作空间内一个标签页：会话（IDE/终端）/ 编辑器 / 预览。 */
+export type PaneTab = {
+    id: string;
+    kind: "session";
+    sessionId: string;
+} | {
+    id: string;
+    kind: "editor";
+    path: string;
+} | {
+    id: string;
+    kind: "preview";
+    path: string;
+};
+/**
+ * 标签 / 分屏布局树。叶子是 tabset（一组标签），内部节点是二分屏。
+ * `split.ratio` 为左/上子节点占比（0~1），由前端 allotment 回写持久化。
+ */
+export type LayoutNode = {
+    type: "pane";
+    tabs: PaneTab[];
+    active: number;
+} | {
+    type: "split";
+    dir: "h" | "v";
+    ratio: number;
+    children: [LayoutNode, LayoutNode];
+};
+/** 顶部一个工作窗口 Tab；内部可以包含一棵终端分屏树。 */
+export interface WorkWindowLayout {
+    id: string;
+    layout: LayoutNode;
+    activeTabId?: string;
+}
+/** 任务级窗口集合：顶部 Tab 与 windows 一一对应。 */
+export interface TaskWindowLayout {
+    type: "windows";
+    windows: WorkWindowLayout[];
+    activeWindowId: string | null;
+}
+/** 项目 / 工作空间。锚定一个目录（如 wand 仓库），内含多个并行「任务」。 */
+export interface Workspace {
+    id: string;
+    name: string;
+    cwd: string;
+    defaultProvider?: WorkspaceDefaultProvider;
+    /**
+     * 工作空间级的布局占位（保留字段）。标签 / 分屏布局实际挂在 Task 上
+     * （见 WorkspaceTask.layout），因为每个任务独占一个 worktree 与一组标签。
+     */
+    layout: LayoutNode | null;
+    createdAt: string;
+    lastOpenedAt: string | null;
+}
+/** 任务所属 worktree 信息（复用 WorktreeInfo）；非 git 目录时为 null（退化为直接在项目目录运行）。 */
+export type WorkspaceTaskWorktree = WorktreeInfo;
+export type WorkspaceTaskStatus = "active" | "done";
+/**
+ * 工作空间内的一个「任务」：命名、独立 worktree 隔离、自带一组标签（LayoutNode）。
+ * 一个工作空间下可有多个任务，任务在侧栏列表里单独展示；每个任务的会话共享该任务的 worktree。
+ */
+export interface WorkspaceTask {
+    id: string;
+    workspaceId: string;
+    name: string;
+    worktree: WorkspaceTaskWorktree | null;
+    /** 该任务的工作窗口 Tabs；每个窗口内部可含一棵分屏树。 */
+    layout: TaskWindowLayout | null;
+    status: WorkspaceTaskStatus;
+    createdAt: string;
+    lastOpenedAt: string | null;
+}
 /** Unified event type emitted by ClaudePtyBridge for WebSocket broadcast */
 export type SessionEventType = "output.raw" | "output.chat" | "chat.turn" | "permission.prompt" | "permission.resolved" | "session.id" | "task" | "ended";
 export interface SessionEvent {