wind-agent-cli 1.37.2

package/dist-server/server/modules/providers/tests/provider-attachment-history.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"provider-attachment-history.test.js","sourceRoot":"","sources":["../../../../../server/modules/providers/tests/provider-attachment-history.test.ts"],"names":[],"mappings":"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"}

package/dist-server/server/modules/providers/tests/provider-models.service.test.js

@@ -0,0 +1,268 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { createProviderModelsService } from '../../../modules/providers/services/provider-models.service.js';
+import { AppError } from '../../../shared/utils.js';
+const createModels = (value) => ({
+    OPTIONS: [{ value, label: value }],
+    DEFAULT: value,
+});
+const createCurrentActiveModel = (model) => ({ model });
+/** In-memory stand-in for the `sessions` table rows the service reads and writes. */
+const createSessionStore = (rows = {}, efforts = {}) => {
+    const sessions = new Map(Object.entries(rows).map(([sessionId, model]) => [
+        sessionId,
+        { model, effort: efforts[sessionId] ?? null },
+    ]));
+    return {
+        sessions,
+        getSessionById: (sessionId) => sessions.get(sessionId) ?? null,
+        setSessionModel: (sessionId, model) => {
+            const session = sessions.get(sessionId);
+            if (session) {
+                session.model = model;
+            }
+        },
+        setSessionEffort: (sessionId, effort) => {
+            const session = sessions.get(sessionId);
+            if (session) {
+                session.effort = effort;
+            }
+        },
+    };
+};
+const createCatalogStore = () => {
+    const rows = new Map();
+    let nextRecordId = 1;
+    const readRows = (provider) => rows.get(provider) ?? [];
+    return {
+        rows,
+        listCustomProviderModels(provider) {
+            return [...readRows(provider)];
+        },
+        getCustomProviderModel(provider, recordId) {
+            return readRows(provider).find((record) => record.recordId === recordId) ?? null;
+        },
+        findCustomProviderModelByModelId(provider, modelId) {
+            return readRows(provider).find((record) => record.modelId === modelId) ?? null;
+        },
+        createCustomProviderModel(provider, input) {
+            const record = {
+                recordId: nextRecordId++,
+                provider,
+                modelId: input.id,
+                model: input.model,
+                sortOrder: readRows(provider).length,
+            };
+            rows.set(provider, [...readRows(provider), record]);
+            return record;
+        },
+        updateCustomProviderModel(provider, recordId, input) {
+            const existing = readRows(provider).find((record) => record.recordId === recordId);
+            if (!existing) {
+                return null;
+            }
+            const updated = { ...existing, modelId: input.id, model: input.model };
+            rows.set(provider, readRows(provider).map((record) => (record.recordId === recordId ? updated : record)));
+            return updated;
+        },
+        deleteCustomProviderModel(provider, recordId, _fallbackModelId) {
+            const existing = readRows(provider).find((record) => record.recordId === recordId);
+            if (!existing) {
+                return null;
+            }
+            rows.set(provider, readRows(provider).filter((record) => record.recordId !== recordId));
+            return existing;
+        },
+    };
+};
+const createTestService = (options = {}) => {
+    const catalog = options.catalog ?? createCatalogStore();
+    const sessions = options.sessions ?? createSessionStore();
+    const service = createProviderModelsService({
+        catalog,
+        sessions,
+        resolveProvider: (provider) => ({
+            models: {
+                getSupportedModels: async () => {
+                    options.onCatalogRead?.(provider);
+                    return createModels(`${provider}-default`);
+                },
+                getCurrentActiveModel: async (sessionId) => createCurrentActiveModel(options.activeModel?.(provider, sessionId) ?? `${provider}-default`),
+            },
+        }),
+    });
+    return { service, catalog, sessions };
+};
+test('provider catalogs merge source-controlled defaults with custom persistence rows', async () => {
+    const calls = [];
+    const { service, catalog } = createTestService({ onCatalogRead: (provider) => calls.push(provider) });
+    const models = await service.getProviderModels('codex');
+    assert.deepEqual(calls, ['codex']);
+    assert.equal(models.DEFAULT, 'codex-default');
+    assert.deepEqual(models.OPTIONS[0], {
+        value: 'codex-default',
+        label: 'codex-default',
+        isCustom: false,
+    });
+    assert.deepEqual(catalog.rows.get('codex'), undefined);
+});
+test('custom models can be created, edited, and deleted', async () => {
+    const { service } = createTestService();
+    const created = await service.createCustomModel('claude', {
+        model: 'My Claude',
+        id: 'claude-my-model',
+    });
+    const recordId = created.model.recordId;
+    assert.equal(created.model.isCustom, true);
+    assert.equal(created.models.OPTIONS.at(-1)?.value, 'claude-my-model');
+    const updated = await service.updateCustomModel('claude', recordId, {
+        model: 'My Better Claude',
+        id: 'claude-my-model-v2',
+    });
+    assert.equal(updated.model.label, 'My Better Claude');
+    assert.equal(updated.model.value, 'claude-my-model-v2');
+    const removed = await service.deleteCustomModel('claude', recordId);
+    assert.equal(removed.model.value, 'claude-my-model-v2');
+    assert.equal(removed.models.OPTIONS.some((option) => option.recordId === recordId), false);
+});
+test('duplicate model ids are rejected within one provider', async () => {
+    const { service } = createTestService();
+    await service.createCustomModel('cursor', { model: 'First', id: 'custom-id' });
+    await assert.rejects(() => service.createCustomModel('cursor', { model: 'Second', id: 'custom-id' }), (error) => error instanceof AppError
+        && error.code === 'MODEL_ID_ALREADY_EXISTS'
+        && error.statusCode === 409);
+    await assert.rejects(() => service.createCustomModel('cursor', {
+        model: 'Duplicate built-in',
+        id: 'cursor-default',
+    }), (error) => error instanceof AppError
+        && error.code === 'MODEL_ID_ALREADY_EXISTS'
+        && error.statusCode === 409);
+});
+test('predefined models have no database record or mutation target', async () => {
+    const { service, catalog } = createTestService();
+    const models = await service.getProviderModels('opencode');
+    assert.equal(models.OPTIONS[0]?.recordId, undefined);
+    assert.equal(models.OPTIONS[0]?.isCustom, false);
+    assert.deepEqual(catalog.rows.get('opencode'), undefined);
+    await assert.rejects(() => service.updateCustomModel('opencode', 999, { model: 'Changed', id: 'changed' }), (error) => error instanceof AppError && error.code === 'MODEL_NOT_FOUND');
+});
+test('resolveSessionModel asks the provider adapter for the requested session', async () => {
+    const calls = [];
+    const { service } = createTestService({
+        sessions: createSessionStore({ 'session-123': null }),
+        activeModel: (provider, sessionId) => {
+            calls.push({ provider, sessionId });
+            return `${provider}-${sessionId}`;
+        },
+    });
+    const resolved = await service.resolveSessionModel('opencode', { sessionId: 'session-123' });
+    assert.deepEqual(calls, [{ provider: 'opencode', sessionId: 'session-123' }]);
+    assert.equal(resolved.model, 'opencode-session-123');
+});
+test('setSessionModel records the model on the session row', () => {
+    const sessions = createSessionStore({ 'session-1': null });
+    const { service } = createTestService({ sessions });
+    const stored = service.setSessionModel('claude', 'session-1', 'opus');
+    assert.deepEqual(stored, {
+        provider: 'claude',
+        sessionId: 'session-1',
+        model: 'opus',
+        effort: null,
+        source: 'session',
+    });
+    assert.equal(sessions.sessions.get('session-1')?.model, 'opus');
+});
+test('setSessionModel ignores sessions that have no row yet', () => {
+    const sessions = createSessionStore();
+    const { service } = createTestService({ sessions });
+    assert.equal(service.setSessionModel('claude', 'missing-session', 'opus'), null);
+    assert.equal(sessions.sessions.size, 0);
+});
+test('setSessionEffort records an explicit effort on the session row', () => {
+    const sessions = createSessionStore({ 'session-1': 'gpt-5.6-sol' });
+    const { service } = createTestService({ sessions });
+    const stored = service.setSessionEffort('codex', 'session-1', 'ultra');
+    assert.deepEqual(stored, {
+        provider: 'codex',
+        sessionId: 'session-1',
+        effort: 'ultra',
+        source: 'session',
+    });
+    assert.equal(sessions.sessions.get('session-1')?.effort, 'ultra');
+});
+test('setSessionEffort ignores sessions that have no row yet', () => {
+    const sessions = createSessionStore();
+    const { service } = createTestService({ sessions });
+    assert.equal(service.setSessionEffort('codex', 'missing-session', 'high'), null);
+    assert.equal(sessions.sessions.size, 0);
+});
+test('resolveSessionModel prefers the recorded session model', async () => {
+    const { service } = createTestService({
+        sessions: createSessionStore({ 'session-1': 'haiku' }, { 'session-1': 'high' }),
+        activeModel: () => 'provider-reported',
+    });
+    const resolved = await service.resolveSessionModel('claude', {
+        sessionId: 'session-1',
+        requestedModel: 'sonnet',
+    });
+    assert.equal(resolved.model, 'haiku');
+    assert.equal(resolved.effort, 'high');
+    assert.equal(resolved.source, 'session');
+});
+test('resolveSessionModel uses provider session state for unrecorded external sessions', async () => {
+    const { service } = createTestService({
+        sessions: createSessionStore({ 'session-1': null }),
+        activeModel: () => 'provider-reported',
+    });
+    const resolved = await service.resolveSessionModel('opencode', {
+        sessionId: 'session-1',
+        requestedModel: 'requested',
+    });
+    assert.equal(resolved.model, 'provider-reported');
+    assert.equal(resolved.source, 'provider');
+});
+test('resolveSessionModel uses the requested model when provider reports the catalog default', async () => {
+    const { service } = createTestService({
+        sessions: createSessionStore({ 'session-1': null }),
+    });
+    const resolved = await service.resolveSessionModel('claude', {
+        sessionId: 'session-1',
+        requestedModel: 'haiku',
+    });
+    assert.equal(resolved.model, 'haiku');
+    assert.equal(resolved.source, 'session');
+});
+test('resolveSessionModel returns a requested model before a session exists', async () => {
+    const { service } = createTestService();
+    const resolved = await service.resolveSessionModel('codex', { requestedModel: 'gpt-5.5' });
+    assert.equal(resolved.model, 'gpt-5.5');
+    assert.equal(resolved.sessionId, null);
+    assert.equal(resolved.source, 'session');
+});
+test('resolveSessionModel falls back to the provider adapter default', async () => {
+    const { service } = createTestService();
+    const resolved = await service.resolveSessionModel('codex');
+    assert.equal(resolved.model, 'codex-default');
+    assert.equal(resolved.source, 'default');
+});
+test('resolveResumeModel prefers the recorded session model over the requested one', async () => {
+    const { service } = createTestService({
+        sessions: createSessionStore({ 'session-456': 'composer-2' }),
+    });
+    const model = await service.resolveResumeModel('cursor', 'session-456', 'composer-2-fast');
+    assert.equal(model, 'composer-2');
+});
+test('resolveResumeModel never consults provider-global state', async () => {
+    let providerLookups = 0;
+    const { service } = createTestService({
+        sessions: createSessionStore({ 'session-456': null }),
+        activeModel: () => {
+            providerLookups += 1;
+            return 'global-config-model';
+        },
+    });
+    const model = await service.resolveResumeModel('codex', 'session-456', 'gpt-5.5');
+    assert.equal(model, 'gpt-5.5');
+    assert.equal(providerLookups, 0);
+});
+//# sourceMappingURL=provider-models.service.test.js.map

