@fxz26284407/yuanma-gateway 0.1.8 → 0.1.9

package/dist/codex.js

@@ -28,7 +28,7 @@ export class CodexBackend {
     directoryScopes = new Map();
     nativeProjects = new Set();
     directoryId(path) { return 'codex-directory:' + createHash('sha256').update(path).digest('hex'); }
-    nativeProjectId(id) { if (this.directoryScopes.has(id))
+    nativeProjectId(id) { if (id === 'codex:default' || this.directoryScopes.has(id))
         return null; requireValue(!platform.codex.directoryScopes || this.nativeProjects.has(id), 'PROJECT_FORBIDDEN', '不是当前 Codex 目录或项目', 403); return id; }
     ready = false;
     permissionSelections = new Map();
@@ -178,7 +178,17 @@ export class CodexBackend {
             if (this.directoryScopes.has(id))
                 return id;
         }
-        return null;
+        if (legacy)
+            return null;
+        const defaults = this.projects.find(p => p.id === 'codex:default');
+        if (!defaults)
+            return null;
+        const cwd = typeof thread.cwd === 'string' ? await realpath(thread.cwd).catch(() => null) : null;
+        if (!cwd)
+            return null;
+        if (!defaults.roots.includes(cwd))
+            defaults.roots.push(cwd);
+        return defaults.id;
     }
     async inspect(projectId, threadId) {
         if (this.fresh.has(threadId))
@@ -489,12 +499,21 @@ export class CodexBackend {
             requireValue(false, 'INVALID_REQUEST', 'Unknown thread action', 400);
         return this.threadMeta(projectId, threadId);
     }
+    async navigationThreads(cursor, limit = 100) {
+        return this.call('thread/list', { limit, useStateDbOnly: true, sortKey: 'updated_at', ...(cursor && cursor !== 'start' ? { cursor } : {}) });
+    }
     async navigation(grants) {
-        const [projects, sections, threads, state] = await Promise.all([this.call('project/list', { limit: 100 }), this.call('threadSection/list', { limit: 100 }), this.call('thread/list', { limit: 100, useStateDbOnly: true, sortKey: 'updated_at' }), desktopSidebarState()]);
+        const [projects, sections, threads, state] = await Promise.all([this.call('project/list', { limit: 100 }), this.call('threadSection/list', { limit: 100 }), this.navigationThreads(), desktopSidebarState()]);
         await this.desktopSync?.recover(projects.data);
-        const directoryProjects = this.projects.filter(p => this.directoryScopes.has(p.id));
-        const assigned = platform.codex.directoryScopes ? await Promise.all(threads.data.map(async (t) => ({ ...t, projectId: await this.assignedProject(t) }))) : threads.data;
-        return { ...buildSidebar([...projects.data, ...directoryProjects], sections.data, assigned, state, grants, this.desktopSync?.placements()), desktopSync: this.desktopSync?.status(grants) };
+        const directoryProjects = this.projects.filter(p => p.id === 'codex:default' || this.directoryScopes.has(p.id));
+        const assigned = await Promise.all(threads.data.map(async (t) => ({ ...t, projectId: await this.assignedProject(t) })));
+        const navigation = buildSidebar([...projects.data, ...directoryProjects], sections.data, assigned, state, grants, this.desktopSync?.placements());
+        const defaults = navigation.projects.find(p => p.id === 'codex:default');
+        if (defaults) {
+            defaults.threads = [];
+            Object.assign(defaults, { nextCursor: 'start' });
+        }
+        return { ...navigation, desktopSync: this.desktopSync?.status(grants) };
     }
     async manageProject(projectId, action, value) {
         requireValue(this.projects.some(p => p.id === projectId), 'PROJECT_FORBIDDEN', '没有此项目的操作权限', 403);
@@ -541,11 +560,9 @@ export class CodexBackend {
         } while (cursor && projects.length < 2000);
         this.nativeProjects = new Set(projects.map(p => p.id));
         if (platform.codex.directoryScopes) {
-            const directories = new Map();
-            let seen = 0;
-            cursor = undefined;
-            do {
-                const page = await this.call('thread/list', { limit: 100, useStateDbOnly: true, ...(cursor ? { cursor } : {}) });
+            const directories = new Map(this.directoryScopes);
+            {
+                const page = await this.navigationThreads();
                 for (const thread of page.data) {
                     if (thread.projectId || typeof thread.cwd !== 'string')
                         continue;
@@ -553,13 +570,21 @@ export class CodexBackend {
                     if (path)
                         directories.set(this.directoryId(path), path);
                 }
-                seen += page.data.length;
-                cursor = page.nextCursor ?? undefined;
-            } while (cursor && seen < 2000);
+            }
             this.directoryScopes = directories;
             for (const [id, path] of directories)
                 projects.push({ id, name: basename(path) || path, roots: [path] });
         }
+        const roots = [...(this.projects.find(p => p.id === 'codex:default')?.roots ?? [])];
+        const state = await desktopSidebarState();
+        for (const thread of (await this.navigationThreads()).data) {
+            if (thread.projectId || state.assignments[thread.id]?.projectId || typeof thread.cwd !== 'string')
+                continue;
+            const path = await realpath(thread.cwd).catch(() => null);
+            if (path && !roots.includes(path))
+                roots.push(path);
+        }
+        projects.push({ id: 'codex:default', name: '默认项目', roots: roots.length ? roots : [...(projects[0]?.roots ?? this.projects[0]?.roots ?? [])] });
         return projects;
     }
     replaceProjects(projects) { this.projects.splice(0, this.projects.length, ...projects); }
@@ -675,11 +700,11 @@ export class CodexBackend {
         await this.authorize(projectId, result.thread.id);
         return { id: result.thread.id, name: result.thread.name ?? '新会话', status: result.thread.status?.type ?? 'idle' };
     }
-    async listThreads(projectId) {
+    async listThreads(projectId, cursor) {
         const project = this.projects.find(p => p.id === projectId);
         requireValue(project, 'PROJECT_FORBIDDEN', 'Project is not locally authorized', 403);
         const roots = await Promise.all(project.roots.map(p => realpath(p)));
-        const page = await this.call('thread/list', { limit: 100, useStateDbOnly: true, sortKey: 'updated_at' });
+        const page = await this.navigationThreads(cursor, projectId === 'codex:default' ? 20 : 100);
         const data = [];
         for (const thread of page.data) {
             if (await this.assignedProject(thread) !== projectId)
@@ -687,7 +712,7 @@ export class CodexBackend {
             const cwd = await realpath(thread.cwd).catch(() => null);
             if (!cwd)
                 continue;
-            if (!roots.some(root => { const r = relative(root, cwd); return r === '' || (!isAbsolute(r) && r !== '..' && !r.startsWith(`..${sep}`)); }))
+            if (projectId !== 'codex:default' && !roots.some(root => { const r = relative(root, cwd); return r === '' || (!isAbsolute(r) && r !== '..' && !r.startsWith(`..${sep}`)); }))
                 continue;
             data.push({ id: thread.id, name: threadDisplayName(thread), status: thread.status?.type ?? 'notLoaded', model: thread.model ?? null });
         }

package/dist/desktop-sync.js

@@ -0,0 +1,163 @@
+import { execFile } from 'node:child_process';
+import { promisify } from 'node:util';
+import { readFile, writeFile, rename, lstat, unlink, open } from 'node:fs/promises';
+import { homedir } from 'node:os';
+import { join, isAbsolute } from 'node:path';
+import { randomUUID } from 'node:crypto';
+import { requireValue } from './domain.js';
+const execute = promisify(execFile);
+const statePath = join(homedir(), '.codex/.codex-global-state.json');
+async function desktopRunning() {
+    const { stdout } = await execute('/bin/ps', ['-axo', 'comm=']);
+    return stdout.split('\n').some(p => /\/(?:ChatGPT|Codex)\.app\/Contents\/MacOS\/(?:ChatGPT|Codex)$/.test(p.trim()));
+}
+async function regularFile(path, optional = false) {
+    const st = await lstat(path).catch(e => { if (optional && e.code === 'ENOENT')
+        return null; throw e; });
+    requireValue(!st || (st.isFile() && !st.isSymbolicLink() && st.nlink === 1 && st.uid === process.getuid?.()), 'UNSAFE_STORAGE', '桌面同步文件必须由当前用户持有，且不能是符号链接');
+    return st;
+}
+async function replaceFile(path, value, mode = 0o600) {
+    const temp = path + '.' + randomUUID() + '.tmp';
+    try {
+        const f = await open(temp, 'wx', mode);
+        try {
+            await f.writeFile(value);
+            await f.sync();
+        }
+        finally {
+            await f.close();
+        }
+        await rename(temp, path);
+    }
+    finally {
+        await unlink(temp).catch(e => { if (e.code !== 'ENOENT')
+            throw e; });
+    }
+}
+// Only project registration, names, order and section membership change. All other state stays intact.
+export function applyDesktopProjectChanges(state, changes) {
+    const next = structuredClone(state), identity = 'local:' + join(homedir(), '.codex');
+    const projects = next['local-projects'] ??= {};
+    const mappings = next['app-server-project-id-by-legacy-project-id-by-host'] ??= {};
+    const mapping = mappings[identity] ??= {};
+    const atoms = next['electron-persisted-atom-state'] ??= {};
+    const order = next['project-order'] ??= [];
+    const sidebarOrder = atoms['unified-sidebar-project-order-v1'] ??= [];
+    for (const change of changes) {
+        requireValue(/^[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}$/i.test(change.id) && change.name.trim().length > 0 && change.roots.length > 0 && change.roots.every(isAbsolute), 'INVALID_PROJECT', '待同步的项目记录不完整');
+        const id = Object.keys(mapping).find(id => mapping[id] === change.id && projects[id]) ?? change.id;
+        requireValue(!mapping[id] || mapping[id] === change.id, 'PROJECT_CONFLICT', '桌面项目映射已变化，请重新核对');
+        const deletions = next['app-server-pending-project-deletions-by-host']?.[identity] ?? {};
+        requireValue(!deletions[id] && !Object.values(deletions).some((d) => d.projectId === change.id), 'PROJECT_CONFLICT', '此项目正在桌面删除，请先在桌面处理');
+        mapping[id] = change.id;
+        if (!projects[id])
+            projects[id] = { id, name: change.name, rootPaths: change.roots, createdAt: Date.now(), updatedAt: Date.now() };
+        else if (change.rename && projects[id].name !== change.name)
+            projects[id] = { ...projects[id], name: change.name, updatedAt: Date.now() };
+        if (!order.includes(id))
+            order.push(id);
+        const key = 'codex:project:' + id;
+        if (!sidebarOrder.includes(key))
+            sidebarOrder.push(key);
+        if (change.sectionId === undefined)
+            continue;
+        const scopes = Object.values(atoms['sidebar-custom-sections-v3'] ?? {});
+        const belongs = (k) => k.startsWith('codex:project:') && (mapping[k.slice(14)] ?? k.slice(14)) === change.id;
+        const matches = scopes.filter(s => s.sections?.some((g) => change.sectionId ? g.hostSectionIds?.local === change.sectionId : (g.itemKeys ?? []).some(belongs)));
+        requireValue(change.sectionId ? matches.length === 1 : matches.length <= 1, 'SECTION_CONFLICT', '桌面分区已变化或存在多个账号归属，请重新选择分区');
+        for (const scope of matches)
+            for (const group of scope.sections) {
+                group.itemKeys = (group.itemKeys ?? []).filter((k) => !belongs(k));
+                if (change.sectionId && group.hostSectionIds?.local === change.sectionId)
+                    group.itemKeys.push(key);
+            }
+    }
+    return next;
+}
+export class DesktopProjectSync {
+    directory;
+    journal = { version: 1, pending: {}, imported: [], appliedAt: 0 };
+    work = Promise.resolve();
+    timer;
+    problem = '';
+    closed = false;
+    constructor(directory) {
+        this.directory = directory;
+    }
+    get path() { return join(this.directory, 'desktop-project-sync.json'); }
+    run(action) { const result = this.work.then(action); this.work = result.then(() => { }, () => { }); return result; }
+    async start() {
+        await regularFile(this.path, true);
+        try {
+            const value = JSON.parse(await readFile(this.path, 'utf8'));
+            requireValue(value.version === 1 && value.pending && Array.isArray(value.imported) && typeof value.appliedAt === 'number', 'UNSAFE_STORAGE', '无法读取桌面待同步记录');
+            this.journal = value;
+        }
+        catch (e) {
+            if (e.code !== 'ENOENT')
+                throw e;
+        }
+        // ponytail: one queue serializes this small state file; separate locks only if multiple writers are introduced.
+        this.timer = setInterval(() => { if (Object.keys(this.journal.pending).length)
+            this.flush().catch(e => { this.problem = e instanceof Error ? e.message : '桌面同步失败，请刷新后重试'; }); }, 2000);
+        this.timer.unref();
+    }
+    async persist(value = this.journal) { await regularFile(this.path, true); await replaceFile(this.path, JSON.stringify(value)); }
+    enqueue(change) {
+        return this.run(async () => {
+            const next = structuredClone(this.journal);
+            next.pending[change.id] = { ...next.pending[change.id], ...change, rename: next.pending[change.id]?.rename || change.rename };
+            if (!next.imported.includes(change.id))
+                next.imported.push(change.id);
+            await this.persist(next);
+            this.journal = next;
+            this.problem = '';
+        });
+    }
+    recover(projects) {
+        return this.run(async () => {
+            let changed = false;
+            const next = structuredClone(this.journal);
+            for (const p of projects) {
+                const sectionId = p.metadata?.['mobile.sectionId'];
+                if (typeof sectionId !== 'string' || next.imported.includes(p.id))
+                    continue;
+                if (!next.pending[p.id])
+                    next.pending[p.id] = { id: p.id, name: p.name, roots: p.roots.map((r) => r.path), sectionId };
+                next.imported.push(p.id);
+                changed = true;
+            }
+            if (changed) {
+                await this.persist(next);
+                this.journal = next;
+            }
+        });
+    }
+    status(grants) { const pending = Object.values(this.journal.pending).filter(p => !!grants[p.id]); return { pending: pending.length, appliedAt: this.journal.appliedAt, error: pending.length ? this.problem : '' }; }
+    placements() { return Object.values(this.journal.pending).filter(p => p.sectionId !== undefined).map(p => ({ id: p.id, sectionId: p.sectionId })); }
+    flush() {
+        return this.run(async () => {
+            if (this.closed || !Object.keys(this.journal.pending).length || await desktopRunning())
+                return;
+            const stat = (await regularFile(statePath));
+            await regularFile(statePath + '.bak', true);
+            const original = await readFile(statePath, 'utf8'), state = JSON.parse(original);
+            requireValue(state && typeof state === 'object' && !Array.isArray(state), 'UNSAFE_STORAGE', '桌面状态格式无效');
+            const updated = JSON.stringify(applyDesktopProjectChanges(state, Object.values(this.journal.pending)));
+            const backup = join(this.directory, 'desktop-state-before-sync-' + Date.now() + '.json');
+            await writeFile(backup, original, { flag: 'wx', mode: 0o600 });
+            // Desktop must stay closed until the phone reports completion; it does not reload external file changes.
+            if (this.closed || await desktopRunning() || await readFile(statePath, 'utf8') !== original)
+                return;
+            await replaceFile(statePath, updated, stat.mode & 0o777);
+            await replaceFile(statePath + '.bak', updated, 0o600);
+            const next = { ...this.journal, pending: {}, appliedAt: Date.now() };
+            await this.persist(next);
+            this.journal = next;
+            this.problem = '';
+        });
+    }
+    async close() { this.closed = true; if (this.timer)
+        clearInterval(this.timer); await this.work; }
+}

package/dist/project-access.js

@@ -42,7 +42,10 @@ export class ProjectAccess {
             return;
         this.syncing = (async () => {
             const results = await Promise.allSettled(this.catalogBackends.filter(b => b.projectCatalog).map(b => b.projectCatalog()));
-            const catalog = results.flatMap(r => r.status === 'fulfilled' ? r.value : []), next = this.projects.map(p => ({ ...p, name: catalog.find(c => c.id === p.id)?.name ?? p.name })), seen = new Set(next.map(p => p.id));
+            const catalog = results.flatMap(r => r.status === 'fulfilled' ? r.value : []), next = this.projects.map(p => {
+                const current = catalog.find(c => c.id === p.id);
+                return { ...p, name: current?.name ?? p.name, roots: p.id === 'codex:default' && current ? current.roots : p.roots };
+            }), seen = new Set(next.map(p => p.id));
             for (const p of catalog) {
                 if (seen.has(p.id))
                     continue;

package/dist/server.js

@@ -677,7 +677,7 @@ export async function startGateway(options) {
             const projectId = text(url.searchParams.get('projectId'), 'projectId');
             allowed(projectId, actor);
             requireValue(current().backend.listThreads, 'UNSUPPORTED_COMMAND', 'Thread catalog unavailable', 503);
-            return current().backend.listThreads(projectId);
+            return current().backend.listThreads(projectId, url.searchParams.get('cursor') ?? undefined);
         }
         if (req.method === 'GET' && url.pathname === '/v1/approvals') {
             const projectId = text(url.searchParams.get('projectId'), 'projectId');
@@ -817,7 +817,7 @@ export async function startGateway(options) {
                     const projectId = text(url.searchParams.get('projectId'), 'projectId');
                     allowed(projectId);
                     requireValue(current().backend.listThreads, 'UNSUPPORTED_COMMAND', 'Thread catalog unavailable', 503);
-                    send(res, 200, { requestId, data: await current().backend.listThreads(projectId) });
+                    send(res, 200, { requestId, data: await current().backend.listThreads(projectId, url.searchParams.get('cursor') ?? undefined) });
                     return;
                 }
                 const opMatch = url.pathname.match(/^\/v1\/operations\/([^/]+)$/);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fxz26284407/yuanma-gateway",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "type": "module",
   "engines": {
     "node": "22.x"