@cjhyy/code-shell-server 0.9.36 → 0.9.38

package/dist/project-runtime/registry.js

@@ -2,6 +2,7 @@ import { createHash, randomBytes, randomUUID } from "node:crypto";
 import { constants, chmodSync, closeSync, existsSync, fstatSync, fsyncSync, lstatSync, mkdirSync, openSync, readSync, renameSync, rmSync, writeFileSync, } from "node:fs";
 import { join, resolve } from "node:path";
 import { acquireProjectControllerLock } from "./lock.js";
+import { CLOUD_ADOPTION_PENDING, isCloudAccountBinding, isCloudAccountOrigin, isCloudMultiAccountConfiguration, } from "./account-binding.js";
 const UUID = /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/;
 const TOKEN = /^[A-Za-z0-9_-]{43}$/;
 const STATUSES = new Set(["stopped", "starting", "running", "stopping", "error"]);
@@ -58,9 +59,16 @@ export class ProjectRegistry {
     controllerLock;
     diskDigest;
     markerEstablished = false;
+    storageFailed = false;
     constructor(dataDir, now = Date.now, io = {}) {
         this.now = now;
         this.io = io;
+        if (this.io.multiAccountOrigin !== undefined &&
+            (!isCloudAccountOrigin(this.io.multiAccountOrigin) || this.io.offlineAccountAdoption))
+            throw new Error("Multi-account Cloud requires one explicit canonical Account origin.");
+        if (this.io.multiAccountOrigin &&
+            lstatSync(join(resolve(dataDir), "hub"), { throwIfNoEntry: false }))
+            throw new Error("Multi-account Cloud requires a fresh installation without legacy Hub authority.");
         this.directory = resolve(dataDir, "project-control");
         const existed = existsSync(this.directory);
         mkdirSync(this.directory, { recursive: true, mode: 0o700 });
@@ -72,6 +80,16 @@ export class ProjectRegistry {
         this.marker = join(this.directory, "initialized");
         this.controllerLock = acquireProjectControllerLock(this.directory);
         try {
+            if (!this.io.offlineAccountAdoption) {
+                try {
+                    lstatSync(join(this.directory, CLOUD_ADOPTION_PENDING));
+                    throw new Error("Cloud account adoption is incomplete; retry its explicit offline transaction.");
+                }
+                catch (error) {
+                    if (error.code !== "ENOENT")
+                        throw error;
+                }
+            }
             if (existsSync(this.marker)) {
                 if (privateFileBytes(this.marker, 16).toString() !== "1\n")
                     throw new Error("Project initialization marker is corrupt.");
@@ -81,12 +99,26 @@ export class ProjectRegistry {
                 const bytes = privateFileBytes(this.file);
                 this.data = JSON.parse(bytes.toString("utf8"));
                 this.validate();
+                this.requireConfiguredMode();
                 this.diskDigest = digest(bytes);
             }
             else {
                 if (existsSync(this.marker) || existed)
                     throw new Error("Project registry is missing; restore the existing registry before starting");
-                this.data = { version: 1, installationId: randomUUID(), owners: [], projects: [] };
+                this.data = {
+                    version: this.io.multiAccountOrigin ? 3 : 1,
+                    installationId: randomUUID(),
+                    owners: [],
+                    projects: [],
+                    ...(this.io.multiAccountOrigin
+                        ? {
+                            multiAccount: {
+                                accountOrigin: this.io.multiAccountOrigin,
+                                managementEpoch: randomUUID(),
+                            },
+                        }
+                        : {}),
+                };
                 this.write();
             }
             if (!this.markerEstablished) {
@@ -109,6 +141,10 @@ export class ProjectRegistry {
             throw new Error("Stop all projects before restoring an installation.");
         const next = structuredClone(this.data);
         next.installationId = randomUUID();
+        if (next.accountBinding)
+            next.accountBinding.managementEpoch = randomUUID();
+        if (next.multiAccount)
+            next.multiAccount.managementEpoch = randomUUID();
         for (const project of next.projects) {
             if (project.generation > 0)
                 project.generation += 1;
@@ -122,19 +158,105 @@ export class ProjectRegistry {
         this.assertStorage();
         return this.data.installationId;
     }
+    get accountBinding() {
+        this.assertStorage();
+        return this.data.accountBinding && { ...this.data.accountBinding };
+    }
+    get multiAccount() {
+        this.assertStorage();
+        return this.data.multiAccount && { ...this.data.multiAccount };
+    }
+    /** Called only after trusted authority verification, never with browser-selected identity. */
+    ensureAccountOwner(accountOrigin, accountId) {
+        this.assertStorage();
+        if (this.data.version !== 3 ||
+            accountOrigin !== this.data.multiAccount?.accountOrigin ||
+            typeof accountId !== "string" ||
+            !UUID.test(accountId))
+            throw new ProjectRegistryError(403, "此账号没有工作台权限。");
+        const existing = this.data.owners.find((owner) => "accountId" in owner &&
+            owner.accountOrigin === accountOrigin &&
+            owner.accountId === accountId);
+        if (existing)
+            return existing.id;
+        if (this.data.owners.length >= 128)
+            throw new ProjectRegistryError(429, "工作台账号数量已达到上限。");
+        const next = structuredClone(this.data), ownerId = randomUUID();
+        next.owners.push({ id: ownerId, accountOrigin, accountId });
+        this.write(next);
+        this.data = next;
+        return ownerId;
+    }
+    requireConfiguredMode() {
+        if (this.data.version === 3) {
+            if (this.io.multiAccountOrigin !== this.data.multiAccount?.accountOrigin)
+                throw new Error("Multi-account Cloud requires its configured Account origin; automatic mode adoption is refused.");
+        }
+        else if (this.io.multiAccountOrigin !== undefined) {
+            throw new Error("Multi-account Cloud requires a fresh installation; legacy adoption is refused.");
+        }
+    }
+    /** Offline migration only; the caller must durably preserve source evidence first. */
+    bindAccount(binding) {
+        this.assertStorage();
+        if (this.data.version !== 1 ||
+            this.data.accountBinding !== undefined ||
+            !isCloudAccountBinding(binding) ||
+            this.data.owners.length !== 1 ||
+            this.data.owners[0].id !== binding.ownerId ||
+            this.data.projects.some((project) => project.status !== "stopped"))
+            throw new Error("Cloud adoption requires one explicit legacy owner and stopped projects.");
+        const next = structuredClone(this.data);
+        // The real historical registry rejects version 2. Unknown metadata alone
+        // cannot prevent an old controller from continuing its username authority.
+        next.version = 2;
+        next.accountBinding = { ...binding };
+        this.write(next);
+        this.data = next;
+    }
     validate(data = this.data) {
         if (!data ||
-            data.version !== 1 ||
+            ![1, 2, 3].includes(data.version) ||
             !UUID.test(data.installationId) ||
             !Array.isArray(data.owners) ||
             !Array.isArray(data.projects) ||
             data.owners.length > 128 ||
             data.projects.length > 128)
             throw new Error("Project registry is corrupt; restore its backup");
+        if ((data.version !== 3 && data.multiAccount !== undefined) ||
+            (data.version === 1 && data.accountBinding !== undefined) ||
+            (data.version === 2 &&
+                (!isCloudAccountBinding(data.accountBinding) ||
+                    data.owners.length !== 1 ||
+                    data.owners[0]?.id !== data.accountBinding.ownerId)) ||
+            (data.version === 3 &&
+                (data.accountBinding !== undefined ||
+                    !isCloudMultiAccountConfiguration(data.multiAccount) ||
+                    typeof data.installationId !== "string" ||
+                    Object.keys(data).sort().join() !==
+                        "installationId,multiAccount,owners,projects,version")))
+            throw new Error("Cloud account ownership is missing or corrupt; restore its backup.");
         const owners = new Set();
         const names = new Set();
         for (const owner of data.owners) {
+            if (data.version === 3) {
+                if (!owner ||
+                    typeof owner.id !== "string" ||
+                    !UUID.test(owner.id) ||
+                    owners.has(owner.id) ||
+                    !("accountId" in owner) ||
+                    Object.keys(owner).sort().join() !== "accountId,accountOrigin,id" ||
+                    owner.accountOrigin !== data.multiAccount.accountOrigin ||
+                    typeof owner.accountId !== "string" ||
+                    !UUID.test(owner.accountId) ||
+                    names.has(owner.accountId))
+                    throw new Error("Project account owner registry is corrupt");
+                owners.add(owner.id);
+                names.add(owner.accountId);
+                continue;
+            }
             if (!owner ||
+                !("username" in owner) ||
                 !UUID.test(owner.id) ||
                 typeof owner.username !== "string" ||
                 !owner.username.trim() ||
@@ -149,6 +271,27 @@ export class ProjectRegistry {
         }
         const ids = new Set();
         for (const project of data.projects) {
+            if (data.version === 3 &&
+                (!project ||
+                    typeof project.id !== "string" ||
+                    typeof project.ownerId !== "string" ||
+                    typeof project.runtimePassword !== "string" ||
+                    Object.keys(project).sort().join() !==
+                        [
+                            "id",
+                            "ownerId",
+                            "generation",
+                            "runtimeUsername",
+                            "runtimePassword",
+                            "name",
+                            "status",
+                            "createdAt",
+                            "updatedAt",
+                            ...(project.error === undefined ? [] : ["error"]),
+                        ]
+                            .sort()
+                            .join()))
+                throw new Error("Project account runtime registry is corrupt");
             if (!project ||
                 !UUID.test(project.id) ||
                 ids.has(project.id) ||
@@ -174,6 +317,8 @@ export class ProjectRegistry {
         }
     }
     assertStorage() {
+        if (this.storageFailed)
+            throw new Error("Project registry durability failed; restart and diagnose before continuing.");
         this.controllerLock.assertHeld();
         if (this.markerEstablished && privateFileBytes(this.marker, 16).toString() !== "1\n")
             throw new Error("Project initialization marker changed.");
@@ -192,15 +337,29 @@ export class ProjectRegistry {
             throw new Error("Project registry is too large.");
         const file = join(this.directory, `.registry-${randomUUID()}.tmp`);
         let fd;
+        let committed = false;
         try {
             fd = openSync(file, constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL | (constants.O_NOFOLLOW ?? 0), 0o600);
             writeFileSync(fd, bytes);
-            fsyncSync(fd);
+            (this.io.fsync ?? fsyncSync)(fd);
             closeSync(fd);
             fd = undefined;
             this.assertStorage();
             (this.io.rename ?? renameSync)(file, this.file);
+            committed = true;
             this.diskDigest = digest(bytes);
+            const directory = openSync(this.directory, constants.O_RDONLY);
+            try {
+                (this.io.fsync ?? fsyncSync)(directory);
+            }
+            finally {
+                closeSync(directory);
+            }
+        }
+        catch (error) {
+            if (committed)
+                this.storageFailed = true;
+            throw error;
         }
         finally {
             if (fd !== undefined)
@@ -214,12 +373,14 @@ export class ProjectRegistry {
     }
     list(username) {
         this.assertStorage();
-        const owner = this.data.owners.find((item) => item.username === username);
+        this.requireLegacy();
+        const owner = this.data.owners.find((item) => "username" in item && item.username === username);
         return this.data.projects.filter((item) => item.ownerId === owner?.id).map(projectView);
     }
     get(username, id) {
         this.assertStorage();
-        const owner = this.data.owners.find((item) => item.username === username);
+        this.requireLegacy();
+        const owner = this.data.owners.find((item) => "username" in item && item.username === username);
         const project = this.data.projects.find((item) => item.id === id && item.ownerId === owner?.id);
         if (!project)
             throw new ProjectRegistryError(404, "找不到这个项目。");
@@ -227,6 +388,39 @@ export class ProjectRegistry {
     }
     create(username, name) {
         this.assertStorage();
+        this.requireLegacy();
+        return this.createForOwner(username, name);
+    }
+    listAccount(ownerId) {
+        this.requireAccountOwner(ownerId);
+        return this.data.projects.filter((item) => item.ownerId === ownerId).map(projectView);
+    }
+    getAccount(ownerId, id) {
+        this.requireAccountOwner(ownerId);
+        const project = this.data.projects.find((item) => item.id === id && item.ownerId === ownerId);
+        if (!project)
+            throw new ProjectRegistryError(404, "找不到这个项目。");
+        return { ...project };
+    }
+    createAccount(ownerId, name) {
+        this.requireAccountOwner(ownerId);
+        if (this.data.version === 3)
+            return this.createForAccountOwner(ownerId, name);
+        // This username is internal legacy metadata, never the Account display name.
+        return this.createForOwner(this.data.owners[0].username, name);
+    }
+    requireLegacy() {
+        if (this.data.version !== 1)
+            throw new ProjectRegistryError(403, "此 Cloud 已采用明确的账号归属，请通过云账号管理。");
+    }
+    requireAccountOwner(ownerId) {
+        this.assertStorage();
+        if ((this.data.version === 2 && this.data.accountBinding?.ownerId === ownerId) ||
+            (this.data.version === 3 && this.data.owners.some((owner) => owner.id === ownerId)))
+            return;
+        throw new ProjectRegistryError(403, "此账号没有 Cloud 管理权限。");
+    }
+    createForOwner(username, name) {
         if (typeof name !== "string" ||
             !name.trim() ||
             name.trim().length > 80 ||
@@ -241,7 +435,7 @@ export class ProjectRegistry {
         if (this.data.projects.length >= 32)
             throw new ProjectRegistryError(429, "项目数量已达到上限（32 个）。");
         const next = structuredClone(this.data);
-        let owner = next.owners.find((item) => item.username === username);
+        let owner = next.owners.find((item) => "username" in item && item.username === username);
         if (!owner) {
             owner = { id: randomUUID(), username };
             next.owners.push(owner);
@@ -263,6 +457,30 @@ export class ProjectRegistry {
         this.data = next;
         return { ...project };
     }
+    createForAccountOwner(ownerId, name) {
+        if (typeof name !== "string" ||
+            !name.trim() ||
+            name.trim().length > 80 ||
+            /[\x00-\x1f\x7f]/.test(name))
+            throw new ProjectRegistryError(400, "请输入 1 至 80 个字符的项目名称。");
+        if (this.data.projects.length >= 128)
+            throw new ProjectRegistryError(429, "工作台项目数量已达到上限（128 个）。");
+        const next = structuredClone(this.data), timestamp = this.now(), project = {
+            id: randomUUID(),
+            ownerId,
+            name: name.trim(),
+            status: "stopped",
+            generation: 0,
+            runtimeUsername: "project-runtime",
+            runtimePassword: randomBytes(32).toString("base64url"),
+            createdAt: timestamp,
+            updatedAt: timestamp,
+        };
+        next.projects.push(project);
+        this.write(next);
+        this.data = next;
+        return { ...project };
+    }
     update(id, patch) {
         this.assertStorage();
         const index = this.data.projects.findIndex((item) => item.id === id);

package/dist/serve/headless-server.js

@@ -594,6 +594,20 @@ export async function startHeadlessServer(opts) {
             hubJson(res, 200, { status: "ok", mode: hubAuth ? "hub" : "passcode" });
             return;
         }
+        // The public shell probes this before login. A standalone workspace has no
+        // Cloud browser authority; an explicit miss selects its existing Hub gate.
+        if (pathname === "/api/v1/cloud-browser/capabilities") {
+            if (req.url !== pathname) {
+                hubJson(res, 400, { error: "request parameters are not supported" });
+            }
+            else if (req.method !== "GET") {
+                hubJson(res, 405, { error: "method not allowed" });
+            }
+            else {
+                hubJson(res, 404, { error: "API endpoint not found" });
+            }
+            return;
+        }
         if (hubAuth) {
             if (await links?.handlePublic(req, res))
                 return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cjhyy/code-shell-server",
-  "version": "0.9.36",
+  "version": "0.9.38",
   "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",
@@ -49,7 +49,8 @@
   },
   "bin": {
     "code-shell-serve": "./dist/bin/code-shell-serve.js",
-    "code-shell-settings-recovery": "./dist/bin/code-shell-settings-recovery.js"
+    "code-shell-settings-recovery": "./dist/bin/code-shell-settings-recovery.js",
+    "code-shell-cloud-account": "./dist/bin/code-shell-cloud-account.js"
   },
   "files": [
     "dist"
@@ -60,13 +61,13 @@
     "clean": "node -e \"require('node:fs').rmSync('dist',{recursive:true,force:true})\""
   },
   "dependencies": {
-    "@cjhyy/code-shell-capability-coding": "0.9.36",
-    "@cjhyy/code-shell-core": "0.9.36",
-    "@cjhyy/code-shell-web": "0.9.36",
+    "@cjhyy/code-shell-capability-coding": "0.9.38",
+    "@cjhyy/code-shell-core": "0.9.38",
+    "@cjhyy/code-shell-web": "0.9.38",
     "@modelcontextprotocol/sdk": "^1.31.0",
     "@types/ws": "^8.18.1",
     "ws": "^8.21.0",
-    "@cjhyy/code-shell-link": "0.9.36"
+    "@cjhyy/code-shell-link": "0.9.38"
   },
   "engines": {
     "node": ">=20.10"