package/dist-server/server/modules/providers/tests/provider-models.service.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"provider-models.service.test.js","sourceRoot":"","sources":["../../../../../server/modules/providers/tests/provider-models.service.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,2BAA2B,EAAE,MAAM,yDAAyD,CAAC;AAQtG,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,MAAM,YAAY,GAAG,CAAC,KAAa,EAA4B,EAAE,CAAC,CAAC;IACjE,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;IAClC,OAAO,EAAE,KAAK;CACf,CAAC,CAAC;AAEH,MAAM,wBAAwB,GAAG,CAAC,KAAa,EAA8B,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;AAE5F,qFAAqF;AACrF,MAAM,kBAAkB,GAAG,CACzB,OAAsC,EAAE,EACxC,UAAyC,EAAE,EAC3C,EAAE;IACF,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;QACxE,SAAS;QACT,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,IAAI,EAAE;KAC9C,CAAC,CAAC,CAAC;IACJ,OAAO;QACL,QAAQ;QACR,cAAc,EAAE,CAAC,SAAiB,EAAE,EAAE,CACpC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,IAAI;QACjC,eAAe,EAAE,CAAC,SAAiB,EAAE,KAAa,EAAE,EAAE;YACpD,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACxC,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;YACxB,CAAC;QACH,CAAC;QACD,gBAAgB,EAAE,CAAC,SAAiB,EAAE,MAAc,EAAE,EAAE;YACtD,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACxC,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;YAC1B,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,GAAG,EAAE;IAC9B,MAAM,IAAI,GAAG,IAAI,GAAG,EAA4C,CAAC;IACjE,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,MAAM,QAAQ,GAAG,CAAC,QAAqB,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;IAErE,OAAO;QACL,IAAI;QACJ,wBAAwB,CAAC,QAAqB;YAC5C,OAAO,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;QACjC,CAAC;QACD,sBAAsB,CAAC,QAAqB,EAAE,QAAgB;YAC5D,OAAO,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,KAAK,QAAQ,CAAC,IAAI,IAAI,CAAC;QACnF,CAAC;QACD,gCAAgC,CAAC,QAAqB,EAAE,OAAe;YACrE,OAAO,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,KAAK,OAAO,CAAC,IAAI,IAAI,CAAC;QACjF,CAAC;QACD,yBAAyB,CAAC,QAAqB,EAAE,KAA+B;YAC9E,MAAM,MAAM,GAA8B;gBACxC,QAAQ,EAAE,YAAY,EAAE;gBACxB,QAAQ;gBACR,OAAO,EAAE,KAAK,CAAC,EAAE;gBACjB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,SAAS,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM;aACrC,CAAC;YACF,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;YACpD,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,yBAAyB,CACvB,QAAqB,EACrB,QAAgB,EAChB,KAA+B;YAE/B,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;YACnF,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,OAAO,IAAI,CAAC;YACd,CAAC;YACD,MAAM,OAAO,GAAG,EAAE,GAAG,QAAQ,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC;YACvE,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CACpD,MAAM,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAChD,CAAC,CAAC,CAAC;YACJ,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,yBAAyB,CAAC,QAAqB,EAAE,QAAgB,EAAE,gBAAwB;YACzF,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;YACnF,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,OAAO,IAAI,CAAC;YACd,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC;YACxF,OAAO,QAAQ,CAAC;QAClB,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,UAKvB,EAAE,EAAE,EAAE;IACR,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,kBAAkB,EAAE,CAAC;IACxD,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,kBAAkB,EAAE,CAAC;IAC1D,MAAM,OAAO,GAAG,2BAA2B,CAAC;QAC1C,OAAO;QACP,QAAQ;QACR,eAAe,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAC9B,MAAM,EAAE;gBACN,kBAAkB,EAAE,KAAK,IAAI,EAAE;oBAC7B,OAAO,CAAC,aAAa,EAAE,CAAC,QAAQ,CAAC,CAAC;oBAClC,OAAO,YAAY,CAAC,GAAG,QAAQ,UAAU,CAAC,CAAC;gBAC7C,CAAC;gBACD,qBAAqB,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,CAAC,wBAAwB,CAClE,OAAO,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,SAAS,CAAC,IAAI,GAAG,QAAQ,UAAU,CACpE;aACF;SACF,CAAC;KACH,CAAC,CAAC;IAEH,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;AACxC,CAAC,CAAC;AAEF,IAAI,CAAC,iFAAiF,EAAE,KAAK,IAAI,EAAE;IACjG,MAAM,KAAK,GAAkB,EAAE,CAAC;IAChC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,iBAAiB,CAAC,EAAE,aAAa,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAEtG,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAExD,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IACnC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IAC9C,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QAClC,KAAK,EAAE,eAAe;QACtB,KAAK,EAAE,eAAe;QACtB,QAAQ,EAAE,KAAK;KAChB,CAAC,CAAC;IACH,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,CAAC;AACzD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,mDAAmD,EAAE,KAAK,IAAI,EAAE;IACnE,MAAM,EAAE,OAAO,EAAE,GAAG,iBAAiB,EAAE,CAAC;IACxC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,iBAAiB,CAAC,QAAQ,EAAE;QACxD,KAAK,EAAE,WAAW;QAClB,EAAE,EAAE,iBAAiB;KACtB,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,QAAkB,CAAC;IAElD,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC3C,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,iBAAiB,CAAC,CAAC;IAEtE,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,EAAE;QAClE,KAAK,EAAE,kBAAkB;QACzB,EAAE,EAAE,oBAAoB;KACzB,CAAC,CAAC;IACH,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;IACtD,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAC;IAExD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACpE,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAC;IACxD,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,KAAK,QAAQ,CAAC,EAAE,KAAK,CAAC,CAAC;AAC7F,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;IACtE,MAAM,EAAE,OAAO,EAAE,GAAG,iBAAiB,EAAE,CAAC;IACxC,MAAM,OAAO,CAAC,iBAAiB,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;IAE/E,MAAM,MAAM,CAAC,OAAO,CAClB,GAAG,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,WAAW,EAAE,CAAC,EAC/E,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,YAAY,QAAQ;WAC/B,KAAK,CAAC,IAAI,KAAK,yBAAyB;WACxC,KAAK,CAAC,UAAU,KAAK,GAAG,CAC9B,CAAC;IAEF,MAAM,MAAM,CAAC,OAAO,CAClB,GAAG,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,EAAE;QACxC,KAAK,EAAE,oBAAoB;QAC3B,EAAE,EAAE,gBAAgB;KACrB,CAAC,EACF,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,YAAY,QAAQ;WAC/B,KAAK,CAAC,IAAI,KAAK,yBAAyB;WACxC,KAAK,CAAC,UAAU,KAAK,GAAG,CAC9B,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,8DAA8D,EAAE,KAAK,IAAI,EAAE;IAC9E,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,iBAAiB,EAAE,CAAC;IACjD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;IAC3D,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;IACrD,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;IACjD,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,SAAS,CAAC,CAAC;IAE1D,MAAM,MAAM,CAAC,OAAO,CAClB,GAAG,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,UAAU,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,EACrF,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,YAAY,QAAQ,IAAI,KAAK,CAAC,IAAI,KAAK,iBAAiB,CACzE,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,yEAAyE,EAAE,KAAK,IAAI,EAAE;IACzF,MAAM,KAAK,GAAyD,EAAE,CAAC;IACvE,MAAM,EAAE,OAAO,EAAE,GAAG,iBAAiB,CAAC;QACpC,QAAQ,EAAE,kBAAkB,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;QACrD,WAAW,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,EAAE;YACnC,KAAK,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC;YACpC,OAAO,GAAG,QAAQ,IAAI,SAAS,EAAE,CAAC;QACpC,CAAC;KACF,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,mBAAmB,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,CAAC,CAAC;IAE7F,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC;IAC9E,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,sBAAsB,CAAC,CAAC;AACvD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sDAAsD,EAAE,GAAG,EAAE;IAChE,MAAM,QAAQ,GAAG,kBAAkB,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3D,MAAM,EAAE,OAAO,EAAE,GAAG,iBAAiB,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEpD,MAAM,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,QAAQ,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;IAEtE,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE;QACvB,QAAQ,EAAE,QAAQ;QAClB,SAAS,EAAE,WAAW;QACtB,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,IAAI;QACZ,MAAM,EAAE,SAAS;KAClB,CAAC,CAAC;IACH,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;AAClE,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uDAAuD,EAAE,GAAG,EAAE;IACjE,MAAM,QAAQ,GAAG,kBAAkB,EAAE,CAAC;IACtC,MAAM,EAAE,OAAO,EAAE,GAAG,iBAAiB,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEpD,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,QAAQ,EAAE,iBAAiB,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;IACjF,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;AAC1C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,gEAAgE,EAAE,GAAG,EAAE;IAC1E,MAAM,QAAQ,GAAG,kBAAkB,CAAC,EAAE,WAAW,EAAE,aAAa,EAAE,CAAC,CAAC;IACpE,MAAM,EAAE,OAAO,EAAE,GAAG,iBAAiB,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEpD,MAAM,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IAEvE,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE;QACvB,QAAQ,EAAE,OAAO;QACjB,SAAS,EAAE,WAAW;QACtB,MAAM,EAAE,OAAO;QACf,MAAM,EAAE,SAAS;KAClB,CAAC,CAAC;IACH,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;AACpE,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,wDAAwD,EAAE,GAAG,EAAE;IAClE,MAAM,QAAQ,GAAG,kBAAkB,EAAE,CAAC;IACtC,MAAM,EAAE,OAAO,EAAE,GAAG,iBAAiB,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEpD,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,OAAO,EAAE,iBAAiB,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;IACjF,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;AAC1C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;IACxE,MAAM,EAAE,OAAO,EAAE,GAAG,iBAAiB,CAAC;QACpC,QAAQ,EAAE,kBAAkB,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC;QAC/E,WAAW,EAAE,GAAG,EAAE,CAAC,mBAAmB;KACvC,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,mBAAmB,CAAC,QAAQ,EAAE;QAC3D,SAAS,EAAE,WAAW;QACtB,cAAc,EAAE,QAAQ;KACzB,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACtC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AAC3C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,kFAAkF,EAAE,KAAK,IAAI,EAAE;IAClG,MAAM,EAAE,OAAO,EAAE,GAAG,iBAAiB,CAAC;QACpC,QAAQ,EAAE,kBAAkB,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;QACnD,WAAW,EAAE,GAAG,EAAE,CAAC,mBAAmB;KACvC,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,mBAAmB,CAAC,UAAU,EAAE;QAC7D,SAAS,EAAE,WAAW;QACtB,cAAc,EAAE,WAAW;KAC5B,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,mBAAmB,CAAC,CAAC;IAClD,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAC5C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,wFAAwF,EAAE,KAAK,IAAI,EAAE;IACxG,MAAM,EAAE,OAAO,EAAE,GAAG,iBAAiB,CAAC;QACpC,QAAQ,EAAE,kBAAkB,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;KACpD,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,mBAAmB,CAAC,QAAQ,EAAE;QAC3D,SAAS,EAAE,WAAW;QACtB,cAAc,EAAE,OAAO;KACxB,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACtC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AAC3C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uEAAuE,EAAE,KAAK,IAAI,EAAE;IACvF,MAAM,EAAE,OAAO,EAAE,GAAG,iBAAiB,EAAE,CAAC;IAExC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,mBAAmB,CAAC,OAAO,EAAE,EAAE,cAAc,EAAE,SAAS,EAAE,CAAC,CAAC;IAE3F,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IACxC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACvC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AAC3C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,gEAAgE,EAAE,KAAK,IAAI,EAAE;IAChF,MAAM,EAAE,OAAO,EAAE,GAAG,iBAAiB,EAAE,CAAC;IAExC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAE5D,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;IAC9C,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AAC3C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,8EAA8E,EAAE,KAAK,IAAI,EAAE;IAC9F,MAAM,EAAE,OAAO,EAAE,GAAG,iBAAiB,CAAC;QACpC,QAAQ,EAAE,kBAAkB,CAAC,EAAE,aAAa,EAAE,YAAY,EAAE,CAAC;KAC9D,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAAC,QAAQ,EAAE,aAAa,EAAE,iBAAiB,CAAC,CAAC;IAC3F,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;AACpC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,yDAAyD,EAAE,KAAK,IAAI,EAAE;IACzE,IAAI,eAAe,GAAG,CAAC,CAAC;IACxB,MAAM,EAAE,OAAO,EAAE,GAAG,iBAAiB,CAAC;QACpC,QAAQ,EAAE,kBAAkB,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;QACrD,WAAW,EAAE,GAAG,EAAE;YAChB,eAAe,IAAI,CAAC,CAAC;YACrB,OAAO,qBAAqB,CAAC;QAC/B,CAAC;KACF,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAAC,OAAO,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;IAElF,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAC/B,MAAM,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;AACnC,CAAC,CAAC,CAAC"}

