@co0ontty/wand 4.75.2 → 4.76.0-beta.ge98b32f

package/dist/build-info.json

@@ -1,6 +1,6 @@
 {
-  "commit": "f59a3c6dc6450e8289c06a75742258844046afd0",
-  "builtAt": "2026-09-24T07:36:52.533Z",
-  "version": "4.75.2",
-  "channel": "stable"
+  "commit": "e98b32fc784c024dd38d1996355044224f2bf398",
+  "builtAt": "2026-09-25T01:10:41.447Z",
+  "version": "4.76.0-beta.ge98b32f",
+  "channel": "beta"
 }

package/dist/server-workspace-routes.js

@@ -45,6 +45,8 @@ function workspaceSessionSummary(session, names = {}, registry) {
 function cheapTasksRevision(storage, registry) {
     const fingerprint = [
         storage.tasksAggregateFingerprint(),
+        // 排序只更新偏好，不改变任务和会话；轮询 revision 也必须跟着变化。
+        storage.getWorkspaceGroupOrder(),
         ...(registry?.listSlim() ?? []).map((session) => [
             session.id,
             session.status,
@@ -58,6 +60,38 @@ function cheapTasksRevision(storage, registry) {
     ];
     return crypto.createHash("sha256").update(JSON.stringify(fingerprint)).digest("base64url");
 }
+/**
+ * 目录组排序：先按用户拖动保存的顺序，再按默认规则（全局组在前、创建时间倒序、id 兜底）。
+ *
+ * 用户只要拖过一次，顺序就完全按存储值走——包括把「未归属」挪到后面；
+ * 没拖过（存储为空）时保持原有默认观感，不让改动影响没动过排序的人。
+ */
+function sortTaskDirectoryGroups(groups, order) {
+    const position = new Map();
+    order.forEach((id, index) => position.set(id, index));
+    const defaultSorted = [...groups].sort((left, right) => {
+        const global = Number(Boolean(right.global)) - Number(Boolean(left.global));
+        if (global)
+            return global;
+        const created = compareCreatedDesc(left.createdAt, right.createdAt);
+        if (created)
+            return created;
+        return String(left.workspaceId).localeCompare(String(right.workspaceId));
+    });
+    if (position.size === 0)
+        return defaultSorted;
+    return defaultSorted.sort((left, right) => {
+        const leftIndex = position.get(left.workspaceId);
+        const rightIndex = position.get(right.workspaceId);
+        if (leftIndex === undefined && rightIndex === undefined)
+            return 0;
+        if (leftIndex === undefined)
+            return 1;
+        if (rightIndex === undefined)
+            return -1;
+        return leftIndex - rightIndex;
+    });
+}
 function compareCreatedDesc(left, right) {
     const a = typeof left === "string" ? left.trim() : "";
     const b = typeof right === "string" ? right.trim() : "";
@@ -619,23 +653,38 @@ export function registerWorkspaceRoutes(app, storage, sessions, titleOptions = {
             if (group.synthetic)
                 rememberCreatedAt(group, session.startedAt);
         }
-        const payload = [...groups.values()]
-            .filter((group) => !group.global || group.tasks.length > 0 || group.standaloneSessions.length > 0)
-            .sort((left, right) => {
-            const global = Number(Boolean(right.global)) - Number(Boolean(left.global));
-            if (global)
-                return global;
-            const created = compareCreatedDesc(left.createdAt, right.createdAt);
-            if (created)
-                return created;
-            return String(left.workspaceId).localeCompare(String(right.workspaceId));
-        });
+        const orderedGroups = [...groups.values()]
+            .filter((group) => !group.global || group.tasks.length > 0 || group.standaloneSessions.length > 0);
+        const payload = sortTaskDirectoryGroups(orderedGroups, storage.getWorkspaceGroupOrder());
         if (hasRevisionQuery) {
             res.json({ unchanged: false, revision: cheapTasksRevision(storage, sessions), groups: payload });
             return;
         }
         res.json(payload);
     });
+    /**
+     * PUT /api/workspaces/order —— 保存首页目录组的展示顺序（拖动排序）。
+     *
+     * 存的是客户端看到的组 id（真实工作区 workspace id，合成目录 `cwd:<规范化路径>`），
+     * 未出现在本次提交里的既有 id 会按原相对顺序接在后面，避免某个客户端
+     * 只知道自己那部分分组时把别人的顺序抹掉。
+     */
+    app.put("/api/workspaces/order", (req, res) => {
+        const body = req.body;
+        const incoming = Array.isArray(body?.ids)
+            ? body.ids.filter((value) => typeof value === "string").slice(0, 500)
+            : null;
+        if (!incoming) {
+            res.status(400).json({ error: "缺少 ids 列表。" });
+            return;
+        }
+        const submitted = [...new Set(incoming.map((id) => id.trim()).filter(Boolean))];
+        const submittedSet = new Set(submitted);
+        const kept = storage.getWorkspaceGroupOrder().filter((id) => !submittedSet.has(id));
+        const next = [...submitted, ...kept];
+        storage.setWorkspaceGroupOrder(next);
+        res.json({ ok: true, ids: next });
+    });
     // 列出某工作空间下的任务
     app.get("/api/workspaces/:id/tasks", (req, res) => {
         const workspace = storage.getWorkspace(req.params.id);

package/dist/storage.d.ts

@@ -49,6 +49,15 @@ export declare class WandStorage {
     setPreference<T>(key: string, value: T | null | undefined): void;
     /** 判断偏好是否在 DB 中存在（区别于值为 null/false/""）。 */
     hasPreference(key: string): boolean;
+    /**
+     * 用户在首页拖动排序后的目录组顺序（服务端偏好，所有客户端共用）。
+     * 存的是客户端看到的组 id：真实工作区用 workspace id，合成目录用 `cwd:<规范化路径>`。
+     * 不存在的 id 只是被忽略，不影响渲染。
+     */
+    getWorkspaceGroupOrder(): string[];
+    setWorkspaceGroupOrder(ids: string[]): void;
+    /** 工作区被删除后，把它的排序位也清掉，避免 id 被复用后继承旧位置。 */
+    forgetWorkspaceGroupOrder(id: string): void;
     /** Return user-defined workspace labels keyed by normalized session cwd. */
     listSessionDirectoryNames(): Map<string, string>;
     /** Set a workspace label, or remove it when name is null/blank. */

package/dist/storage.js

@@ -1011,6 +1011,49 @@ export class WandStorage {
     hasPreference(key) {
         return this.getConfigValue(key) !== null;
     }
+    // ============ 首页目录组顺序 ============
+    /**
+     * 用户在首页拖动排序后的目录组顺序（服务端偏好，所有客户端共用）。
+     * 存的是客户端看到的组 id：真实工作区用 workspace id，合成目录用 `cwd:<规范化路径>`。
+     * 不存在的 id 只是被忽略，不影响渲染。
+     */
+    getWorkspaceGroupOrder() {
+        const stored = this.getPreference(WORKSPACE_GROUP_ORDER_KEY, []);
+        if (!Array.isArray(stored))
+            return [];
+        const seen = new Set();
+        const ids = [];
+        for (const value of stored) {
+            if (typeof value !== "string")
+                continue;
+            const id = value.trim();
+            if (!id || seen.has(id))
+                continue;
+            seen.add(id);
+            ids.push(id);
+        }
+        return ids;
+    }
+    setWorkspaceGroupOrder(ids) {
+        const seen = new Set();
+        const cleaned = [];
+        for (const value of ids) {
+            const id = typeof value === "string" ? value.trim() : "";
+            if (!id || seen.has(id))
+                continue;
+            seen.add(id);
+            cleaned.push(id);
+        }
+        // 空顺序等于「没设置过」，回到默认排序，而不是存一个空数组。
+        this.setPreference(WORKSPACE_GROUP_ORDER_KEY, cleaned.length > 0 ? cleaned : null);
+    }
+    /** 工作区被删除后，把它的排序位也清掉，避免 id 被复用后继承旧位置。 */
+    forgetWorkspaceGroupOrder(id) {
+        const current = this.getWorkspaceGroupOrder();
+        if (!current.includes(id))
+            return;
+        this.setWorkspaceGroupOrder(current.filter((item) => item !== id));
+    }
     // ============ Session Directory Names ============
     /** Return user-defined workspace labels keyed by normalized session cwd. */
     listSessionDirectoryNames() {
@@ -1124,6 +1167,7 @@ export class WandStorage {
             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);
+        this.forgetWorkspaceGroupOrder(id);
     }
     listSessionsByWorkspace(workspaceId) {
         const rows = this.db
@@ -2151,6 +2195,8 @@ const SCHEMA_MIGRATIONS = [
     ["workspace_id", "ALTER TABLE command_sessions ADD COLUMN workspace_id TEXT"],
     ["workspace_task_id", "ALTER TABLE command_sessions ADD COLUMN workspace_task_id TEXT"],
 ];
+/** 首页目录组顺序的偏好键（app_config 表，与其它 UI 偏好同一套读写）。 */
+const WORKSPACE_GROUP_ORDER_KEY = "workspaceGroupOrder";
 const AUTH_SESSION_MIGRATIONS = [
     ["kind", "ALTER TABLE auth_sessions ADD COLUMN kind TEXT NOT NULL DEFAULT 'browser-admin'"],
     ["scopes", `ALTER TABLE auth_sessions ADD COLUMN scopes TEXT NOT NULL DEFAULT '["admin"]'`],

package/dist/terminal-daemon-server.d.ts

@@ -11,4 +11,4 @@ export interface StructuredRunRetentionEntry {
  */
 export declare function structuredRunEvictionOrder(entries: readonly StructuredRunRetentionEntry[], now?: number): string[];
 export declare function runTerminalDaemon(configPath: string): Promise<void>;
-export declare function readTerminalDaemonPid(configPath: string): number | null;
+export declare function readTerminalDaemonPid(configPath: string, uidOverride?: number): number | null;

package/dist/terminal-daemon-server.js

@@ -531,9 +531,9 @@ function fileHoldsValue(filePath, expected) {
         return false;
     }
 }
-export function readTerminalDaemonPid(configPath) {
+export function readTerminalDaemonPid(configPath, uidOverride) {
     try {
-        const value = Number(readFileSync(terminalDaemonPaths(configPath).pidPath, "utf8").trim());
+        const value = Number(readFileSync(terminalDaemonPaths(configPath, uidOverride).pidPath, "utf8").trim());
         return Number.isSafeInteger(value) && value > 0 ? value : null;
     }
     catch {

package/dist/tui/commands.js

@@ -643,8 +643,23 @@ function terminalServicePathFor(scope) {
     }
     return "";
 }
+/**
+ * 本 config 的 config 文件 owner uid。
+ *
+ * daemon 在 unit/plist 里被钉成 config owner，端点路径里的 uid 也是它；而
+ * `wand service:install` 常常是 sudo 跑的（uid 0），所以任何涉及 daemon 文件的读取
+ * 都必须用这个 uid，不能用调用者的。
+ */
+function configOwnerUid(configPath) {
+    try {
+        return statUid(path.resolve(configPath));
+    }
+    catch {
+        return undefined;
+    }
+}
 function hasLiveTerminalDaemon(configPath) {
-    const pid = readTerminalDaemonPid(configPath);
+    const pid = readTerminalDaemonPid(configPath, configOwnerUid(configPath));
     return pid !== null && isPidAlive(pid);
 }
 /** 按 config 派生两套 daemon 的端点（socket 在 /tmp、pid 在 config 目录旁边）。
@@ -654,14 +669,7 @@ function hasLiveTerminalDaemon(configPath) {
  * 端点，把健康 daemon 当成僵尸（2026-09-24 真实发生过，两个 daemon 被误杀）。
  */
 function daemonEndpointStates(configPath) {
-    const ownerUid = (() => {
-        try {
-            return statUid(path.resolve(configPath));
-        }
-        catch {
-            return undefined;
-        }
-    })();
+    const ownerUid = configOwnerUid(configPath);
     const render = renderPaths(configPath, ownerUid);
     const terminal = terminalDaemonPaths(configPath, ownerUid);
     const endpoints = [
@@ -743,7 +751,7 @@ export function isDaemonProcessForConfig(pid, configPath, kind) {
  * 看不到 detail，所以这句拼进 message 里。
  */
 function staleDaemonNote(configPath) {
-    const render = renderPaths(configPath);
+    const render = renderPaths(configPath, configOwnerUid(configPath));
     const pid = readDaemonPidFile(render.pidPath);
     if (pid === null || !isPidAlive(pid))
         return null;