@jingyi0605/codingns 0.9.5 → 0.9.6

package/dist/server/shared/http/request-diagnostics.js

@@ -0,0 +1,256 @@
+const DEFAULT_MAX_RECENT_REQUESTS = 120;
+const DEFAULT_MAX_ACTIVE_REQUESTS = 80;
+const SLOW_ACTIVE_REQUEST_MS = 10_000;
+export class HttpRequestDiagnosticsTracker {
+    maxRecentRequests;
+    maxActiveRequests;
+    nextRequestId = 1;
+    activeRequests = new Map();
+    activeReplyReaders = new Map();
+    recentRequests = [];
+    constructor(maxRecentRequests = DEFAULT_MAX_RECENT_REQUESTS, maxActiveRequests = DEFAULT_MAX_ACTIVE_REQUESTS) {
+        this.maxRecentRequests = maxRecentRequests;
+        this.maxActiveRequests = maxActiveRequests;
+    }
+    begin(request) {
+        const requestId = this.nextRequestId++;
+        const startedAtMs = Date.now();
+        const record = {
+            id: requestId,
+            method: request.method,
+            url: sanitizeRequestUrl(request.url),
+            routePath: readRoutePath(request),
+            startedAt: new Date(startedAtMs).toISOString(),
+            startedAtMs,
+            finishedAt: null,
+            durationMs: null,
+            statusCode: null,
+            replySent: null,
+            headersSent: null,
+            rawWritableEnded: null,
+            rawWritableFinished: null,
+            rawDestroyed: null,
+            aborted: false,
+            remoteAddress: request.ip || null,
+            userAgent: readHeader(request, "user-agent"),
+            contentType: readHeader(request, "content-type"),
+            contentLength: readHeader(request, "content-length")
+        };
+        this.activeRequests.set(requestId, record);
+        this.pruneActiveRequestsIfNeeded();
+        return requestId;
+    }
+    watchReply(requestId, reply) {
+        this.activeReplyReaders.set(requestId, () => readReplyState(reply));
+        this.refreshReplyState(requestId);
+    }
+    finish(requestId, reply, request) {
+        const record = this.activeRequests.get(requestId);
+        if (!record) {
+            this.activeReplyReaders.delete(requestId);
+            return;
+        }
+        const finishedAtMs = Date.now();
+        record.finishedAt = new Date(finishedAtMs).toISOString();
+        record.durationMs = finishedAtMs - record.startedAtMs;
+        record.routePath = request ? readRoutePath(request) : record.routePath;
+        applyReplyState(record, readReplyState(reply));
+        this.activeRequests.delete(requestId);
+        this.activeReplyReaders.delete(requestId);
+        this.pushRecent(record);
+    }
+    markAborted(requestId) {
+        const record = this.activeRequests.get(requestId);
+        if (record) {
+            record.aborted = true;
+        }
+    }
+    snapshot(reason) {
+        const now = Date.now();
+        this.refreshActiveReplyStates();
+        const activeRequests = Array.from(this.activeRequests.values()).map((record) => cloneRecord(record, now));
+        return {
+            reason,
+            capturedAt: new Date(now).toISOString(),
+            process: {
+                pid: process.pid,
+                nodeVersion: process.version,
+                platform: process.platform,
+                arch: process.arch,
+                uptimeSeconds: Math.round(process.uptime()),
+                memoryUsage: process.memoryUsage()
+            },
+            activeRequests,
+            slowActiveRequests: activeRequests.filter((record) => (record.durationMs ?? 0) >= SLOW_ACTIVE_REQUEST_MS),
+            recentRequests: this.recentRequests.map((record) => cloneRecord(record))
+        };
+    }
+    pushRecent(record) {
+        this.recentRequests.push({ ...record });
+        while (this.recentRequests.length > this.maxRecentRequests) {
+            this.recentRequests.shift();
+        }
+    }
+    pruneActiveRequestsIfNeeded() {
+        while (this.activeRequests.size > this.maxActiveRequests) {
+            const firstKey = this.activeRequests.keys().next().value;
+            if (typeof firstKey !== "number") {
+                return;
+            }
+            const record = this.activeRequests.get(firstKey);
+            if (record) {
+                const now = Date.now();
+                record.finishedAt = new Date(now).toISOString();
+                record.durationMs = now - record.startedAtMs;
+                record.statusCode = null;
+                record.replySent = null;
+                record.headersSent = null;
+                record.rawWritableEnded = null;
+                record.rawWritableFinished = null;
+                record.rawDestroyed = null;
+                this.pushRecent(record);
+            }
+            this.activeRequests.delete(firstKey);
+            this.activeReplyReaders.delete(firstKey);
+        }
+    }
+    refreshActiveReplyStates() {
+        for (const requestId of this.activeRequests.keys()) {
+            this.refreshReplyState(requestId);
+        }
+    }
+    refreshReplyState(requestId) {
+        const record = this.activeRequests.get(requestId);
+        const reader = this.activeReplyReaders.get(requestId);
+        if (!record || !reader) {
+            return;
+        }
+        applyReplyState(record, safeReadReplyState(reader));
+    }
+}
+export function logHostFatalDiagnostics(tracker, reason, error) {
+    try {
+        console.error("[host-fatal]", {
+            reason,
+            error: serializeFatalError(error),
+            diagnostics: tracker.snapshot(reason)
+        });
+    }
+    catch (diagnosticsError) {
+        console.error("[host-fatal] failed to collect diagnostics", {
+            reason,
+            error: serializeFatalError(error),
+            diagnosticsError: serializeFatalError(diagnosticsError)
+        });
+    }
+}
+function cloneRecord(record, nowMs) {
+    const durationMs = record.finishedAt === null && typeof nowMs === "number"
+        ? nowMs - record.startedAtMs
+        : record.durationMs;
+    return {
+        ...record,
+        durationMs
+    };
+}
+function readRoutePath(request) {
+    const routeOptions = request.routeOptions;
+    return typeof routeOptions?.url === "string" ? routeOptions.url : null;
+}
+function readHeader(request, name) {
+    const value = request.headers[name];
+    if (Array.isArray(value)) {
+        return value.join(",");
+    }
+    return typeof value === "string" ? value : null;
+}
+function readReplyState(reply) {
+    return {
+        statusCode: reply.statusCode,
+        replySent: reply.sent,
+        headersSent: reply.raw.headersSent,
+        rawWritableEnded: reply.raw.writableEnded,
+        rawWritableFinished: reply.raw.writableFinished,
+        rawDestroyed: reply.raw.destroyed
+    };
+}
+function safeReadReplyState(reader) {
+    try {
+        return reader();
+    }
+    catch {
+        return {
+            statusCode: null,
+            replySent: null,
+            headersSent: null,
+            rawWritableEnded: null,
+            rawWritableFinished: null,
+            rawDestroyed: null
+        };
+    }
+}
+function applyReplyState(record, state) {
+    record.statusCode = state.statusCode;
+    record.replySent = state.replySent;
+    record.headersSent = state.headersSent;
+    record.rawWritableEnded = state.rawWritableEnded;
+    record.rawWritableFinished = state.rawWritableFinished;
+    record.rawDestroyed = state.rawDestroyed;
+}
+function sanitizeRequestUrl(url) {
+    try {
+        const parsed = new URL(url, "http://127.0.0.1");
+        for (const key of Array.from(parsed.searchParams.keys())) {
+            if (isSensitiveQueryKey(key)) {
+                parsed.searchParams.set(key, "[redacted]");
+            }
+        }
+        return `${sanitizeRequestPath(parsed.pathname)}${parsed.search}`;
+    }
+    catch {
+        return url.length > 500 ? `${url.slice(0, 500)}…` : url;
+    }
+}
+function sanitizeRequestPath(pathname) {
+    const segments = pathname.split("/");
+    const previewIndex = segments.indexOf("preview");
+    if (previewIndex >= 0 && segments[previewIndex + 1] === "affairs-files" && segments[previewIndex + 2]) {
+        segments[previewIndex + 2] = "[redacted]";
+        return segments.join("/");
+    }
+    if (previewIndex >= 0 && segments[previewIndex + 1] === "files" && segments[previewIndex + 2]) {
+        segments[previewIndex + 2] = "[redacted]";
+        return segments.join("/");
+    }
+    if (previewIndex >= 0 && segments[previewIndex + 1] === "workspace-bridge") {
+        if (segments[previewIndex + 2] && segments[previewIndex + 2] !== "capabilities") {
+            segments[previewIndex + 2] = "[redacted]";
+        }
+        return segments.join("/");
+    }
+    return pathname;
+}
+function isSensitiveQueryKey(key) {
+    const normalized = key.trim().toLowerCase();
+    return normalized === "token"
+        || normalized === "access_token"
+        || normalized === "refresh_token"
+        || normalized === "authorization"
+        || normalized === "auth";
+}
+function serializeFatalError(error) {
+    if (error instanceof Error) {
+        const nodeError = error;
+        return {
+            name: error.name,
+            message: error.message,
+            code: nodeError.code,
+            stack: error.stack
+        };
+    }
+    return {
+        name: typeof error,
+        message: String(error)
+    };
+}
+//# sourceMappingURL=request-diagnostics.js.map