package/dist-server/server/modules/providers/tests/provider-runtime.service.test.js

@@ -0,0 +1,126 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { providerRegistry } from '../../../modules/providers/provider.registry.js';
+import { createProviderRuntimeService } from '../../../modules/providers/services/provider-runtime.service.js';
+function createRuntime(overrides = {}) {
+    return {
+        async run() {
+            return undefined;
+        },
+        abort() {
+            return false;
+        },
+        ...overrides,
+    };
+}
+function createProvider(id, runtime) {
+    return {
+        id,
+        runtime,
+        auth: {
+            async getStatus() {
+                return {
+                    provider: id,
+                    installed: true,
+                    authenticated: true,
+                    method: 'test',
+                    details: {},
+                };
+            },
+        },
+        sessions: {
+            normalizeMessage(raw, sessionId) {
+                return [{ kind: 'assistant', content: String(raw), sessionId, provider: id }];
+            },
+            async fetchHistory() {
+                return { messages: [], total: 0, hasMore: false, offset: 0, limit: null };
+            },
+        },
+    };
+}
+function createService(providers) {
+    const providerMap = new Map(providers.map((provider) => [provider.id, provider]));
+    return createProviderRuntimeService({
+        listProviders: () => providers,
+        resolveProvider(providerName) {
+            const provider = providerMap.get(providerName);
+            if (!provider) {
+                throw new Error(`Missing provider: ${providerName}`);
+            }
+            return provider;
+        },
+        resolveProviderSessionId: (sessionId) => sessionId ? `native-${sessionId}` : null,
+        async resolveResumeModel(_provider, _sessionId, requestedModel) {
+            return requestedModel?.trim() || undefined;
+        },
+        async getProviderModels() {
+            return {
+                OPTIONS: [],
+                DEFAULT: 'default-model',
+            };
+        },
+    });
+}
+test('providerRegistry owns one runtime for every registered provider', () => {
+    const providers = providerRegistry.listProviders();
+    assert.deepEqual(providers.map((provider) => provider.id), [
+        'claude',
+        'codex',
+        'cursor',
+        'opencode',
+    ]);
+    assert.equal(providers.every((provider) => typeof provider.runtime.run === 'function'), true);
+    assert.equal(providers.every((provider) => typeof provider.runtime.abort === 'function'), true);
+});
+test('dispatches runs and aborts through the runtime owned by providerRegistry', async () => {
+    const calls = [];
+    const runtime = createRuntime({
+        async run(command, options, writer, context) {
+            calls.push(['run', command, options, writer]);
+            assert.equal(context.resolveProviderSessionId('session-1'), 'native-session-1');
+            assert.equal(await context.resolveResumeModel('session-1', 'sonnet'), 'sonnet');
+            assert.deepEqual(await context.getProviderModels(), { OPTIONS: [], DEFAULT: 'default-model' });
+            assert.equal(context.normalizeMessage('hello', 'session-1')[0]?.provider, 'claude');
+            assert.equal(await context.isProviderInstalled(), true);
+            return 'complete';
+        },
+        async abort(sessionId) {
+            calls.push(['abort', sessionId]);
+            return true;
+        },
+    });
+    const service = createService([createProvider('claude', runtime)]);
+    const writer = { send() { } };
+    assert.equal(service.hasRuntime('claude'), true);
+    assert.equal(service.hasRuntime('unknown'), false);
+    assert.equal(await service.getRunner('claude')('hello', { model: 'sonnet' }, writer), 'complete');
+    assert.equal(await service.abort('claude', 'session-1'), true);
+    assert.deepEqual(calls, [
+        ['run', 'hello', { model: 'sonnet' }, writer],
+        ['abort', 'session-1'],
+    ]);
+});
+test('routes permission decisions through provider-owned runtime capabilities', () => {
+    const decisions = [];
+    const claudeRuntime = createRuntime({
+        permissions: {
+            resolve(requestId, decision) {
+                decisions.push([requestId, decision]);
+            },
+            listPending(sessionId) {
+                return [{ requestId: 'request-1', sessionId }];
+            },
+        },
+    });
+    const service = createService([
+        createProvider('claude', claudeRuntime),
+        createProvider('cursor', createRuntime()),
+    ]);
+    const decision = { allow: true, message: 'approved' };
+    service.resolveToolApproval('request-1', decision);
+    assert.deepEqual(decisions, [['request-1', decision]]);
+    assert.deepEqual(service.getPendingApprovalsForSession('session-1'), [
+        { requestId: 'request-1', sessionId: 'session-1' },
+    ]);
+});
+//# sourceMappingURL=provider-runtime.service.test.js.map

