@cjhyy/code-shell-server 0.9.31 → 0.9.32

package/dist/panels/directory-bookmarks.d.ts

@@ -1,5 +1,10 @@
 import type { InstalledPanelApp } from "@cjhyy/code-shell-core";
 export type PanelDirectoryAuthorizer = (app: InstalledPanelApp, projectPath: string, workspacePath: string) => Promise<void>;
+/** Host-only proof that a workspace still belongs to the expected main project. */
+export declare function createPanelDirectoryProjectScope(workspacePath: string, expectedProjectPath: string): {
+    projectPath: string;
+    assertCurrent(): void;
+};
 export declare function desktopPanelDirectoryBookmarks(dataDir: string): PanelAppDirectoryBookmarks;
 /** The file mutex uses a sibling of its parent; keep both inside the data volume. */
 export declare function hubPanelDirectoryBookmarks(dataDir: string): PanelAppDirectoryBookmarks;
@@ -9,6 +14,8 @@ export declare class PanelAppDirectoryBookmarks {
     private readonly options;
     constructor(file: string, options?: {
         legacyFiles?: readonly string[];
+        /** Supplied only by a trusted Host, never by Panel or browser input. */
+        isLegacyProjectScope?: (expectedProjectPath: string, legacyProjectPath: string) => boolean;
     });
     remember(appId: string, projectPath: string, path: string): string;
     restore(appId: string, projectPath: string, id: unknown): string;

package/dist/panels/directory-bookmarks.js

@@ -2,9 +2,58 @@ import { randomUUID } from "node:crypto";
 import { chmodSync, closeSync, constants, fstatSync, lstatSync, mkdirSync, openSync, readFileSync, realpathSync, renameSync, rmSync, writeFileSync, } from "node:fs";
 import { dirname, isAbsolute, join } from "node:path";
 import { acquireFileLock } from "@cjhyy/code-shell-core/internal";
+import { createHubPanelBinding } from "./hub-binding.js";
+/** Host-only proof that a workspace still belongs to the expected main project. */
+export function createPanelDirectoryProjectScope(workspacePath, expectedProjectPath) {
+    for (const path of [workspacePath, expectedProjectPath]) {
+        if (!isAbsolute(path) || path.length > 32_768 || path.includes("\0"))
+            throw new Error("Invalid Panel directory project scope");
+    }
+    const binding = createHubPanelBinding(workspacePath);
+    binding.assertBinding();
+    const projectPath = realpathSync(expectedProjectPath);
+    const identity = lstatSync(projectPath);
+    if (!identity.isDirectory() ||
+        identity.isSymbolicLink() ||
+        realpathSync(binding.bindingCwd) !== projectPath)
+        throw new Error("Panel directory project scope is unavailable");
+    const assertCurrent = () => {
+        binding.assertBinding();
+        const current = lstatSync(projectPath);
+        if (!current.isDirectory() ||
+            current.isSymbolicLink() ||
+            current.dev !== identity.dev ||
+            current.ino !== identity.ino ||
+            realpathSync(expectedProjectPath) !== projectPath ||
+            realpathSync(binding.bindingCwd) !== projectPath)
+            throw new Error("Panel directory project scope changed");
+    };
+    assertCurrent();
+    return { projectPath, assertCurrent };
+}
 export function desktopPanelDirectoryBookmarks(dataDir) {
+    const scopes = new Map();
     return new PanelAppDirectoryBookmarks(join(dataDir, "panel-app-directory-bookmarks.json"), {
         legacyFiles: [join(dataDir, "panel-web-directory-bookmarks.json")],
+        isLegacyProjectScope(expectedProjectPath, legacyProjectPath) {
+            const key = JSON.stringify([expectedProjectPath, legacyProjectPath]);
+            try {
+                let scope = scopes.get(key);
+                if (!scope) {
+                    scope = createPanelDirectoryProjectScope(legacyProjectPath, expectedProjectPath);
+                    if (scopes.size >= 64)
+                        scopes.delete(scopes.keys().next().value);
+                    scopes.set(key, scope);
+                }
+                // Keep a failed proof frozen: replacing Git metadata must not silently
+                // reauthorize this instance's previously verified worktree association.
+                scope.assertCurrent();
+                return true;
+            }
+            catch {
+                return false;
+            }
+        },
     });
 }
 /** The file mutex uses a sibling of its parent; keep both inside the data volume. */
@@ -156,8 +205,22 @@ export class PanelAppDirectoryBookmarks {
                 }
             }
         }