package/dist/server/shared/http/request-diagnostics.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"request-diagnostics.js","sourceRoot":"","sources":["../../../../src/shared/http/request-diagnostics.ts"],"names":[],"mappings":"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"}

package/dist/server/storage/repositories/auth-token-repository.d.ts

@@ -9,5 +9,6 @@ export declare class AuthTokenRepository {
     revokeByHash(tokenHash: string, revokedAt: string): void;
     revokeByDeviceSessionIds(deviceSessionIds: string[], revokedAt: string): void;
     revokeLegacyTokensByUser(userId: string, revokedAt: string): void;
+    revokeAllByUser(userId: string, revokedAt: string): void;
     listActiveLegacyRefreshTokensByUser(userId: string, now: string): AuthTokenRecord[];
 }

package/dist/server/storage/repositories/auth-token-repository.js

@@ -78,6 +78,14 @@ export class AuthTokenRepository {
            AND revoked_at IS NULL`)
             .run(revokedAt, userId);
     }
+    revokeAllByUser(userId, revokedAt) {
+        this.db
+            .prepare(`UPDATE auth_tokens
+         SET revoked_at = ?
+         WHERE user_id = ?
+           AND revoked_at IS NULL`)
+            .run(revokedAt, userId);
+    }
     listActiveLegacyRefreshTokensByUser(userId, now) {
         return this.db
             .prepare(`SELECT id, user_id, token_type, token_hash, device_session_id, caller_kind,

package/dist/server/storage/repositories/auth-token-repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth-token-repository.js","sourceRoot":"","sources":["../../../../src/storage/repositories/auth-token-repository.ts"],"names":[],"mappings":"AAIA,MAAM,OAAO,mBAAmB;IACD;IAA7B,YAA6B,EAAqB;QAArB,OAAE,GAAF,EAAE,CAAmB;IAAG,CAAC;IAEtD,MAAM,CAAC,MAAuB;QAC5B,IAAI,CAAC,EAAE;aACJ,OAAO,CACN;;;;;;;;;;;;;;;wDAegD,CACjD;aACA,GAAG,CACF,MAAM,CAAC,EAAE,EACT,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,UAAU,EACjB,MAAM,CAAC,iBAAiB,EACxB,MAAM,CAAC,WAAW,EAClB,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,SAAS,CACjB,CAAC;IACN,CAAC;IAED,UAAU,CAAC,SAAiB,EAAE,SAAgC;QAC5D,MAAM,GAAG,GAAG,SAAS;YACnB,CAAC,CAAE,IAAI,CAAC,EAAE;iBACL,OAAO,CACN;;;;qDAIyC,CAC1C;iBACA,GAAG,CAAC,SAAS,EAAE,SAAS,CAA0B;YACvD,CAAC,CAAE,IAAI,CAAC,EAAE;iBACL,OAAO,CACN;;;;kCAIsB,CACvB;iBACA,GAAG,CAAC,SAAS,CAA0B,CAAC;QAE/C,OAAO,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACvC,CAAC;IAED,QAAQ,CAAC,EAAU;QACjB,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE;aAChB,OAAO,CACN;;;;sBAIc,CACf;aACA,GAAG,CAAC,EAAE,CAAyB,CAAC;QAEnC,OAAO,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACvC,CAAC;IAED,YAAY,CAAC,SAAiB,EAAE,SAAiB;QAC/C,IAAI,CAAC,EAAE;aACJ,OAAO,CACN;;qDAE6C,CAC9C;aACA,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAC/B,CAAC;IAED,wBAAwB,CAAC,gBAA0B,EAAE,SAAiB;QACpE,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClC,OAAO;QACT,CAAC;QAED,MAAM,YAAY,GAAG,gBAAgB,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChE,IAAI,CAAC,EAAE;aACJ,OAAO,CACN;;uCAE+B,YAAY,0BAA0B,CACtE;aACA,GAAG,CAAC,SAAS,EAAE,GAAG,gBAAgB,CAAC,CAAC;IACzC,CAAC;IAED,wBAAwB,CAAC,MAAc,EAAE,SAAiB;QACxD,IAAI,CAAC,EAAE;aACJ,OAAO,CACN;;;;kCAI0B,CAC3B;aACA,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAC5B,CAAC;IAED,mCAAmC,CAAC,MAAc,EAAE,GAAW;QAC7D,OAAO,IAAI,CAAC,EAAE;aACX,OAAO,CACN;;;;;;;;;kCAS0B,CAC3B;aACA,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC;aAChB,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,WAAW,CAAC,GAAe,CAAC,CAAC,CAAC;IAChD,CAAC;CACF;AAkBD,SAAS,WAAW,CAAC,GAAa;IAChC,OAAO;QACL,EAAE,EAAE,GAAG,CAAC,EAAE;QACV,MAAM,EAAE,GAAG,CAAC,OAAO;QACnB,SAAS,EAAE,GAAG,CAAC,UAAU;QACzB,SAAS,EAAE,GAAG,CAAC,UAAU;QACzB,eAAe,EAAE,GAAG,CAAC,iBAAiB;QACtC,UAAU,EAAE,GAAG,CAAC,WAAW;QAC3B,iBAAiB,EAAE,GAAG,CAAC,kBAAkB;QACzC,WAAW,EAAE,GAAG,CAAC,YAAY;QAC7B,SAAS,EAAE,GAAG,CAAC,UAAU;QACzB,SAAS,EAAE,GAAG,CAAC,UAAU;QACzB,SAAS,EAAE,GAAG,CAAC,UAAU;QACzB,SAAS,EAAE,GAAG,CAAC,UAAU;QACzB,SAAS,EAAE,GAAG,CAAC,UAAU;KAC1B,CAAC;AACJ,CAAC"}
+{"version":3,"file":"auth-token-repository.js","sourceRoot":"","sources":["../../../../src/storage/repositories/auth-token-repository.ts"],"names":[],"mappings":"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"}

package/dist/server/storage/repositories/auth-user-repository.d.ts

@@ -4,8 +4,58 @@ export declare class AuthUserRepository {
     private readonly db;
     constructor(db: Database.Database);
     create(record: AuthUser): void;
+    list(): AuthUser[];
     findByUsername(username: string): AuthUser | null;
     findById(id: string): AuthUser | null;
     count(): number;
     listIds(): string[];
+    updateStatus(id: string, status: AuthUser["status"], updatedAt: string): AuthUser | null;
+    updateProfile(input: {
+        id: string;
+        username: string;
+        passwordHash: string | null;
+        updatedAt: string;
+    }): AuthUser | null;
+    deleteById(id: string): boolean;
+    hasBlockingDataForDelete(userId: string): boolean;
+    getUsageSnapshot(period: AuthUserUsagePeriod): AuthUserUsageSnapshot;
+    private listGroupedUsageRows;
+}
+export type AuthUserUsagePeriod = "day" | "week" | "month";
+export interface AuthUserUsageSnapshot {
+    period: AuthUserUsagePeriod;
+    tokenUsageAvailable: boolean;
+    users: AuthUserUsageUserSnapshot[];
+}
+export interface AuthUserUsageUserSnapshot {
+    user: {
+        userId: string;
+        username: string;
+        status: AuthUser["status"];
+    };
+    sessionCount: number;
+    tokenTotals: {
+        inputTokens: number;
+        outputTokens: number;
+        totalTokens: number;
+    };
+    tokenUsageAvailable: boolean;
+    timeline: AuthUserUsageBucket[];
+    modelUsage: AuthUserUsageItem[];
+    cliProviderUsage: AuthUserUsageItem[];
+    modelProviderUsage: AuthUserUsageItem[];
+}
+export interface AuthUserUsageBucket {
+    bucket: string;
+    sessionCount: number;
+    inputTokens: number;
+    outputTokens: number;
+    totalTokens: number;
+}
+export interface AuthUserUsageItem {
+    label: string;
+    count: number;
+    inputTokens: number;
+    outputTokens: number;
+    totalTokens: number;
 }

package/dist/server/storage/repositories/auth-user-repository.js

@@ -5,45 +5,33 @@ export class AuthUserRepository {
     }
     create(record) {
         this.db
-            .prepare(`INSERT INTO auth_users (id, username, password_hash, role, created_at, updated_at)
-         VALUES (?, ?, ?, ?, ?, ?)`)
-            .run(record.id, record.username, record.passwordHash, record.role, record.createdAt, record.updatedAt);
+            .prepare(`INSERT INTO auth_users (id, username, password_hash, role, status, created_at, updated_at)
+         VALUES (?, ?, ?, ?, ?, ?, ?)`)
+            .run(record.id, record.username, record.passwordHash, record.role, record.status, record.createdAt, record.updatedAt);
+    }
+    list() {
+        return this.db
+            .prepare(`SELECT id, username, password_hash, role, status, created_at, updated_at
+         FROM auth_users
+         ORDER BY created_at ASC, username ASC`)
+            .all()
+            .map((row) => mapAuthUserRow(row));
     }
     findByUsername(username) {
         const row = this.db
-            .prepare(`SELECT id, username, password_hash, role, created_at, updated_at
+            .prepare(`SELECT id, username, password_hash, role, status, created_at, updated_at
          FROM auth_users
          WHERE username = ?`)
             .get(username);
-        if (!row) {
-            return null;
-        }
-        return {
-            id: row.id,
-            username: row.username,
-            passwordHash: row.password_hash,
-            role: row.role,
-            createdAt: row.created_at,
-            updatedAt: row.updated_at
-        };
+        return row ? mapAuthUserRow(row) : null;
     }
     findById(id) {
         const row = this.db
-            .prepare(`SELECT id, username, password_hash, role, created_at, updated_at
+            .prepare(`SELECT id, username, password_hash, role, status, created_at, updated_at
          FROM auth_users
          WHERE id = ?`)
             .get(id);
-        if (!row) {
-            return null;
-        }
-        return {
-            id: row.id,
-            username: row.username,
-            passwordHash: row.password_hash,
-            role: row.role,
-            createdAt: row.created_at,
-            updatedAt: row.updated_at
-        };
+        return row ? mapAuthUserRow(row) : null;
     }
     count() {
         const row = this.db.prepare("SELECT COUNT(1) AS count FROM auth_users").get();
@@ -57,5 +45,188 @@ export class AuthUserRepository {
             .all()
             .map((row) => row.id);
     }
+    updateStatus(id, status, updatedAt) {
+        this.db
+            .prepare(`UPDATE auth_users
+         SET status = ?,
+             updated_at = ?
+         WHERE id = ?`)
+            .run(status, updatedAt, id);
+        return this.findById(id);
+    }
+    updateProfile(input) {
+        if (input.passwordHash) {
+            this.db
+                .prepare(`UPDATE auth_users
+           SET username = ?,
+               password_hash = ?,
+               updated_at = ?
+           WHERE id = ?`)
+                .run(input.username, input.passwordHash, input.updatedAt, input.id);
+        }
+        else {
+            this.db
+                .prepare(`UPDATE auth_users
+           SET username = ?,
+               updated_at = ?
+           WHERE id = ?`)
+                .run(input.username, input.updatedAt, input.id);
+        }
+        return this.findById(input.id);
+    }
+    deleteById(id) {
+        const result = this.db.prepare("DELETE FROM auth_users WHERE id = ?").run(id);
+        return result.changes > 0;
+    }
+    hasBlockingDataForDelete(userId) {
+        const row = this.db
+            .prepare(`SELECT
+           (SELECT COUNT(1) FROM workspaces WHERE owner_user_id = ?) +
+           (SELECT COUNT(1) FROM session_bindings WHERE user_id = ?) +
+           (SELECT COUNT(1) FROM auth_tokens WHERE user_id = ?) +
+           (SELECT COUNT(1) FROM auth_devices WHERE user_id = ?) +
+           (SELECT COUNT(1) FROM auth_device_sessions WHERE user_id = ?) +
+           (SELECT COUNT(1) FROM auth_login_events WHERE user_id = ?) +
+           (SELECT COUNT(1) FROM butler_profiles WHERE user_id = ?) +
+           (SELECT COUNT(1) FROM butler_projects WHERE user_id = ?) +
+           (SELECT COUNT(1) FROM butler_sessions WHERE user_id = ?) +
+           (SELECT COUNT(1) FROM butler_control_sessions WHERE user_id = ?) AS count`)
+            .get(userId, userId, userId, userId, userId, userId, userId, userId, userId, userId);
+        return row.count > 0;
+    }
+    getUsageSnapshot(period) {
+        const bucketSql = getUsageBucketSql(period);
+        const users = this.list().map((user) => ({
+            user: toAuthUserUsageUser(user),
+            sessionCount: 0,
+            tokenTotals: {
+                inputTokens: 0,
+                outputTokens: 0,
+                totalTokens: 0
+            },
+            tokenUsageAvailable: false,
+            timeline: [],
+            modelUsage: [],
+            cliProviderUsage: [],
+            modelProviderUsage: []
+        }));
+        const byUserId = new Map(users.map((item) => [item.user.userId, item]));
+        for (const row of this.db
+            .prepare(`SELECT user_id, COUNT(1) AS count
+         FROM session_bindings
+         WHERE user_id IS NOT NULL
+         GROUP BY user_id`)
+            .all()) {
+            const item = byUserId.get(row.user_id);
+            if (item) {
+                item.sessionCount = row.count;
+            }
+        }
+        for (const row of this.db
+            .prepare(`SELECT user_id, ${bucketSql} AS bucket, COUNT(1) AS session_count
+         FROM session_bindings
+         WHERE user_id IS NOT NULL
+         GROUP BY user_id, bucket
+         ORDER BY bucket ASC`)
+            .all()) {
+            const item = byUserId.get(row.user_id);
+            if (item && row.bucket) {
+                item.timeline.push({
+                    bucket: row.bucket,
+                    sessionCount: row.session_count,
+                    inputTokens: 0,
+                    outputTokens: 0,
+                    totalTokens: 0
+                });
+            }
+        }
+        for (const row of this.listGroupedUsageRows(`SELECT user_id, provider AS label, COUNT(1) AS count
+       FROM session_bindings
+       WHERE user_id IS NOT NULL
+       GROUP BY user_id, provider`)) {
+            byUserId.get(row.userId)?.cliProviderUsage.push(toUsageItem(row));
+        }
+        for (const row of this.listGroupedUsageRows(`SELECT user_id, model AS label, COUNT(1) AS count
+       FROM butler_control_sessions
+       WHERE user_id IS NOT NULL AND model IS NOT NULL AND TRIM(model) <> ''
+       GROUP BY user_id, model`)) {
+            byUserId.get(row.userId)?.modelUsage.push(toUsageItem(row));
+        }
+        for (const row of this.listGroupedUsageRows(`SELECT sb.user_id AS user_id, psm.model AS label, COUNT(1) AS count
+       FROM parallel_session_members psm
+       INNER JOIN session_bindings sb ON sb.session_id = psm.session_id
+       WHERE sb.user_id IS NOT NULL AND psm.model IS NOT NULL AND TRIM(psm.model) <> ''
+       GROUP BY sb.user_id, psm.model`)) {
+            appendUsageItem(byUserId.get(row.userId)?.modelUsage, row);
+        }
+        for (const item of users) {
+            item.modelUsage.sort(sortUsageItem);
+            item.cliProviderUsage.sort(sortUsageItem);
+            item.modelProviderUsage.sort(sortUsageItem);
+        }
+        return {
+            period,
+            tokenUsageAvailable: false,
+            users
+        };
+    }
+    listGroupedUsageRows(sql) {
+        return this.db.prepare(sql).all()
+            .map((row) => ({
+            userId: row.user_id,
+            label: row.label?.trim() || "unknown",
+            count: row.count
+        }));
+    }
+}
+function getUsageBucketSql(period) {
+    if (period === "week") {
+        return "strftime('%Y-W%W', created_at)";
+    }
+    if (period === "month") {
+        return "substr(created_at, 1, 7)";
+    }
+    return "substr(created_at, 1, 10)";
+}
+function toAuthUserUsageUser(user) {
+    return {
+        userId: user.id,
+        username: user.username,
+        status: user.status
+    };
+}
+function toUsageItem(row) {
+    return {
+        label: row.label,
+        count: row.count,
+        inputTokens: 0,
+        outputTokens: 0,
+        totalTokens: 0
+    };
+}
+function appendUsageItem(target, row) {
+    if (!target) {
+        return;
+    }
+    const existing = target.find((item) => item.label === row.label);
+    if (existing) {
+        existing.count += row.count;
+        return;
+    }
+    target.push(toUsageItem(row));
+}
+function sortUsageItem(left, right) {
+    return right.count - left.count || left.label.localeCompare(right.label);
+}
+function mapAuthUserRow(row) {
+    return {
+        id: row.id,
+        username: row.username,
+        passwordHash: row.password_hash,
+        role: row.role,
+        status: row.status === "disabled" ? "disabled" : "active",
+        createdAt: row.created_at,
+        updatedAt: row.updated_at
+    };
 }
 //# sourceMappingURL=auth-user-repository.js.map

package/dist/server/storage/repositories/auth-user-repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth-user-repository.js","sourceRoot":"","sources":["../../../../src/storage/repositories/auth-user-repository.ts"],"names":[],"mappings":"AAIA,MAAM,OAAO,kBAAkB;IACA;IAA7B,YAA6B,EAAqB;QAArB,OAAE,GAAF,EAAE,CAAmB;IAAG,CAAC;IAEtD,MAAM,CAAC,MAAgB;QACrB,IAAI,CAAC,EAAE;aACJ,OAAO,CACN;mCAC2B,CAC5B;aACA,GAAG,CACF,MAAM,CAAC,EAAE,EACT,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,SAAS,CACjB,CAAC;IACN,CAAC;IAED,cAAc,CAAC,QAAgB;QAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE;aAChB,OAAO,CACN;;4BAEoB,CACrB;aACA,GAAG,CAAC,QAAQ,CASF,CAAC;QAEd,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO;YACL,EAAE,EAAE,GAAG,CAAC,EAAE;YACV,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,YAAY,EAAE,GAAG,CAAC,aAAa;YAC/B,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,SAAS,EAAE,GAAG,CAAC,UAAU;YACzB,SAAS,EAAE,GAAG,CAAC,UAAU;SAC1B,CAAC;IACJ,CAAC;IAED,QAAQ,CAAC,EAAU;QACjB,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE;aAChB,OAAO,CACN;;sBAEc,CACf;aACA,GAAG,CAAC,EAAE,CASI,CAAC;QAEd,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO;YACL,EAAE,EAAE,GAAG,CAAC,EAAE;YACV,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,YAAY,EAAE,GAAG,CAAC,aAAa;YAC/B,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,SAAS,EAAE,GAAG,CAAC,UAAU;YACzB,SAAS,EAAE,GAAG,CAAC,UAAU;SAC1B,CAAC;IACJ,CAAC;IAED,KAAK;QACH,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,0CAA0C,CAAC,CAAC,GAAG,EAAuB,CAAC;QACnG,OAAO,GAAG,CAAC,KAAK,CAAC;IACnB,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,EAAE;aACX,OAAO,CACN;;iCAEyB,CAC1B;aACA,GAAG,EAAE;aACL,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAE,GAAsB,CAAC,EAAE,CAAC,CAAC;IAC9C,CAAC;CACF"}
+{"version":3,"file":"auth-user-repository.js","sourceRoot":"","sources":["../../../../src/storage/repositories/auth-user-repository.ts"],"names":[],"mappings":"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"}

package/dist/server/storage/repositories/butler-control-session-repository.d.ts

@@ -6,9 +6,12 @@ export declare class ButlerControlSessionRepository {
     create(record: ButlerControlSession): ButlerControlSession;
     findById(id: string): ButlerControlSession | null;
     findLatestByProvider(providerId: ButlerControlSession["providerId"]): ButlerControlSession | null;
+    findLatestByProviderForUser(providerId: ButlerControlSession["providerId"], userId: string): ButlerControlSession | null;
     findLatestOpenByProvider(providerId: ButlerControlSession["providerId"]): ButlerControlSession | null;
-    listByProvider(providerId: ButlerControlSession["providerId"]): ButlerControlSession[];
+    findLatestOpenByProviderForUser(providerId: ButlerControlSession["providerId"], userId: string): ButlerControlSession | null;
+    listByProvider(providerId: ButlerControlSession["providerId"], userId?: string): ButlerControlSession[];
     findBySessionId(sessionId: string): ButlerControlSession | null;
+    findByIdForUser(id: string, userId: string): ButlerControlSession | null;
     listSessionIds(): string[];
     update(record: ButlerControlSession): ButlerControlSession;
 }