package/dist-server/server/modules/providers/tests/provider-runtime.service.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"provider-runtime.service.test.js","sourceRoot":"","sources":["../../../../../server/modules/providers/tests/provider-runtime.service.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAE,4BAA4B,EAAE,MAAM,0DAA0D,CAAC;AAIxG,SAAS,aAAa,CAAC,YAAuC,EAAE;IAC9D,OAAO;QACL,KAAK,CAAC,GAAG;YACP,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,KAAK;YACH,OAAO,KAAK,CAAC;QACf,CAAC;QACD,GAAG,SAAS;KACb,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,EAAe,EAAE,OAAyB;IAChE,OAAO;QACL,EAAE;QACF,OAAO;QACP,IAAI,EAAE;YACJ,KAAK,CAAC,SAAS;gBACb,OAAO;oBACL,QAAQ,EAAE,EAAE;oBACZ,SAAS,EAAE,IAAI;oBACf,aAAa,EAAE,IAAI;oBACnB,MAAM,EAAE,MAAM;oBACd,OAAO,EAAE,EAAE;iBACZ,CAAC;YACJ,CAAC;SACF;QACD,QAAQ,EAAE;YACR,gBAAgB,CAAC,GAAY,EAAE,SAAwB;gBACrD,OAAO,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;YAChF,CAAC;YACD,KAAK,CAAC,YAAY;gBAChB,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;YAC5E,CAAC;SACF;KACsB,CAAC;AAC5B,CAAC;AAED,SAAS,aAAa,CAAC,SAAsB;IAC3C,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;IAClF,OAAO,4BAA4B,CAAC;QAClC,aAAa,EAAE,GAAG,EAAE,CAAC,SAAS;QAC9B,eAAe,CAAC,YAAY;YAC1B,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,YAA2B,CAAC,CAAC;YAC9D,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,IAAI,KAAK,CAAC,qBAAqB,YAAY,EAAE,CAAC,CAAC;YACvD,CAAC;YACD,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,wBAAwB,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,SAAS,EAAE,CAAC,CAAC,CAAC,IAAI;QACjF,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,UAAU,EAAE,cAAc;YAC5D,OAAO,cAAc,EAAE,IAAI,EAAE,IAAI,SAAS,CAAC;QAC7C,CAAC;QACD,KAAK,CAAC,iBAAiB;YACrB,OAAO;gBACL,OAAO,EAAE,EAAE;gBACX,OAAO,EAAE,eAAe;aACzB,CAAC;QACJ,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED,IAAI,CAAC,iEAAiE,EAAE,GAAG,EAAE;IAC3E,MAAM,SAAS,GAAG,gBAAgB,CAAC,aAAa,EAAE,CAAC;IAEnD,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE;QACzD,QAAQ;QACR,OAAO;QACP,QAAQ;QACR,UAAU;KACX,CAAC,CAAC;IACH,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,OAAO,QAAQ,CAAC,OAAO,CAAC,GAAG,KAAK,UAAU,CAAC,EAAE,IAAI,CAAC,CAAC;IAC9F,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,OAAO,QAAQ,CAAC,OAAO,CAAC,KAAK,KAAK,UAAU,CAAC,EAAE,IAAI,CAAC,CAAC;AAClG,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,0EAA0E,EAAE,KAAK,IAAI,EAAE;IAC1F,MAAM,KAAK,GAAgB,EAAE,CAAC;IAC9B,MAAM,OAAO,GAAG,aAAa,CAAC;QAC5B,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO;YACzC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;YAC9C,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,wBAAwB,CAAC,WAAW,CAAC,EAAE,kBAAkB,CAAC,CAAC;YAChF,MAAM,CAAC,KAAK,CAAC,MAAM,OAAO,CAAC,kBAAkB,CAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC;YAChF,MAAM,CAAC,SAAS,CAAC,MAAM,OAAO,CAAC,iBAAiB,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,CAAC;YAC/F,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;YACpF,MAAM,CAAC,KAAK,CAAC,MAAM,OAAO,CAAC,mBAAmB,EAAE,EAAE,IAAI,CAAC,CAAC;YACxD,OAAO,UAAU,CAAC;QACpB,CAAC;QACD,KAAK,CAAC,KAAK,CAAC,SAAS;YACnB,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;YACjC,OAAO,IAAI,CAAC;QACd,CAAC;KACF,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,aAAa,CAAC,CAAC,cAAc,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACnE,MAAM,MAAM,GAAG,EAAE,IAAI,KAAI,CAAC,EAAE,CAAC;IAE7B,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC;IACjD,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,CAAC;IACnD,MAAM,CAAC,KAAK,CAAC,MAAM,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,MAAM,CAAC,EAAE,UAAU,CAAC,CAAC;IAClG,MAAM,CAAC,KAAK,CAAC,MAAM,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,WAAW,CAAC,EAAE,IAAI,CAAC,CAAC;IAC/D,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE;QACtB,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,MAAM,CAAC;QAC7C,CAAC,OAAO,EAAE,WAAW,CAAC;KACvB,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,yEAAyE,EAAE,GAAG,EAAE;IACnF,MAAM,SAAS,GAAgB,EAAE,CAAC;IAClC,MAAM,aAAa,GAAG,aAAa,CAAC;QAClC,WAAW,EAAE;YACX,OAAO,CAAC,SAAS,EAAE,QAAQ;gBACzB,SAAS,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;YACxC,CAAC;YACD,WAAW,CAAC,SAAS;gBACnB,OAAO,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC;YACjD,CAAC;SACF;KACF,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,aAAa,CAAC;QAC5B,cAAc,CAAC,QAAQ,EAAE,aAAa,CAAC;QACvC,cAAc,CAAC,QAAQ,EAAE,aAAa,EAAE,CAAC;KAC1C,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;IAEtD,OAAO,CAAC,mBAAmB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IAEnD,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;IACvD,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,6BAA6B,CAAC,WAAW,CAAC,EAAE;QACnE,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE;KACnD,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist-server/server/modules/providers/tests/provider-token-usage.service.test.js

@@ -0,0 +1,166 @@
+import assert from 'node:assert/strict';
+import { mkdtemp, rm, writeFile } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import path from 'node:path';
+import test from 'node:test';
+import Database from 'better-sqlite3';
+import { createProviderTokenUsageService } from '../../../modules/providers/services/provider-token-usage.service.js';
+import { AppError } from '../../../shared/utils.js';
+function createSessionRow(overrides = {}) {
+    return {
+        session_id: 'app-session',
+        provider: 'claude',
+        provider_session_id: 'provider-session',
+        project_path: null,
+        jsonl_path: null,
+        custom_name: null,
+        model: null,
+        effort: null,
+        isArchived: 0,
+        created_at: '2026-01-01T00:00:00.000Z',
+        updated_at: '2026-01-01T00:00:00.000Z',
+        ...overrides,
+    };
+}
+test('token usage lookup requires only the app-facing session id for Claude', async () => {
+    const tempDirectory = await mkdtemp(path.join(tmpdir(), 'provider-token-usage-claude-'));
+    const sessionFilePath = path.join(tempDirectory, 'provider-session.jsonl');
+    try {
+        await writeFile(sessionFilePath, [
+            JSON.stringify({
+                type: 'assistant',
+                message: {
+                    usage: {
+                        input_tokens: 100,
+                        cache_read_input_tokens: 20,
+                        cache_creation_input_tokens: 5,
+                        output_tokens: 30,
+                    },
+                },
+            }),
+            '{incomplete',
+        ].join('\n'));
+        const service = createProviderTokenUsageService({
+            getSessionById: () => createSessionRow({ jsonl_path: sessionFilePath }),
+            getClaudeContextWindow: () => '180000',
+        });
+        assert.deepEqual(await service.getSessionTokenUsage('app-session'), {
+            used: 155,
+            total: 180_000,
+            inputTokens: 125,
+            outputTokens: 30,
+            cacheReadTokens: 20,
+            cacheCreationTokens: 5,
+            cacheTokens: 25,
+            breakdown: { input: 125, output: 30 },
+        });
+    }
+    finally {
+        await rm(tempDirectory, { recursive: true, force: true });
+    }
+});
+test('Codex token usage uses the latest token_count snapshot', async () => {
+    const tempDirectory = await mkdtemp(path.join(tmpdir(), 'provider-token-usage-codex-'));
+    const sessionFilePath = path.join(tempDirectory, 'rollout-provider-session.jsonl');
+    try {
+        await writeFile(sessionFilePath, [
+            JSON.stringify({
+                type: 'event_msg',
+                payload: {
+                    type: 'token_count',
+                    info: {
+                        total_token_usage: { input_tokens: 10, output_tokens: 4, total_tokens: 14 },
+                        model_context_window: 100_000,
+                    },
+                },
+            }),
+            JSON.stringify({
+                type: 'event_msg',
+                payload: {
+                    type: 'token_count',
+                    info: {
+                        total_token_usage: { input_tokens: 40, output_tokens: 9, total_tokens: 49 },
+                        model_context_window: 250_000,
+                    },
+                },
+            }),
+        ].join('\n'));
+        const service = createProviderTokenUsageService({
+            getSessionById: () => createSessionRow({
+                provider: 'codex',
+                jsonl_path: sessionFilePath,
+            }),
+        });
+        assert.deepEqual(await service.getSessionTokenUsage('app-session'), {
+            used: 49,
+            total: 250_000,
+            inputTokens: 40,
+            outputTokens: 9,
+            breakdown: { input: 40, output: 9 },
+        });
+    }
+    finally {
+        await rm(tempDirectory, { recursive: true, force: true });
+    }
+});
+test('OpenCode token usage resolves its provider-native id from the session row', async () => {
+    const tempDirectory = await mkdtemp(path.join(tmpdir(), 'provider-token-usage-opencode-'));
+    const databasePath = path.join(tempDirectory, 'opencode.db');
+    const database = new Database(databasePath);
+    try {
+        database.exec(`
+      CREATE TABLE session (
+        id TEXT PRIMARY KEY,
+        tokens_input INTEGER,
+        tokens_output INTEGER,
+        tokens_reasoning INTEGER,
+        tokens_cache_read INTEGER,
+        tokens_cache_write INTEGER
+      )
+    `);
+        database.prepare(`
+      INSERT INTO session (
+        id,
+        tokens_input,
+        tokens_output,
+        tokens_reasoning,
+        tokens_cache_read,
+        tokens_cache_write
+      ) VALUES (?, ?, ?, ?, ?, ?)
+    `).run('provider-session', 12, 7, 3, 5, 2);
+    }
+    finally {
+        database.close();
+    }
+    try {
+        const service = createProviderTokenUsageService({
+            getSessionById: () => createSessionRow({ provider: 'opencode' }),
+            getOpenCodeDatabasePath: () => databasePath,
+        });
+        assert.deepEqual(await service.getSessionTokenUsage('app-session'), {
+            used: 29,
+            inputTokens: 17,
+            outputTokens: 7,
+            breakdown: { input: 17, output: 7 },
+        });
+    }
+    finally {
+        await rm(tempDirectory, { recursive: true, force: true });
+    }
+});
+test('Cursor returns an explicit unsupported token usage result', async () => {
+    const service = createProviderTokenUsageService({
+        getSessionById: () => createSessionRow({ provider: 'cursor' }),
+    });
+    const result = await service.getSessionTokenUsage('app-session');
+    assert.equal(result.unsupported, true);
+    assert.equal(result.used, 0);
+    assert.equal(result.total, 0);
+});
+test('token usage reports SESSION_NOT_FOUND for an unknown app session id', async () => {
+    const service = createProviderTokenUsageService({ getSessionById: () => null });
+    await assert.rejects(() => service.getSessionTokenUsage('missing-session'), (error) => (error instanceof AppError
+        && error.code === 'SESSION_NOT_FOUND'
+        && error.statusCode === 404));
+});
+//# sourceMappingURL=provider-token-usage.service.test.js.map

package/dist-server/server/modules/providers/tests/provider-token-usage.service.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"provider-token-usage.service.test.js","sourceRoot":"","sources":["../../../../../server/modules/providers/tests/provider-token-usage.service.test.ts"],"names":[],"mappings":"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"}