aws-runtime-bridge 1.0.3 → 1.1.0

package/dist/services/process-detector.js

@@ -715,7 +715,7 @@ function getChildProcesses(pid) {
  * @param timeoutMs 超时时间（毫秒）
  * @returns 是否成功终止
  */
-export function waitForProcessExit(pid, timeoutMs = 5000) {
+export async function waitForProcessExit(pid, timeoutMs = 5000) {
     const startTime = Date.now();
     while (Date.now() - startTime < timeoutMs) {
         if (!isProcessRunning(pid)) {
@@ -724,16 +724,7 @@ export function waitForProcessExit(pid, timeoutMs = 5000) {
         // 等待 100ms 后重试
         const delay = Math.min(100, timeoutMs - (Date.now() - startTime));
         if (delay > 0) {
-            try {
-                Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, delay);
-            }
-            catch {
-                // SharedArrayBuffer 不可用时回退到 setTimeout
-                const startWait = Date.now();
-                while (Date.now() - startWait < delay) {
-                    // 忙等待
-                }
-            }
+            await new Promise(resolve => setTimeout(resolve, delay));
         }
     }
     return false;

package/dist/services/process-registry.d.ts

@@ -72,6 +72,7 @@ export declare class ProcessRegistry {
      * 持久化注册表状态到文件
      */
     private persist;
+    private mutate;
     /**
      * 注册新进程
      *

package/dist/services/process-registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"process-registry.d.ts","sourceRoot":"","sources":["../../src/services/process-registry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"process-registry.d.ts","sourceRoot":"","sources":["../../src/services/process-registry.ts"],"names":[],"mappings":"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"}

package/dist/services/process-registry.js

@@ -7,7 +7,7 @@ import os from 'node:os';
 import path from 'node:path';
 import { promises as fs } from 'node:fs';
 import { createLogger } from '../utils/logger.js';
-import { ensureDir } from '../utils/file-utils.js';
+import { atomicWriteJsonFile, withFileLock } from '../utils/file-utils.js';
 const log = createLogger('process-registry');
 /**
  * 获取持久化注册表文件路径
@@ -47,15 +47,17 @@ export class ProcessRegistry {
     async persist() {
         const filePath = getProcessRegistryFile();
         try {
-            await ensureDir(path.dirname(filePath));
             const records = Array.from(this.records.values());
-            await fs.writeFile(filePath, JSON.stringify(records, null, 2), 'utf-8');
+            await atomicWriteJsonFile(filePath, records);
             log.debug(`[persist] 已持久化 ${records.length} 条进程记录`);
         }
         catch (error) {
             log.error('[persist] 持久化失败:', error);
         }
     }
+    async mutate(operation) {
+        return withFileLock(getProcessRegistryFile(), async () => operation());
+    }
     /**
      * 注册新进程
      *
@@ -63,19 +65,21 @@ export class ProcessRegistry {
      * @returns 是否注册成功
      */
     async register(record) {
-        const fullRecord = {
-            ...record,
-            createdAt: new Date().toISOString(),
-        };
-        // 如果已存在相同 agentId，先移除旧的映射
-        const existing = this.records.get(record.agentId);
-        if (existing) {
-            this.pidToAgentId.delete(existing.pid);
-        }
-        this.records.set(record.agentId, fullRecord);
-        this.pidToAgentId.set(record.pid, record.agentId);
-        log.info(`[register] 注册进程: agentId=${record.agentId}, pid=${record.pid}, mode=${record.mode}, state=${record.state}`);
-        await this.persist();
+        await this.mutate(async () => {
+            const fullRecord = {
+                ...record,
+                createdAt: new Date().toISOString(),
+            };
+            // 如果已存在相同 agentId，先移除旧的映射
+            const existing = this.records.get(record.agentId);
+            if (existing) {
+                this.pidToAgentId.delete(existing.pid);
+            }
+            this.records.set(record.agentId, fullRecord);
+            this.pidToAgentId.set(record.pid, record.agentId);
+            log.info(`[register] 注册进程: agentId=${record.agentId}, pid=${record.pid}, mode=${record.mode}, state=${record.state}`);
+            await this.persist();
+        });
     }
     /**
      * 更新进程记录
@@ -85,20 +89,22 @@ export class ProcessRegistry {
      * @returns 是否更新成功
      */
     async update(agentId, updates) {
-        const record = this.records.get(agentId);
-        if (!record) {
-            log.warn(`[update] 未找到进程: agentId=${agentId}`);
-            return false;
-        }
-        // 如果更新包含 pid，需要更新 pid 映射
-        if (updates.pid !== undefined && updates.pid !== record.pid) {
-            this.pidToAgentId.delete(record.pid);
-            this.pidToAgentId.set(updates.pid, agentId);
-        }
-        Object.assign(record, updates);
-        log.debug(`[update] 更新进程: agentId=${agentId}, updates=${JSON.stringify(updates)}`);
-        await this.persist();
-        return true;
+        return this.mutate(async () => {
+            const record = this.records.get(agentId);
+            if (!record) {
+                log.warn(`[update] 未找到进程: agentId=${agentId}`);
+                return false;
+            }
+            // 如果更新包含 pid，需要更新 pid 映射
+            if (updates.pid !== undefined && updates.pid !== record.pid) {
+                this.pidToAgentId.delete(record.pid);
+                this.pidToAgentId.set(updates.pid, agentId);
+            }
+            Object.assign(record, updates);
+            log.debug(`[update] 更新进程: agentId=${agentId}, updates=${JSON.stringify(updates)}`);
+            await this.persist();
+            return true;
+        });
     }
     /**
      * 通过 agentId 获取进程记录
@@ -164,16 +170,18 @@ export class ProcessRegistry {
      * @returns 是否标记成功
      */
     async markOrphaned(agentId) {
-        const record = this.records.get(agentId);
-        if (!record) {
-            log.warn(`[markOrphaned] 未找到进程: agentId=${agentId}`);
-            return false;
-        }
-        record.state = 'orphaned';
-        record.orphanedAt = new Date().toISOString();
-        log.info(`[markOrphaned] 标记进程为孤儿: agentId=${agentId}, orphanedAt=${record.orphanedAt}`);
-        await this.persist();
-        return true;
+        return this.mutate(async () => {
+            const record = this.records.get(agentId);
+            if (!record) {
+                log.warn(`[markOrphaned] 未找到进程: agentId=${agentId}`);
+                return false;
+            }
+            record.state = 'orphaned';
+            record.orphanedAt = new Date().toISOString();
+            log.info(`[markOrphaned] 标记进程为孤儿: agentId=${agentId}, orphanedAt=${record.orphanedAt}`);
+            await this.persist();
+            return true;
+        });
     }
     /**
      * 标记进程为终止状态
@@ -182,15 +190,17 @@ export class ProcessRegistry {
      * @returns 是否标记成功
      */
     async markTerminated(agentId) {
-        const record = this.records.get(agentId);
-        if (!record) {
-            log.warn(`[markTerminated] 未找到进程: agentId=${agentId}`);
-            return false;
-        }
-        record.state = 'terminated';
-        log.info(`[markTerminated] 标记进程为终止: agentId=${agentId}`);
-        await this.persist();
-        return true;
+        return this.mutate(async () => {
+            const record = this.records.get(agentId);
+            if (!record) {
+                log.warn(`[markTerminated] 未找到进程: agentId=${agentId}`);
+                return false;
+            }
+            record.state = 'terminated';
+            log.info(`[markTerminated] 标记进程为终止: agentId=${agentId}`);
+            await this.persist();
+            return true;
+        });
     }
     /**
      * 移除进程记录
@@ -199,16 +209,18 @@ export class ProcessRegistry {
      * @returns 是否移除成功
      */
     async remove(agentId) {
-        const record = this.records.get(agentId);
-        if (!record) {
-            log.warn(`[remove] 未找到进程: agentId=${agentId}`);
-            return false;
-        }
-        this.records.delete(agentId);
-        this.pidToAgentId.delete(record.pid);
-        log.info(`[remove] 移除进程: agentId=${agentId}, pid=${record.pid}`);
-        await this.persist();
-        return true;
+        return this.mutate(async () => {
+            const record = this.records.get(agentId);
+            if (!record) {
+                log.warn(`[remove] 未找到进程: agentId=${agentId}`);
+                return false;
+            }
+            this.records.delete(agentId);
+            this.pidToAgentId.delete(record.pid);
+            log.info(`[remove] 移除进程: agentId=${agentId}, pid=${record.pid}`);
+            await this.persist();
+            return true;
+        });
     }
     /**
      * 更新进程心跳时间
@@ -217,15 +229,17 @@ export class ProcessRegistry {
      * @returns 是否更新成功
      */
     async updateHeartbeat(agentId) {
-        const record = this.records.get(agentId);
-        if (!record) {
-            log.warn(`[updateHeartbeat] 未找到进程: agentId=${agentId}`);
-            return false;
-        }
-        record.lastHeartbeat = new Date().toISOString();
-        log.debug(`[updateHeartbeat] 更新心跳: agentId=${agentId}, lastHeartbeat=${record.lastHeartbeat}`);
-        await this.persist();
-        return true;
+        return this.mutate(async () => {
+            const record = this.records.get(agentId);
+            if (!record) {
+                log.warn(`[updateHeartbeat] 未找到进程: agentId=${agentId}`);
+                return false;
+            }
+            record.lastHeartbeat = new Date().toISOString();
+            log.debug(`[updateHeartbeat] 更新心跳: agentId=${agentId}, lastHeartbeat=${record.lastHeartbeat}`);
+            await this.persist();
+            return true;
+        });
     }
     /**
      * 更新进程健康状态
@@ -235,15 +249,17 @@ export class ProcessRegistry {
      * @returns 是否更新成功
      */
     async updateHealth(agentId, health) {
-        const record = this.records.get(agentId);
-        if (!record) {
-            log.warn(`[updateHealth] 未找到进程: agentId=${agentId}`);
-            return false;
-        }
-        record.healthStatus = health;
-        log.debug(`[updateHealth] 更新健康状态: agentId=${agentId}, health=${JSON.stringify(health)}`);
-        await this.persist();
-        return true;
+        return this.mutate(async () => {
+            const record = this.records.get(agentId);
+            if (!record) {
+                log.warn(`[updateHealth] 未找到进程: agentId=${agentId}`);
+                return false;
+            }
+            record.healthStatus = health;
+            log.debug(`[updateHealth] 更新健康状态: agentId=${agentId}, health=${JSON.stringify(health)}`);
+            await this.persist();
+            return true;
+        });
     }
     /**
      * 从持久化会话重建注册表
@@ -251,30 +267,32 @@ export class ProcessRegistry {
      * @param sessions - 持久化会话数组
      */
     async rebuildFromPersisted(sessions) {
-        log.info(`[rebuildFromPersisted] 从 ${sessions.length} 个持久化会话重建注册表`);
-        this.records.clear();
-        this.pidToAgentId.clear();
-        for (const session of sessions) {
-            if (!session.pid) {
-                log.warn(`[rebuildFromPersisted] 跳过无 PID 的会话: agentId=${session.agentId}`);
-                continue;
+        await this.mutate(async () => {
+            log.info(`[rebuildFromPersisted] 从 ${sessions.length} 个持久化会话重建注册表`);
+            this.records.clear();
+            this.pidToAgentId.clear();
+            for (const session of sessions) {
+                if (!session.pid) {
+                    log.warn(`[rebuildFromPersisted] 跳过无 PID 的会话: agentId=${session.agentId}`);
+                    continue;
+                }
+                const record = {
+                    agentId: session.agentId,
+                    sessionId: session.sessionId,
+                    pid: session.pid,
+                    mode: session.mode || 'sdk',
+                    state: 'unknown', // 重建时状态未知，需要外部检测
+                    workspacePath: session.workspacePath || '',
+                    command: session.command || '',
+                    createdAt: new Date().toISOString(),
+                };
+                this.records.set(record.agentId, record);
+                this.pidToAgentId.set(record.pid, record.agentId);
+                log.debug(`[rebuildFromPersisted] 重建进程记录: agentId=${record.agentId}, pid=${record.pid}`);
             }
-            const record = {
-                agentId: session.agentId,
-                sessionId: session.sessionId,
-                pid: session.pid,
-                mode: session.mode || 'sdk',
-                state: 'unknown', // 重建时状态未知，需要外部检测
-                workspacePath: session.workspacePath || '',
-                command: session.command || '',
-                createdAt: new Date().toISOString(),
-            };
-            this.records.set(record.agentId, record);
-            this.pidToAgentId.set(record.pid, record.agentId);
-            log.debug(`[rebuildFromPersisted] 重建进程记录: agentId=${record.agentId}, pid=${record.pid}`);
-        }
-        log.info(`[rebuildFromPersisted] 重建完成，共 ${this.records.size} 条记录`);
-        await this.persist();
+            log.info(`[rebuildFromPersisted] 重建完成，共 ${this.records.size} 条记录`);
+            await this.persist();
+        });
     }
     /**
      * 导出所有进程记录用于持久化
@@ -308,11 +326,13 @@ export class ProcessRegistry {
      * 清空所有进程记录
      */
     async clear() {
-        const count = this.records.size;
-        this.records.clear();
-        this.pidToAgentId.clear();
-        log.info(`[clear] 清空所有进程记录: ${count} 条`);
-        await this.persist();
+        await this.mutate(async () => {
+            const count = this.records.size;
+            this.records.clear();
+            this.pidToAgentId.clear();
+            log.info(`[clear] 清空所有进程记录: ${count} 条`);
+            await this.persist();
+        });
     }
 }
 ProcessRegistry.instance = null;
@@ -348,7 +368,8 @@ export async function loadPersistedProcessRegistry() {
  */
 export async function savePersistedProcessRegistry(records) {
     const filePath = getProcessRegistryFile();
-    await ensureDir(path.dirname(filePath));
-    await fs.writeFile(filePath, JSON.stringify(records, null, 2), 'utf-8');
-    log.debug(`[savePersistedProcessRegistry] 保存了 ${records.length} 条进程记录`);
+    await withFileLock(filePath, async () => {
+        await atomicWriteJsonFile(filePath, records);
+        log.debug(`[savePersistedProcessRegistry] 保存了 ${records.length} 条进程记录`);
+    });
 }

package/dist/services/terminal-persistence.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terminal-persistence.d.ts","sourceRoot":"","sources":["../../src/services/terminal-persistence.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAKpD;;;;GAIG;AACH,wBAAgB,wBAAwB,IAAI,MAAM,CAEjD;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAUzE;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAIvF;AAED;;;;GAIG;AACH,wBAAsB,sBAAsB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CASrF;AAED;;;;GAIG;AACH,wBAAsB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAoB7E;AAED;;;;;GAKG;AACH,wBAAsB,6BAA6B,CACjD,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAGvC;AAED;;;;;GAKG;AACH,wBAAsB,+BAA+B,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBpF"}
+{"version":3,"file":"terminal-persistence.d.ts","sourceRoot":"","sources":["../../src/services/terminal-persistence.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AA6BpD;;;;GAIG;AACH,wBAAgB,wBAAwB,IAAI,MAAM,CAEjD;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAOzE;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAKvF;AAED;;;;GAIG;AACH,wBAAsB,sBAAsB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAWrF;AAED;;;;GAIG;AACH,wBAAsB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgB7E;AAED;;;;;GAKG;AACH,wBAAsB,6BAA6B,CACjD,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAGvC;AAED;;;;;GAKG;AACH,wBAAsB,+BAA+B,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBpF"}

package/dist/services/terminal-persistence.js

@@ -6,9 +6,30 @@
 import path from 'node:path';
 import os from 'node:os';
 import { promises as fs } from 'node:fs';
-import { ensureDir } from '../utils/file-utils.js';
+import { atomicWriteJsonFile, withFileLock } from '../utils/file-utils.js';
 import { createLogger } from '../utils/logger.js';
 const log = createLogger('terminal-persistence');
+async function readAllPersistedSessions(filePath) {
+    try {
+        const raw = await fs.readFile(filePath, 'utf-8');
+        return JSON.parse(raw);
+    }
+    catch (error) {
+        const err = error;
+        if (err.code !== 'ENOENT') {
+            log.warn(`[readAllPersistedSessions] 读取持久化会话失败: ${filePath}, error=${err.message}`);
+        }
+        return [];
+    }
+}
+async function updatePersistedSessions(updater) {
+    const filePath = getPersistedSessionsFile();
+    await withFileLock(filePath, async () => {
+        const sessions = await readAllPersistedSessions(filePath);
+        const nextSessions = await updater(sessions);
+        await atomicWriteJsonFile(filePath, nextSessions);
+    });
+}
 /**
  * 获取持久化会话文件路径
  *
@@ -24,15 +45,11 @@ export function getPersistedSessionsFile() {
  */
 export async function loadPersistedSessions() {
     const filePath = getPersistedSessionsFile();
-    try {
-        const raw = await fs.readFile(filePath, 'utf-8');
-        const sessions = JSON.parse(raw);
+    return withFileLock(filePath, async () => {
+        const sessions = await readAllPersistedSessions(filePath);
         // 只返回状态为 running 的会话
         return sessions.filter(s => s.status === 'running');
-    }
-    catch {
-        return [];
-    }
+    });
 }
 /**
  * 保存持久化的终端会话列表
@@ -41,8 +58,9 @@ export async function loadPersistedSessions() {
  */
 export async function savePersistedSessions(sessions) {
     const filePath = getPersistedSessionsFile();
-    await ensureDir(path.dirname(filePath));
-    await fs.writeFile(filePath, JSON.stringify(sessions, null, 2), 'utf-8');
+    await withFileLock(filePath, async () => {
+        await atomicWriteJsonFile(filePath, sessions);
+    });
 }
 /**
  * 添加或更新持久化会话
@@ -50,15 +68,17 @@ export async function savePersistedSessions(sessions) {
  * @param session - 会话数据
  */
 export async function upsertPersistedSession(session) {
-    const sessions = await loadPersistedSessions();
-    const index = sessions.findIndex(s => s.sessionId === session.sessionId);
-    if (index >= 0) {
-        sessions[index] = session;
-    }
-    else {
-        sessions.push(session);
-    }
-    await savePersistedSessions(sessions);
+    await updatePersistedSessions((sessions) => {
+        const runningSessions = sessions.filter(s => s.status === 'running');
+        const index = runningSessions.findIndex(s => s.sessionId === session.sessionId);
+        if (index >= 0) {
+            runningSessions[index] = session;
+        }
+        else {
+            runningSessions.push(session);
+        }
+        return runningSessions;
+    });
 }
 /**
  * 移除持久化会话（从完整文件中删除，包括 stopped 状态的）
@@ -67,9 +87,8 @@ export async function upsertPersistedSession(session) {
  */
 export async function removePersistedSession(sessionId) {
     const filePath = getPersistedSessionsFile();
-    try {
-        const raw = await fs.readFile(filePath, 'utf-8');
-        const allSessions = JSON.parse(raw);
+    await withFileLock(filePath, async () => {
+        const allSessions = await readAllPersistedSessions(filePath);
         const beforeCount = allSessions.length;
         const filtered = allSessions.filter(s => s.sessionId !== sessionId);
         const afterCount = filtered.length;
@@ -79,12 +98,8 @@ export async function removePersistedSession(sessionId) {
         else {
             log.warn(`[removePersistedSession] 未找到要删除的会话: sessionId=${sessionId}, 当前会话数=${beforeCount}`);
         }
-        await savePersistedSessions(filtered);
-    }
-    catch (error) {
-        // 文件不存在，无需删除
-        log.debug(`[removePersistedSession] 文件不存在或读取失败: ${filePath}`);
-    }
+        await atomicWriteJsonFile(filePath, filtered);
+    });
 }
 /**
  * 根据 agentId 查找持久化会话
@@ -104,9 +119,8 @@ export async function findPersistedSessionByAgentId(agentId) {
  */
 export async function removePersistedSessionByAgentId(agentId) {
     const filePath = getPersistedSessionsFile();
-    try {
-        const raw = await fs.readFile(filePath, 'utf-8');
-        const allSessions = JSON.parse(raw);
+    await withFileLock(filePath, async () => {
+        const allSessions = await readAllPersistedSessions(filePath);
         const beforeCount = allSessions.length;
         const filtered = allSessions.filter(s => s.agentId !== agentId);
         const afterCount = filtered.length;
@@ -116,10 +130,6 @@ export async function removePersistedSessionByAgentId(agentId) {
         else {
             log.debug(`[removePersistedSessionByAgentId] 未找到要删除的会话: agentId=${agentId}`);
         }
-        await savePersistedSessions(filtered);
-    }
-    catch (error) {
-        // 文件不存在，无需删除
-        log.debug(`[removePersistedSessionByAgentId] 文件不存在或读取失败: ${filePath}`);
-    }
+        await atomicWriteJsonFile(filePath, filtered);
+    });
 }

package/dist/services/terminal-persistence.test.js

@@ -1,8 +1,33 @@
 /**
  * Terminal Persistence 服务单元测试
  */
-import { describe, it, expect } from 'vitest';
+import path from 'node:path';
+import { promises as fs } from 'node:fs';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+const tmpRoot = path.join(process.cwd(), '.tmp-vitest-terminal-persistence');
+vi.mock('node:os', () => ({
+    default: {
+        tmpdir: () => tmpRoot,
+    },
+}));
+const persistence = await import('./terminal-persistence.js');
+function makeSession(sessionId, agentId) {
+    return {
+        sessionId,
+        agentId,
+        workspacePath: `/workspace/${agentId}`,
+        command: 'claude',
+        startedAt: new Date(0).toISOString(),
+        status: 'running',
+    };
+}
 describe('terminal-persistence service', () => {
+    beforeEach(async () => {
+        await fs.rm(tmpRoot, { recursive: true, force: true });
+    });
+    afterEach(async () => {
+        await fs.rm(tmpRoot, { recursive: true, force: true });
+    });
     it('generates correct file path', () => {
         const getPersistedSessionsFile = (tmpdir) => {
             return `${tmpdir}/agentswork-runtime-bridge/sessions.json`;
@@ -85,4 +110,25 @@ describe('terminal-persistence service', () => {
         };
         expect(parseSessions('invalid json')).toEqual([]);
     });
+    it('serializes concurrent upserts without losing sessions', async () => {
+        await Promise.all([
+            persistence.upsertPersistedSession(makeSession('session-1', 'agent-1')),
+            persistence.upsertPersistedSession(makeSession('session-2', 'agent-2')),
+            persistence.upsertPersistedSession(makeSession('session-3', 'agent-3')),
+        ]);
+        const sessions = await persistence.loadPersistedSessions();
+        expect(sessions.map(session => session.sessionId).sort()).toEqual(['session-1', 'session-2', 'session-3']);
+    });
+    it('does not revive a removed session during concurrent writes', async () => {
+        await persistence.savePersistedSessions([
+            makeSession('session-1', 'agent-1'),
+            makeSession('session-2', 'agent-2'),
+        ]);
+        await Promise.all([
+            persistence.removePersistedSession('session-1'),
+            persistence.upsertPersistedSession(makeSession('session-3', 'agent-3')),
+        ]);
+        const sessions = await persistence.loadPersistedSessions();
+        expect(sessions.map(session => session.sessionId).sort()).toEqual(['session-2', 'session-3']);
+    });
 });

package/dist/utils/file-utils.d.ts

@@ -1,6 +1,9 @@
 import type { SkillPackage, DownloadResult, Skill } from '../types.js';
 import type { AppFlags, InstalledSkill, CcSwitchSdk } from '@cc-switch/sdk';
 export declare function ensureDir(targetDir: string): Promise<string>;
+export declare function withFileLock<T>(targetPath: string, operation: () => Promise<T>): Promise<T>;
+export declare function atomicWriteFile(targetPath: string, content: string): Promise<void>;
+export declare function atomicWriteJsonFile(targetPath: string, value: unknown): Promise<void>;
 export declare function downloadSkillZip(skillPackage: SkillPackage, targetDir: string): Promise<DownloadResult | null>;
 export declare function runCommand(command: string, args: string[]): Promise<void>;
 export declare function escapePowerShellLiteral(text: string): string;

package/dist/utils/file-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file-utils.d.ts","sourceRoot":"","sources":["../../src/utils/file-utils.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE5E,wBAAsB,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAGlE;AAED,wBAAsB,gBAAgB,CACpC,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CA0ChC;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAqB/E;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED,wBAAsB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBhG;AAED,wBAAsB,oCAAoC,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CASlG;AAED,wBAAgB,yBAAyB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,QAAQ,CAW1E;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,CAM1D;AAED,wBAAsB,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAKhF;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,WAAW,EAChB,YAAY,EAAE,YAAY,EAC1B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAyBhC"}
+{"version":3,"file":"file-utils.d.ts","sourceRoot":"","sources":["../../src/utils/file-utils.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAI5E,wBAAsB,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAGlE;AAED,wBAAsB,YAAY,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAqBjG;AAED,wBAAsB,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAWxF;AAED,wBAAsB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAE3F;AAED,wBAAsB,gBAAgB,CACpC,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CA0ChC;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAqB/E;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED,wBAAsB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBhG;AAED,wBAAsB,oCAAoC,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CASlG;AAED,wBAAgB,yBAAyB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,QAAQ,CAW1E;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,CAM1D;AAED,wBAAsB,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAKhF;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,WAAW,EAChB,YAAY,EAAE,YAAY,EAC1B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAyBhC"}

package/dist/utils/file-utils.js

@@ -4,10 +4,42 @@ import { promises as fs } from 'node:fs';
 import { createHash, randomUUID } from 'node:crypto';
 import axios from 'axios';
 import { schedulerBaseUrl, runtimeToken } from '../config.js';
+const fileLocks = new Map();
 export async function ensureDir(targetDir) {
     await fs.mkdir(targetDir, { recursive: true });
     return targetDir;
 }
+export async function withFileLock(targetPath, operation) {
+    const lockKey = path.resolve(targetPath);
+    const previous = fileLocks.get(lockKey) ?? Promise.resolve();
+    let release;
+    const current = new Promise((resolve) => {
+        release = resolve;
+    });
+    const chained = previous.then(() => current);
+    fileLocks.set(lockKey, chained);
+    await previous;
+    try {
+        return await operation();
+    }
+    finally {
+        release();
+        if (fileLocks.get(lockKey) === chained) {
+            fileLocks.delete(lockKey);
+        }
+    }
+}
+export async function atomicWriteFile(targetPath, content) {
+    await ensureDir(path.dirname(targetPath));
+    const targetDir = path.dirname(targetPath);
+    const targetBase = path.basename(targetPath);
+    const tmpPath = path.join(targetDir, `.${targetBase}.tmp-${process.pid}-${Date.now()}-${Math.random().toString(16).slice(2)}`);
+    await fs.writeFile(tmpPath, content, 'utf-8');
+    await fs.rename(tmpPath, targetPath);
+}
+export async function atomicWriteJsonFile(targetPath, value) {
+    await atomicWriteFile(targetPath, `${JSON.stringify(value, null, 2)}\n`);
+}
 export async function downloadSkillZip(skillPackage, targetDir) {
     if (!skillPackage || !skillPackage.downloadUrl) {
         return null;