factory-factory 0.3.21 → 0.4.0

package/dist/src/backend/services/session/service/store/slash-command-cache.service.js

@@ -1,6 +1,7 @@
 import { createLogger } from '../../../../../backend/services/logger.service.js';
 import { userSettingsAccessor } from '../../../../../backend/services/settings/index.js';
 const logger = createLogger('slash-command-cache');
+const CACHE_PAYLOAD_VERSION = 2;
 function isCommandInfo(value) {
     if (!value || typeof value !== 'object') {
         return false;
@@ -27,12 +28,15 @@ function normalizeCommands(commands) {
         };
     });
 }
-function toCommandInfoArray(value) {
+function toCommandInfoArray(value, allowEmpty = false) {
     if (!Array.isArray(value)) {
         return null;
     }
     const commands = value.filter(isCommandInfo);
-    return commands.length > 0 ? normalizeCommands(commands) : null;
+    if (commands.length > 0) {
+        return normalizeCommands(commands);
+    }
+    return allowEmpty && value.length === 0 ? [] : null;
 }
 function toProviderCommandMap(value) {
     if (!value || typeof value !== 'object' || Array.isArray(value)) {
@@ -48,9 +52,30 @@ function toProviderCommandMap(value) {
     }
     return Object.keys(map).length > 0 ? map : null;
 }
+function toVersionedProviderCommandMap(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value)) {
+        return null;
+    }
+    const record = value;
+    if (record.version !== CACHE_PAYLOAD_VERSION) {
+        return null;
+    }
+    if (!record.global || typeof record.global !== 'object' || Array.isArray(record.global)) {
+        return null;
+    }
+    const map = {};
+    const global = record.global;
+    for (const provider of ['CLAUDE', 'CODEX']) {
+        const commands = toCommandInfoArray(global[provider]);
+        if (commands) {
+            map[provider] = commands;
+        }
+    }
+    return Object.keys(map).length > 0 ? map : null;
+}
 function toProviderPayload(commandsByProvider) {
     const entries = Object.entries(commandsByProvider)
-        .filter((entry) => Boolean(entry[1]))
+        .filter((entry) => Boolean(entry[1]) && entry[1].length > 0)
         .map(([provider, commands]) => [
         provider,
         commands.map((command) => ({
@@ -59,7 +84,10 @@ function toProviderPayload(commandsByProvider) {
             ...(command.argumentHint ? { argumentHint: command.argumentHint } : {}),
         })),
     ]);
-    return Object.fromEntries(entries);
+    return {
+        version: CACHE_PAYLOAD_VERSION,
+        global: Object.fromEntries(entries),
+    };
 }
 function areCommandsEqual(a, b) {
     if (a.length !== b.length) {
@@ -86,17 +114,25 @@ function areCommandsEqual(a, b) {
 class SlashCommandCacheService {
     async getCachedCommands(provider) {
         const settings = await userSettingsAccessor.get();
-        const commandsByProvider = toProviderCommandMap(settings.cachedSlashCommands);
-        return commandsByProvider?.[provider] ?? null;
+        const versionedCommandsByProvider = toVersionedProviderCommandMap(settings.cachedSlashCommands);
+        if (versionedCommandsByProvider) {
+            return versionedCommandsByProvider[provider] ?? null;
+        }
+        if (provider === 'CODEX') {
+            const legacyCommandsByProvider = toProviderCommandMap(settings.cachedSlashCommands);
+            return legacyCommandsByProvider?.CODEX ?? null;
+        }
+        return null;
     }
     async setCachedCommands(provider, commands) {
-        if (commands.length === 0) {
-            return;
-        }
         const normalized = normalizeCommands(commands);
         try {
             const settings = await userSettingsAccessor.get();
-            const existingMap = toProviderCommandMap(settings.cachedSlashCommands) ?? {};
+            const existingMap = toVersionedProviderCommandMap(settings.cachedSlashCommands) ?? {};
+            const legacyMap = toProviderCommandMap(settings.cachedSlashCommands);
+            if (!existingMap.CODEX && legacyMap?.CODEX) {
+                existingMap.CODEX = legacyMap.CODEX;
+            }
             const existing = existingMap[provider] ?? null;
             if (existing && areCommandsEqual(existing, normalized)) {
                 return;

package/dist/src/backend/services/session/service/store/slash-command-cache.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"slash-command-cache.service.js","sourceRoot":"","sources":["../../../../../../../src/backend/services/session/service/store/slash-command-cache.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"slash-command-cache.service.js","sourceRoot":"","sources":["../../../../../../../src/backend/services/session/service/store/slash-command-cache.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAGnE,MAAM,MAAM,GAAG,YAAY,CAAC,qBAAqB,CAAC,CAAC;AACnD,MAAM,qBAAqB,GAAG,CAAC,CAAC;AAEhC,SAAS,aAAa,CAAC,KAAc;IACnC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACxC,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,MAAM,GAAG,KAAgC,CAAC;IAChD,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACpC,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,OAAO,MAAM,CAAC,WAAW,KAAK,QAAQ,EAAE,CAAC;QAC3C,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,MAAM,CAAC,YAAY,KAAK,SAAS,IAAI,OAAO,MAAM,CAAC,YAAY,KAAK,QAAQ,EAAE,CAAC;QACjF,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,iBAAiB,CAAC,QAAuB;IAChD,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QAC9B,MAAM,IAAI,GAAG,OAAO,OAAO,CAAC,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QAChG,OAAO;YACL,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,EAAE;YACtC,YAAY,EAAE,IAAI,IAAI,SAAS;SAChC,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAc,EAAE,UAAU,GAAG,KAAK;IAC5D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAC7C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,OAAO,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IACrC,CAAC;IACD,OAAO,UAAU,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AACtD,CAAC;AAKD,SAAS,oBAAoB,CAAC,KAAc;IAC1C,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAChE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,GAAG,GAAkC,EAAE,CAAC;IAC9C,MAAM,MAAM,GAAG,KAAgC,CAAC;IAChD,KAAK,MAAM,QAAQ,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAU,EAAE,CAAC;QACpD,MAAM,QAAQ,GAAG,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;QACtD,IAAI,QAAQ,EAAE,CAAC;YACb,GAAG,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC;QAC3B,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;AAClD,CAAC;AAED,SAAS,6BAA6B,CAAC,KAAc;IACnD,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAChE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,MAAM,GAAG,KAAgC,CAAC;IAChD,IAAI,MAAM,CAAC,OAAO,KAAK,qBAAqB,EAAE,CAAC;QAC7C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QACxF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,GAAG,GAAkC,EAAE,CAAC;IAC9C,MAAM,MAAM,GAAG,MAAM,CAAC,MAAiC,CAAC;IACxD,KAAK,MAAM,QAAQ,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAU,EAAE,CAAC;QACpD,MAAM,QAAQ,GAAG,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;QACtD,IAAI,QAAQ,EAAE,CAAC;YACb,GAAG,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC;QAC3B,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;AAClD,CAAC;AAED,SAAS,iBAAiB,CACxB,kBAAiD;IAEjD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC;SAC/C,MAAM,CACL,CAAC,KAAK,EAA6C,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAC/F;SACA,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC;QAC7B,QAAQ;QACR,QAAQ,CAAC,GAAG,CACV,CAAC,OAAO,EAAE,EAAE,CACV,CAAC;YACC,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACxE,CAAkC,CACtC;KACF,CAAC,CAAC;IAEL,OAAO;QACL,OAAO,EAAE,qBAAqB;QAC9B,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,OAAO,CAA2B;KAC9D,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,CAAgB,EAAE,CAAgB;IAC1D,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,EAAE,CAAC;QAC1B,OAAO,KAAK,CAAC;IACf,CAAC;IACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QACrC,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAClB,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACnB,IAAI,CAAC,CAAC,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;YACrB,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,EAAE,CAAC;YAC7B,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,IAAI,CAAC,WAAW,KAAK,KAAK,CAAC,WAAW,EAAE,CAAC;YAC3C,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,IAAI,IAAI,CAAC,EAAE,CAAC;YACjE,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,wBAAwB;IAC5B,KAAK,CAAC,iBAAiB,CAAC,QAAyB;QAC/C,MAAM,QAAQ,GAAG,MAAM,oBAAoB,CAAC,GAAG,EAAE,CAAC;QAClD,MAAM,2BAA2B,GAAG,6BAA6B,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;QAChG,IAAI,2BAA2B,EAAE,CAAC;YAChC,OAAO,2BAA2B,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC;QACvD,CAAC;QAED,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;YACzB,MAAM,wBAAwB,GAAG,oBAAoB,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;YACpF,OAAO,wBAAwB,EAAE,KAAK,IAAI,IAAI,CAAC;QACjD,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,QAAyB,EAAE,QAAuB;QACxE,MAAM,UAAU,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QAE/C,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,oBAAoB,CAAC,GAAG,EAAE,CAAC;YAClD,MAAM,WAAW,GAAG,6BAA6B,CAAC,QAAQ,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC;YACtF,MAAM,SAAS,GAAG,oBAAoB,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;YACrE,IAAI,CAAC,WAAW,CAAC,KAAK,IAAI,SAAS,EAAE,KAAK,EAAE,CAAC;gBAC3C,WAAW,CAAC,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC;YACtC,CAAC;YACD,MAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC;YAE/C,IAAI,QAAQ,IAAI,gBAAgB,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE,CAAC;gBACvD,OAAO;YACT,CAAC;YAED,MAAM,WAAW,GAAkC;gBACjD,GAAG,WAAW;gBACd,CAAC,QAAQ,CAAC,EAAE,UAAU;aACvB,CAAC;YAEF,MAAM,oBAAoB,CAAC,MAAM,CAAC;gBAChC,mBAAmB,EAAE,iBAAiB,CAAC,WAAW,CAAC;aACpD,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,IAAI,CAAC,wCAAwC,EAAE;gBACpD,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;aAC9D,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF;AAED,MAAM,CAAC,MAAM,wBAAwB,GAAG,IAAI,wBAAwB,EAAE,CAAC"}

package/dist/src/backend/services/session/service/store/slash-command-cache.service.test.js

@@ -6,11 +6,14 @@ describe('slashCommandCacheService', () => {
     beforeEach(() => {
         vi.clearAllMocks();
     });
-    it('reads provider-scoped command cache payloads', async () => {
+    it('reads versioned provider-scoped command cache payloads', async () => {
         vi.mocked(userSettingsAccessor.get).mockResolvedValue({
             cachedSlashCommands: {
-                CLAUDE: [{ name: '/help', description: 'Help' }],
-                CODEX: [{ name: '/status', description: 'Status' }],
+                version: 2,
+                global: {
+                    CLAUDE: [{ name: '/help', description: 'Help' }],
+                    CODEX: [{ name: '/status', description: 'Status' }],
+                },
             },
         });
         await expect(slashCommandCacheService.getCachedCommands('CLAUDE')).resolves.toEqual([
@@ -20,6 +23,18 @@ describe('slashCommandCacheService', () => {
             { name: '/status', description: 'Status', argumentHint: undefined },
         ]);
     });
+    it('ignores legacy Claude cache payloads because they may include workspace commands', async () => {
+        vi.mocked(userSettingsAccessor.get).mockResolvedValue({
+            cachedSlashCommands: {
+                CLAUDE: [{ name: '/workspace-only', description: 'Workspace only' }],
+                CODEX: [{ name: '/status', description: 'Status' }],
+            },
+        });
+        await expect(slashCommandCacheService.getCachedCommands('CLAUDE')).resolves.toBeNull();
+        await expect(slashCommandCacheService.getCachedCommands('CODEX')).resolves.toEqual([
+            { name: '/status', description: 'Status', argumentHint: undefined },
+        ]);
+    });
     it('returns null for malformed cache payloads', async () => {
         vi.mocked(userSettingsAccessor.get).mockResolvedValue({
             cachedSlashCommands: [{ name: '/help', description: 'Help' }],
@@ -27,5 +42,51 @@ describe('slashCommandCacheService', () => {
         await expect(slashCommandCacheService.getCachedCommands('CLAUDE')).resolves.toBeNull();
         await expect(slashCommandCacheService.getCachedCommands('CODEX')).resolves.toBeNull();
     });
+    it('writes versioned global command cache payloads', async () => {
+        vi.mocked(userSettingsAccessor.get).mockResolvedValue({
+            cachedSlashCommands: null,
+        });
+        await slashCommandCacheService.setCachedCommands('CLAUDE', [
+            { name: '/help', description: 'Help', argumentHint: 'topic' },
+        ]);
+        expect(userSettingsAccessor.update).toHaveBeenCalledWith({
+            cachedSlashCommands: {
+                version: 2,
+                global: {
+                    CLAUDE: [{ name: '/help', description: 'Help', argumentHint: 'topic' }],
+                },
+            },
+        });
+    });
+    it('treats empty versioned provider cache payloads as cache misses', async () => {
+        vi.mocked(userSettingsAccessor.get)
+            .mockResolvedValueOnce({
+            cachedSlashCommands: {
+                version: 2,
+                global: {
+                    CLAUDE: [],
+                },
+            },
+        })
+            .mockResolvedValueOnce({
+            cachedSlashCommands: {
+                version: 2,
+                global: {
+                    CLAUDE: [{ name: '/stale', description: 'Stale' }],
+                    CODEX: [{ name: '/status', description: 'Status' }],
+                },
+            },
+        });
+        await expect(slashCommandCacheService.getCachedCommands('CLAUDE')).resolves.toBeNull();
+        await slashCommandCacheService.setCachedCommands('CLAUDE', []);
+        expect(userSettingsAccessor.update).toHaveBeenCalledWith({
+            cachedSlashCommands: {
+                version: 2,
+                global: {
+                    CODEX: [{ name: '/status', description: 'Status' }],
+                },
+            },
+        });
+    });
 });
 //# sourceMappingURL=slash-command-cache.service.test.js.map

package/dist/src/backend/services/session/service/store/slash-command-cache.service.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"slash-command-cache.service.test.js","sourceRoot":"","sources":["../../../../../../../src/backend/services/session/service/store/slash-command-cache.service.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAEzE,EAAE,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;AAEvC,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;IACxC,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;QAC5D,EAAE,CAAC,MAAM,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,iBAAiB,CAAC;YACpD,mBAAmB,EAAE;gBACnB,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC;gBAChD,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC;aACpD;SACO,CAAC,CAAC;QAEZ,MAAM,MAAM,CAAC,wBAAwB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC;YAClF,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE;SAChE,CAAC,CAAC;QACH,MAAM,MAAM,CAAC,wBAAwB,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC;YACjF,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE;SACpE,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;QACzD,EAAE,CAAC,MAAM,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,iBAAiB,CAAC;YACpD,mBAAmB,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC;SACrD,CAAC,CAAC;QAEZ,MAAM,MAAM,CAAC,wBAAwB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;QACvF,MAAM,MAAM,CAAC,wBAAwB,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;IACxF,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"slash-command-cache.service.test.js","sourceRoot":"","sources":["../../../../../../../src/backend/services/session/service/store/slash-command-cache.service.test.ts"],"names":[],"mappings":"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"}

package/dist/src/backend/services/session/service/store/slash-command-disk-scanner.d.ts

@@ -0,0 +1,7 @@
+import type { CommandInfo } from '../../../../../shared/acp-protocol/index.js';
+export declare function commandNameKey(name: string): string;
+export declare function isWorkspaceScopedCommandName(name: string): boolean;
+export declare function scanClaudeGlobalCommandsFromDisk(seen?: Set<string>): CommandInfo[];
+export declare function scanClaudeWorkspaceCommandsFromDisk(worktreePath: string | null, seen?: Set<string>): CommandInfo[];
+export declare function scanClaudeWorkspaceCommandNames(worktreePath: string | null): Set<string>;
+//# sourceMappingURL=slash-command-disk-scanner.d.ts.map

package/dist/src/backend/services/session/service/store/slash-command-disk-scanner.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"slash-command-disk-scanner.d.ts","sourceRoot":"","sources":["../../../../../../../src/backend/services/session/service/store/slash-command-disk-scanner.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAoCzD,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAInD;AAED,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAQlE;AAkCD,wBAAgB,gCAAgC,CAAC,IAAI,cAAoB,GAAG,WAAW,EAAE,CAExF;AAED,wBAAgB,mCAAmC,CACjD,YAAY,EAAE,MAAM,GAAG,IAAI,EAC3B,IAAI,cAAoB,GACvB,WAAW,EAAE,CAKf;AAED,wBAAgB,+BAA+B,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,CAIxF"}

package/dist/src/backend/services/session/service/store/slash-command-disk-scanner.js

@@ -0,0 +1,94 @@
+import { readdirSync, readFileSync, realpathSync, statSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { basename, isAbsolute, join, relative } from 'node:path';
+function parseCommandDescription(filePath) {
+    try {
+        const content = readFileSync(filePath, 'utf-8');
+        const match = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
+        if (!match) {
+            return '';
+        }
+        const descLine = match[1]?.split(/\r?\n/).find((line) => line.startsWith('description:'));
+        return descLine ? descLine.slice('description:'.length).trim() : '';
+    }
+    catch {
+        return '';
+    }
+}
+function isRealPathContainedInRoot(rootReal, targetReal) {
+    const rel = relative(rootReal, targetReal);
+    return !(rel.startsWith('..') || isAbsolute(rel));
+}
+function resolveContainedRegularFile(rootReal, filePath) {
+    try {
+        const fileReal = realpathSync(filePath);
+        if (!isRealPathContainedInRoot(rootReal, fileReal)) {
+            return null;
+        }
+        if (!statSync(fileReal).isFile()) {
+            return null;
+        }
+        return fileReal;
+    }
+    catch {
+        return null;
+    }
+}
+export function commandNameKey(name) {
+    const normalized = name.trim().replace(/^\/+/, '');
+    const colonIndex = normalized.lastIndexOf(':');
+    return colonIndex >= 0 ? normalized.slice(colonIndex + 1) : normalized;
+}
+export function isWorkspaceScopedCommandName(name) {
+    const normalized = name.trim().replace(/^\/+/, '');
+    const colonIndex = normalized.lastIndexOf(':');
+    if (colonIndex < 0) {
+        return false;
+    }
+    const scope = normalized.slice(0, colonIndex);
+    return scope === 'project' || scope === 'workspace';
+}
+function scanCommandsFromDir(dir, seen, containmentRoot = dir) {
+    let files;
+    let rootReal;
+    try {
+        rootReal = realpathSync(containmentRoot);
+        const dirReal = realpathSync(dir);
+        if (!isRealPathContainedInRoot(rootReal, dirReal)) {
+            return [];
+        }
+        files = readdirSync(dir).filter((file) => file.endsWith('.md'));
+    }
+    catch {
+        return [];
+    }
+    const commands = [];
+    for (const file of files) {
+        const filePath = join(dir, file);
+        const fileReal = resolveContainedRegularFile(rootReal, filePath);
+        if (!fileReal) {
+            continue;
+        }
+        const name = basename(file, '.md');
+        const key = commandNameKey(name);
+        if (seen.has(key)) {
+            continue;
+        }
+        seen.add(key);
+        commands.push({ name, description: parseCommandDescription(fileReal) });
+    }
+    return commands;
+}
+export function scanClaudeGlobalCommandsFromDisk(seen = new Set()) {
+    return scanCommandsFromDir(join(homedir(), '.claude', 'commands'), seen);
+}
+export function scanClaudeWorkspaceCommandsFromDisk(worktreePath, seen = new Set()) {
+    if (!worktreePath) {
+        return [];
+    }
+    return scanCommandsFromDir(join(worktreePath, '.claude', 'commands'), seen, worktreePath);
+}
+export function scanClaudeWorkspaceCommandNames(worktreePath) {
+    return new Set(scanClaudeWorkspaceCommandsFromDisk(worktreePath).map((command) => commandNameKey(command.name)));
+}
+//# sourceMappingURL=slash-command-disk-scanner.js.map

package/dist/src/backend/services/session/service/store/slash-command-disk-scanner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"slash-command-disk-scanner.js","sourceRoot":"","sources":["../../../../../../../src/backend/services/session/service/store/slash-command-disk-scanner.ts"],"names":[],"mappings":"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"}

package/dist/src/backend/services/session/service/store/slash-command-disk-scanner.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=slash-command-disk-scanner.test.d.ts.map

package/dist/src/backend/services/session/service/store/slash-command-disk-scanner.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"slash-command-disk-scanner.test.d.ts","sourceRoot":"","sources":["../../../../../../../src/backend/services/session/service/store/slash-command-disk-scanner.test.ts"],"names":[],"mappings":""}

package/dist/src/backend/services/session/service/store/slash-command-disk-scanner.test.js

@@ -0,0 +1,52 @@
+import { spawnSync } from 'node:child_process';
+import { mkdirSync, mkdtempSync, rmSync, symlinkSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { afterEach, describe, expect, it } from 'vitest';
+import { scanClaudeWorkspaceCommandsFromDisk } from './slash-command-disk-scanner.js';
+function mkfifo(path) {
+    const result = spawnSync('mkfifo', [path], { encoding: 'utf-8' });
+    if (result.status !== 0) {
+        throw new Error(result.stderr || result.error?.message || 'Failed to create FIFO');
+    }
+}
+describe('slash command disk scanner', () => {
+    const tempDirs = [];
+    afterEach(() => {
+        for (const dir of tempDirs.splice(0)) {
+            rmSync(dir, { recursive: true, force: true });
+        }
+    });
+    it('does not scan workspace command directories that resolve outside the worktree', () => {
+        const worktreePath = mkdtempSync(join(tmpdir(), 'ff-worktree-commands-'));
+        const escapedCommandsPath = mkdtempSync(join(tmpdir(), 'ff-escaped-commands-'));
+        tempDirs.push(worktreePath, escapedCommandsPath);
+        mkdirSync(join(worktreePath, '.claude'), { recursive: true });
+        writeFileSync(join(escapedCommandsPath, 'escaped.md'), '---\ndescription: Escaped\n---\n');
+        symlinkSync(escapedCommandsPath, join(worktreePath, '.claude', 'commands'));
+        expect(scanClaudeWorkspaceCommandsFromDisk(worktreePath)).toEqual([]);
+    });
+    it('skips non-regular command files before reading descriptions', () => {
+        const worktreePath = mkdtempSync(join(tmpdir(), 'ff-worktree-commands-'));
+        tempDirs.push(worktreePath);
+        const commandsPath = join(worktreePath, '.claude', 'commands');
+        mkdirSync(commandsPath, { recursive: true });
+        writeFileSync(join(commandsPath, 'valid.md'), '---\ndescription: Regular command\n---\n');
+        mkfifo(join(commandsPath, 'pipe.md'));
+        const commands = scanClaudeWorkspaceCommandsFromDisk(worktreePath);
+        expect(commands).toEqual([{ name: 'valid', description: 'Regular command' }]);
+    });
+    it('skips symlinked command files that resolve to non-regular targets', () => {
+        const worktreePath = mkdtempSync(join(tmpdir(), 'ff-worktree-commands-'));
+        tempDirs.push(worktreePath);
+        const commandsPath = join(worktreePath, '.claude', 'commands');
+        const fifoPath = join(worktreePath, 'command-target');
+        mkdirSync(commandsPath, { recursive: true });
+        writeFileSync(join(commandsPath, 'valid.md'), '---\ndescription: Regular command\n---\n');
+        mkfifo(fifoPath);
+        symlinkSync(fifoPath, join(commandsPath, 'linked.md'));
+        const commands = scanClaudeWorkspaceCommandsFromDisk(worktreePath);
+        expect(commands).toEqual([{ name: 'valid', description: 'Regular command' }]);
+    });
+});
+//# sourceMappingURL=slash-command-disk-scanner.test.js.map

package/dist/src/backend/services/session/service/store/slash-command-disk-scanner.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"slash-command-disk-scanner.test.js","sourceRoot":"","sources":["../../../../../../../src/backend/services/session/service/store/slash-command-disk-scanner.test.ts"],"names":[],"mappings":"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"}

package/dist/src/backend/services/settings/resources/user-settings.accessor.d.ts

@@ -1,4 +1,5 @@
-import type { Prisma, SessionPermissionPreset, SessionProvider, UserSettings } from '../../../../../prisma/generated/client.js';
+import type { SessionPermissionPreset, SessionProvider, UserSettings } from '../../../../../prisma/generated/client.js';
+import { Prisma } from '../../../../../prisma/generated/client.js';
 interface UpdateUserSettingsInput {
     preferredIde?: string;
     customIdeCommand?: string | null;

package/dist/src/backend/services/settings/resources/user-settings.accessor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user-settings.accessor.d.ts","sourceRoot":"","sources":["../../../../../../src/backend/services/settings/resources/user-settings.accessor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,MAAM,EACN,uBAAuB,EACvB,eAAe,EACf,YAAY,EACb,MAAM,oBAAoB,CAAC;AAK5B,UAAU,uBAAuB;IAC/B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,qBAAqB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,mBAAmB,CAAC,EAAE,MAAM,CAAC,cAAc,GAAG,MAAM,CAAC,0BAA0B,CAAC;IAEhF,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,sBAAsB,CAAC,EAAE,eAAe,CAAC;IACzC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,4BAA4B,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7C,2BAA2B,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5C,2BAA2B,CAAC,EAAE,uBAAuB,CAAC;IACtD,kBAAkB,CAAC,EAAE,uBAAuB,CAAC;CAC9C;AAGD,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;AAyCzD,cAAM,oBAAoB;IAKlB,GAAG,IAAI,OAAO,CAAC,YAAY,CAAC;IA8B5B,yBAAyB,IAAI,OAAO,CAAC,eAAe,CAAC;IASrD,MAAM,CAAC,IAAI,EAAE,uBAAuB,GAAG,OAAO,CAAC,YAAY,CAAC;IAoC5D,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IASvD,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC;CAe7F;AAED,eAAO,MAAM,oBAAoB,sBAA6B,CAAC"}
+{"version":3,"file":"user-settings.accessor.d.ts","sourceRoot":"","sources":["../../../../../../src/backend/services/settings/resources/user-settings.accessor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACjG,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAK5C,UAAU,uBAAuB;IAC/B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,qBAAqB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,mBAAmB,CAAC,EAAE,MAAM,CAAC,cAAc,GAAG,MAAM,CAAC,0BAA0B,CAAC;IAEhF,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,sBAAsB,CAAC,EAAE,eAAe,CAAC;IACzC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,4BAA4B,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7C,2BAA2B,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5C,2BAA2B,CAAC,EAAE,uBAAuB,CAAC;IACtD,kBAAkB,CAAC,EAAE,uBAAuB,CAAC;CAC9C;AAGD,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;AA+CzD,cAAM,oBAAoB;IAKlB,GAAG,IAAI,OAAO,CAAC,YAAY,CAAC;IA6C5B,yBAAyB,IAAI,OAAO,CAAC,eAAe,CAAC;IASrD,MAAM,CAAC,IAAI,EAAE,uBAAuB,GAAG,OAAO,CAAC,YAAY,CAAC;IAoC5D,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IASvD,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC;CAgC7F;AAED,eAAO,MAAM,oBAAoB,sBAA6B,CAAC"}

package/dist/src/backend/services/settings/resources/user-settings.accessor.js

@@ -1,6 +1,8 @@
+import { Prisma } from '../../../../../prisma/generated/client.js';
 import { prisma } from '../../../../backend/db.js';
 import { normalizeSessionModelForProvider } from '../../../../backend/lib/session-model.js';
 import { workspaceOrderMapSchema } from '../../../../shared/schemas/persisted-stores.schema.js';
+const WORKSPACE_ORDER_UPDATE_MAX_ATTEMPTS = 5;
 function parseWorkspaceOrderMap(value) {
     const parsed = workspaceOrderMapSchema.safeParse(value);
     return parsed.success ? parsed.data : {};
@@ -30,14 +32,20 @@ function normalizeOptionalEffort(value) {
     const normalized = value.trim();
     return normalized.length > 0 ? normalized : null;
 }
+function isUniqueConstraintError(error) {
+    return error instanceof Prisma.PrismaClientKnownRequestError && error.code === 'P2002';
+}
 class UserSettingsAccessor {
     async get() {
         const userId = 'default';
-        let settings = await prisma.userSettings.findUnique({
+        const existing = await prisma.userSettings.findUnique({
             where: { userId },
         });
-        if (!settings) {
-            settings = await prisma.userSettings.create({
+        if (existing) {
+            return existing;
+        }
+        try {
+            return await prisma.userSettings.create({
                 data: {
                     userId,
                     preferredIde: 'cursor',
@@ -54,7 +62,18 @@ class UserSettingsAccessor {
                 },
             });
         }
-        return settings;
+        catch (error) {
+            if (!isUniqueConstraintError(error)) {
+                throw error;
+            }
+            const settings = await prisma.userSettings.findUnique({
+                where: { userId },
+            });
+            if (!settings) {
+                throw error;
+            }
+            return settings;
+        }
     }
     async getDefaultSessionProvider() {
         const settings = await this.get();
@@ -98,15 +117,29 @@ class UserSettingsAccessor {
     }
     async updateWorkspaceOrder(projectId, workspaceIds) {
         const userId = 'default';
-        const settings = await this.get();
-        const orderMap = parseWorkspaceOrderMap(settings.workspaceOrder);
-        orderMap[projectId] = workspaceIds;
-        return await prisma.userSettings.update({
-            where: { userId },
-            data: {
-                workspaceOrder: orderMap,
-            },
-        });
+        for (let attempt = 0; attempt < WORKSPACE_ORDER_UPDATE_MAX_ATTEMPTS; attempt += 1) {
+            const settings = await this.get();
+            const orderMap = parseWorkspaceOrderMap(settings.workspaceOrder);
+            const nextOrderMap = {
+                ...orderMap,
+                [projectId]: workspaceIds,
+            };
+            const result = await prisma.userSettings.updateMany({
+                where: {
+                    userId,
+                    updatedAt: settings.updatedAt,
+                },
+                data: {
+                    workspaceOrder: nextOrderMap,
+                },
+            });
+            if (result.count === 1) {
+                return await prisma.userSettings.findUniqueOrThrow({
+                    where: { userId },
+                });
+            }
+        }
+        throw new Error(`Failed to update workspace order for project ${projectId} after ${WORKSPACE_ORDER_UPDATE_MAX_ATTEMPTS} attempts`);
     }
 }
 export const userSettingsAccessor = new UserSettingsAccessor();

package/dist/src/backend/services/settings/resources/user-settings.accessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"user-settings.accessor.js","sourceRoot":"","sources":["../../../../../../src/backend/services/settings/resources/user-settings.accessor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"user-settings.accessor.js","sourceRoot":"","sources":["../../../../../../src/backend/services/settings/resources/user-settings.accessor.ts"],"names":[],"mappings":"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"}

package/dist/src/backend/services/terminal/resources/terminal-session.accessor.d.ts

@@ -24,7 +24,7 @@ declare class TerminalSessionAccessor {
     findById(id: string): Promise<TerminalSessionWithWorkspace | null>;
     findByWorkspaceId(workspaceId: string, filters?: FindByWorkspaceIdFilters): Promise<TerminalSession[]>;
     findByName(name: string): Promise<TerminalSession | null>;
-    clearPid(name: string): Promise<void>;
+    clearPid(workspaceId: string, name: string): Promise<void>;
     update(id: string, data: UpdateTerminalSessionInput): Promise<TerminalSession>;
     delete(id: string): Promise<TerminalSession>;
     findWithPid(): Promise<TerminalSession[]>;

package/dist/src/backend/services/terminal/resources/terminal-session.accessor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terminal-session.accessor.d.ts","sourceRoot":"","sources":["../../../../../../src/backend/services/terminal/resources/terminal-session.accessor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAElE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEnD,UAAU,0BAA0B;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,UAAU,0BAA0B;IAClC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB;AAED,UAAU,wBAAwB;IAChC,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAGD,KAAK,4BAA4B,GAAG,MAAM,CAAC,yBAAyB,CAAC;IACnE,OAAO,EAAE;QAAE,SAAS,EAAE,IAAI,CAAA;KAAE,CAAC;CAC9B,CAAC,CAAC;AAEH,cAAM,uBAAuB;IAC3B,MAAM,CAAC,IAAI,EAAE,0BAA0B,GAAG,OAAO,CAAC,eAAe,CAAC;IAUlE,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,4BAA4B,GAAG,IAAI,CAAC;IASlE,iBAAiB,CACf,WAAW,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE,wBAAwB,GACjC,OAAO,CAAC,eAAe,EAAE,CAAC;IAc7B,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;IAMnD,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO3C,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,0BAA0B,GAAG,OAAO,CAAC,eAAe,CAAC;IAO9E,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAU5C,WAAW,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;CAQ1C;AAED,eAAO,MAAM,uBAAuB,yBAAgC,CAAC"}
+{"version":3,"file":"terminal-session.accessor.d.ts","sourceRoot":"","sources":["../../../../../../src/backend/services/terminal/resources/terminal-session.accessor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAElE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEnD,UAAU,0BAA0B;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,UAAU,0BAA0B;IAClC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB;AAED,UAAU,wBAAwB;IAChC,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAGD,KAAK,4BAA4B,GAAG,MAAM,CAAC,yBAAyB,CAAC;IACnE,OAAO,EAAE;QAAE,SAAS,EAAE,IAAI,CAAA;KAAE,CAAC;CAC9B,CAAC,CAAC;AAEH,cAAM,uBAAuB;IAC3B,MAAM,CAAC,IAAI,EAAE,0BAA0B,GAAG,OAAO,CAAC,eAAe,CAAC;IAUlE,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,4BAA4B,GAAG,IAAI,CAAC;IASlE,iBAAiB,CACf,WAAW,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE,wBAAwB,GACjC,OAAO,CAAC,eAAe,EAAE,CAAC;IAc7B,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;IAMnD,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOhE,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,0BAA0B,GAAG,OAAO,CAAC,eAAe,CAAC;IAO9E,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAU5C,WAAW,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;CAQ1C;AAED,eAAO,MAAM,uBAAuB,yBAAgC,CAAC"}

package/dist/src/backend/services/terminal/resources/terminal-session.accessor.js

@@ -33,9 +33,9 @@ class TerminalSessionAccessor {
             where: { name },
         });
     }
-    async clearPid(name) {
+    async clearPid(workspaceId, name) {
         await prisma.terminalSession.updateMany({
-            where: { name },
+            where: { workspaceId, name },
             data: { pid: null },
         });
     }

package/dist/src/backend/services/terminal/resources/terminal-session.accessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminal-session.accessor.js","sourceRoot":"","sources":["../../../../../../src/backend/services/terminal/resources/terminal-session.accessor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAyBtC,MAAM,uBAAuB;IAC3B,MAAM,CAAC,IAAgC;QACrC,OAAO,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC;YACnC,IAAI,EAAE;gBACJ,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,GAAG,EAAE,IAAI,CAAC,GAAG;aACd;SACF,CAAC,CAAC;IACL,CAAC;IAED,QAAQ,CAAC,EAAU;QACjB,OAAO,MAAM,CAAC,eAAe,CAAC,UAAU,CAAC;YACvC,KAAK,EAAE,EAAE,EAAE,EAAE;YACb,OAAO,EAAE;gBACP,SAAS,EAAE,IAAI;aAChB;SACF,CAAC,CAAC;IACL,CAAC;IAED,iBAAiB,CACf,WAAmB,EACnB,OAAkC;QAElC,MAAM,KAAK,GAAqC,EAAE,WAAW,EAAE,CAAC;QAEhE,IAAI,OAAO,EAAE,MAAM,EAAE,CAAC;YACpB,KAAK,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAChC,CAAC;QAED,OAAO,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC;YACrC,KAAK;YACL,IAAI,EAAE,OAAO,EAAE,KAAK;YACpB,OAAO,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE;SAC/B,CAAC,CAAC;IACL,CAAC;IAED,UAAU,CAAC,IAAY;QACrB,OAAO,MAAM,CAAC,eAAe,CAAC,SAAS,CAAC;YACtC,KAAK,EAAE,EAAE,IAAI,EAAE;SAChB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAY;QACzB,MAAM,MAAM,CAAC,eAAe,CAAC,UAAU,CAAC;YACtC,KAAK,EAAE,EAAE,IAAI,EAAE;YACf,IAAI,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE;SACpB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,EAAU,EAAE,IAAgC;QACjD,OAAO,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC;YACnC,KAAK,EAAE,EAAE,EAAE,EAAE;YACb,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,EAAU;QACf,OAAO,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC;YACnC,KAAK,EAAE,EAAE,EAAE,EAAE;SACd,CAAC,CAAC;IACL,CAAC;IAMD,WAAW;QACT,OAAO,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC;YACrC,KAAK,EAAE;gBACL,GAAG,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE;aACnB;YACD,OAAO,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE;SAC/B,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,CAAC,MAAM,uBAAuB,GAAG,IAAI,uBAAuB,EAAE,CAAC"}
+{"version":3,"file":"terminal-session.accessor.js","sourceRoot":"","sources":["../../../../../../src/backend/services/terminal/resources/terminal-session.accessor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAyBtC,MAAM,uBAAuB;IAC3B,MAAM,CAAC,IAAgC;QACrC,OAAO,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC;YACnC,IAAI,EAAE;gBACJ,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,GAAG,EAAE,IAAI,CAAC,GAAG;aACd;SACF,CAAC,CAAC;IACL,CAAC;IAED,QAAQ,CAAC,EAAU;QACjB,OAAO,MAAM,CAAC,eAAe,CAAC,UAAU,CAAC;YACvC,KAAK,EAAE,EAAE,EAAE,EAAE;YACb,OAAO,EAAE;gBACP,SAAS,EAAE,IAAI;aAChB;SACF,CAAC,CAAC;IACL,CAAC;IAED,iBAAiB,CACf,WAAmB,EACnB,OAAkC;QAElC,MAAM,KAAK,GAAqC,EAAE,WAAW,EAAE,CAAC;QAEhE,IAAI,OAAO,EAAE,MAAM,EAAE,CAAC;YACpB,KAAK,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAChC,CAAC;QAED,OAAO,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC;YACrC,KAAK;YACL,IAAI,EAAE,OAAO,EAAE,KAAK;YACpB,OAAO,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE;SAC/B,CAAC,CAAC;IACL,CAAC;IAED,UAAU,CAAC,IAAY;QACrB,OAAO,MAAM,CAAC,eAAe,CAAC,SAAS,CAAC;YACtC,KAAK,EAAE,EAAE,IAAI,EAAE;SAChB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,WAAmB,EAAE,IAAY;QAC9C,MAAM,MAAM,CAAC,eAAe,CAAC,UAAU,CAAC;YACtC,KAAK,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE;YAC5B,IAAI,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE;SACpB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,EAAU,EAAE,IAAgC;QACjD,OAAO,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC;YACnC,KAAK,EAAE,EAAE,EAAE,EAAE;YACb,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,EAAU;QACf,OAAO,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC;YACnC,KAAK,EAAE,EAAE,EAAE,EAAE;SACd,CAAC,CAAC;IACL,CAAC;IAMD,WAAW;QACT,OAAO,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC;YACrC,KAAK,EAAE;gBACL,GAAG,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE;aACnB;YACD,OAAO,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE;SAC/B,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,CAAC,MAAM,uBAAuB,GAAG,IAAI,uBAAuB,EAAE,CAAC"}

package/dist/src/backend/services/terminal/service/terminal.service.d.ts

@@ -36,6 +36,8 @@ export declare class TerminalService {
     private exitListeners;
     private activeTerminals;
     private monitoringInterval;
+    private resourceUpdateInFlightGeneration;
+    private resourceMonitoringGeneration;
     private static readonly MONITORING_INTERVAL_MS;
     setActiveTerminal(workspaceId: string, terminalId: string): void;
     getActiveTerminal(workspaceId: string): string | null;

package/dist/src/backend/services/terminal/service/terminal.service.d.ts.map

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