-        if (!bookmark || bookmark.appId !== appId || bookmark.projectPath !== projectPath)
+        if (!bookmark || bookmark.appId !== appId)
             throw new Error("Saved directory is unavailable; choose it again");
+        const savedProjectPath = bookmark.projectPath;
+        const assertProjectScope = () => {
+            if (savedProjectPath === projectPath)
+                return;
+            try {
+                if (this.options.isLegacyProjectScope?.(projectPath, savedProjectPath) === true)
+                    return;
+            }
+            catch {
+                // The Host proof is optional; a failed proof never relaxes exact scope.
+            }
+            throw new Error("Saved directory is unavailable; choose it again");
+        };
+        assertProjectScope();
         try {
             const info = lstatSync(bookmark.path);
             if (!info.isDirectory() ||
@@ -195,6 +258,7 @@ export class PanelAppDirectoryBookmarks {
                 release();
             }
         }
+        assertProjectScope();
         return bookmark.path;
     }
 }

package/dist/panels/process-service.d.ts

@@ -84,7 +84,9 @@ export declare class PanelAppProcessService {
         name: string;
         handle?: string;
     }>;
-    grantDirectory(owner: PanelProcessOwner, path: string): Promise<{
+    grantDirectory(owner: PanelProcessOwner, path: string, options?: {
+        assertCurrent?: () => void;
+    }): Promise<{
         handle: string;
         path: string;
         name: string;

package/dist/panels/process-service.js

@@ -221,14 +221,20 @@ export class PanelAppProcessService {
         });
         return { available: true, name, handle };
     }
-    async grantDirectory(owner, path) {
+    async grantDirectory(owner, path, options = {}) {
         owner = { ...owner };
         const epoch = this.epoch(owner);
+        options.assertCurrent?.();
         await this.authorize(owner, epoch);
+        options.assertCurrent?.();
         const resolved = await realpath(path);
+        options.assertCurrent?.();
         await this.authorize(owner, epoch);
+        options.assertCurrent?.();
         const info = await stat(resolved);
+        options.assertCurrent?.();
         await this.authorize(owner, epoch);
+        options.assertCurrent?.();
         this.assertLive(owner, epoch);
         if (!info.isDirectory())
             throw new Error("selected process directory is not a directory");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cjhyy/code-shell-server",
-  "version": "0.9.31",
+  "version": "0.9.32",
   "description": "CodeShell server transport layer — mobile remote HTTP/WS host, pairing, passcode gate, tunnel, rooms, uploads, and session/attachment services. Electron-free; precursor of the auth gateway.",
   "type": "module",
   "main": "./dist/index.js",
@@ -60,13 +60,13 @@
     "clean": "node -e \"require('node:fs').rmSync('dist',{recursive:true,force:true})\""
   },
   "dependencies": {
-    "@cjhyy/code-shell-capability-coding": "0.9.31",
-    "@cjhyy/code-shell-core": "0.9.31",
-    "@cjhyy/code-shell-web": "0.9.31",
+    "@cjhyy/code-shell-capability-coding": "0.9.32",
+    "@cjhyy/code-shell-core": "0.9.32",
+    "@cjhyy/code-shell-web": "0.9.32",
     "@modelcontextprotocol/sdk": "^1.31.0",
     "@types/ws": "^8.18.1",
     "ws": "^8.21.0",
-    "@cjhyy/code-shell-link": "0.9.31"
+    "@cjhyy/code-shell-link": "0.9.32"
   },
   "engines": {
     "node": ">=20.10"