@jingyi0605/codingns 0.9.0 → 0.9.6

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;
 }

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

@@ -7,6 +7,7 @@ export class ButlerControlSessionRepository {
         this.db
             .prepare(`INSERT INTO butler_control_sessions (
            id,
+           user_id,
            provider_id,
            session_id,
            purpose,
@@ -20,14 +21,15 @@ export class ButlerControlSessionRepository {
            last_summary,
            created_at,
            updated_at
-         ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
-            .run(record.id, record.providerId, record.sessionId, record.purpose, record.title, record.sourceItemId, record.model, record.reasoningLevel, record.permissionMode, record.status, record.lastContextVersion, record.lastSummary, record.createdAt, record.updatedAt);
+         ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
+            .run(record.id, record.userId, record.providerId, record.sessionId, record.purpose, record.title, record.sourceItemId, record.model, record.reasoningLevel, record.permissionMode, record.status, record.lastContextVersion, record.lastSummary, record.createdAt, record.updatedAt);
         return record;
     }
     findById(id) {
         const row = this.db
             .prepare(`SELECT
            id,
+           user_id,
            provider_id,
            session_id,
            purpose,
@@ -47,9 +49,15 @@ export class ButlerControlSessionRepository {
         return row ? mapButlerControlSessionRow(row) : null;
     }
     findLatestByProvider(providerId) {
+        return this.findLatestByProviderForUser(providerId, "");
+    }
+    findLatestByProviderForUser(providerId, userId) {
+        const userClause = userId.trim() ? "AND user_id = ?" : "";
+        const values = userId.trim() ? [providerId, userId] : [providerId];
         const row = this.db
             .prepare(`SELECT
            id,
+           user_id,
            provider_id,
            session_id,
            purpose,
@@ -65,15 +73,22 @@ export class ButlerControlSessionRepository {
            updated_at
          FROM butler_control_sessions
          WHERE provider_id = ?
+           ${userClause}
          ORDER BY updated_at DESC, created_at DESC
          LIMIT 1`)
-            .get(providerId);
+            .get(...values);
         return row ? mapButlerControlSessionRow(row) : null;
     }
     findLatestOpenByProvider(providerId) {
+        return this.findLatestOpenByProviderForUser(providerId, "");
+    }
+    findLatestOpenByProviderForUser(providerId, userId) {
+        const userClause = userId.trim() ? "AND user_id = ?" : "";
+        const values = userId.trim() ? [providerId, userId] : [providerId];
         const row = this.db
             .prepare(`SELECT
            id,
+           user_id,
            provider_id,
            session_id,
            purpose,
@@ -90,15 +105,19 @@ export class ButlerControlSessionRepository {
          FROM butler_control_sessions
          WHERE provider_id = ?
            AND status != 'closed'
+           ${userClause}
          ORDER BY updated_at DESC, created_at DESC
          LIMIT 1`)
-            .get(providerId);
+            .get(...values);
         return row ? mapButlerControlSessionRow(row) : null;
     }
-    listByProvider(providerId) {
+    listByProvider(providerId, userId) {
+        const userClause = userId?.trim() ? "AND user_id = ?" : "";
+        const values = userId?.trim() ? [providerId, userId] : [providerId];
         return this.db
             .prepare(`SELECT
            id,
+           user_id,
            provider_id,
            session_id,
            purpose,
@@ -114,14 +133,16 @@ export class ButlerControlSessionRepository {
            updated_at
          FROM butler_control_sessions
          WHERE provider_id = ?
+           ${userClause}
          ORDER BY updated_at DESC, created_at DESC`)
-            .all(providerId)
+            .all(...values)
             .map((row) => mapButlerControlSessionRow(row));
     }
     findBySessionId(sessionId) {
         const row = this.db
             .prepare(`SELECT
            id,
+           user_id,
            provider_id,
            session_id,
            purpose,
@@ -140,6 +161,30 @@ export class ButlerControlSessionRepository {
             .get(sessionId);
         return row ? mapButlerControlSessionRow(row) : null;
     }
+    findByIdForUser(id, userId) {
+        const row = this.db
+            .prepare(`SELECT
+           id,
+           user_id,
+           provider_id,
+           session_id,
+           purpose,
+           title,
+           source_item_id,
+           model,
+           reasoning_level,
+           permission_mode,
+           status,
+           last_context_version,
+           last_summary,
+           created_at,
+           updated_at
+         FROM butler_control_sessions
+         WHERE id = ?
+           AND user_id = ?`)
+            .get(id, userId);
+        return row ? mapButlerControlSessionRow(row) : null;
+    }
     listSessionIds() {
         return this.db
             .prepare(`SELECT session_id
@@ -160,14 +205,16 @@ export class ButlerControlSessionRepository {
              last_context_version = ?,
              last_summary = ?,
              updated_at = ?
-         WHERE id = ?`)
-            .run(record.purpose, record.title, record.sourceItemId, record.model, record.reasoningLevel, record.permissionMode, record.status, record.lastContextVersion, record.lastSummary, record.updatedAt, record.id);
+         WHERE id = ?
+           AND user_id = ?`)
+            .run(record.purpose, record.title, record.sourceItemId, record.model, record.reasoningLevel, record.permissionMode, record.status, record.lastContextVersion, record.lastSummary, record.updatedAt, record.id, record.userId);
         return record;
     }
 }
 function mapButlerControlSessionRow(row) {
     return {
         id: row.id,
+        userId: row.user_id,
         providerId: row.provider_id,
         sessionId: row.session_id,
         purpose: row.purpose,

package/dist/server/storage/repositories/butler-control-session-repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"butler-control-session-repository.js","sourceRoot":"","sources":["../../../../src/storage/repositories/butler-control-session-repository.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"butler-control-session-repository.js","sourceRoot":"","sources":["../../../../src/storage/repositories/butler-control-session-repository.ts"],"names":[],"mappings":"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"}

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

@@ -3,7 +3,8 @@ import type { ButlerProfile } from "../../types/domain.js";
 export declare class ButlerProfileRepository {
     private readonly db;
     constructor(db: Database.Database);
-    find(): ButlerProfile | null;
+    find(userId?: string): ButlerProfile | null;
+    findByUserId(userId: string): ButlerProfile | null;
     create(record: ButlerProfile): ButlerProfile;
     update(record: ButlerProfile): ButlerProfile;
 }

package/dist/server/storage/repositories/butler-profile-repository.js

@@ -3,10 +3,14 @@ export class ButlerProfileRepository {
     constructor(db) {
         this.db = db;
     }
-    find() {
+    find(userId) {
+        if (userId?.trim()) {
+            return this.findByUserId(userId);
+        }
         const row = this.db
             .prepare(`SELECT
            id,
+           user_id,
            display_name,
            provider_id,
            workspace_path,
@@ -19,14 +23,37 @@ export class ButlerProfileRepository {
            initialized_at,
            updated_at
          FROM butler_profiles
-         WHERE id = 'default'`)
+         ORDER BY updated_at DESC, initialized_at DESC
+         LIMIT 1`)
             .get();
         return row ? mapButlerProfileRow(row) : null;
     }
+    findByUserId(userId) {
+        const row = this.db
+            .prepare(`SELECT
+           id,
+           user_id,
+           display_name,
+           provider_id,
+           workspace_path,
+           agents_mode,
+           agents_file_path,
+           agents_content,
+           persona_json,
+           focus_json,
+           setup_completed,
+           initialized_at,
+           updated_at
+         FROM butler_profiles
+         WHERE user_id = ?`)
+            .get(userId);
+        return row ? mapButlerProfileRow(row) : null;
+    }
     create(record) {
         this.db
             .prepare(`INSERT INTO butler_profiles (
            id,
+           user_id,
            display_name,
            provider_id,
            workspace_path,
@@ -38,8 +65,8 @@ export class ButlerProfileRepository {
            setup_completed,
            initialized_at,
            updated_at
-         ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
-            .run(record.id, record.displayName, record.providerId, record.workspacePath, record.agentsMode, record.agentsFilePath, record.agentsContent, JSON.stringify(record.persona), JSON.stringify(record.focus), record.setupCompleted ? 1 : 0, record.initializedAt, record.updatedAt);
+         ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
+            .run(record.id, record.userId, record.displayName, record.providerId, record.workspacePath, record.agentsMode, record.agentsFilePath, record.agentsContent, JSON.stringify(record.persona), JSON.stringify(record.focus), record.setupCompleted ? 1 : 0, record.initializedAt, record.updatedAt);
         return record;
     }
     update(record) {
@@ -55,14 +82,16 @@ export class ButlerProfileRepository {
              focus_json = ?,
              setup_completed = ?,
              updated_at = ?
-         WHERE id = ?`)
-            .run(record.providerId, record.displayName, record.workspacePath, record.agentsMode, record.agentsFilePath, record.agentsContent, JSON.stringify(record.persona), JSON.stringify(record.focus), record.setupCompleted ? 1 : 0, record.updatedAt, record.id);
+         WHERE id = ?
+           AND user_id = ?`)
+            .run(record.providerId, record.displayName, record.workspacePath, record.agentsMode, record.agentsFilePath, record.agentsContent, JSON.stringify(record.persona), JSON.stringify(record.focus), record.setupCompleted ? 1 : 0, record.updatedAt, record.id, record.userId);
         return record;
     }
 }
 function mapButlerProfileRow(row) {
     return {
         id: row.id,
+        userId: row.user_id,
         displayName: row.display_name,
         providerId: row.provider_id,
         workspacePath: row.workspace_path,

package/dist/server/storage/repositories/butler-profile-repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"butler-profile-repository.js","sourceRoot":"","sources":["../../../../src/storage/repositories/butler-profile-repository.ts"],"names":[],"mappings":"AAIA,MAAM,OAAO,uBAAuB;IACL;IAA7B,YAA6B,EAAqB;QAArB,OAAE,GAAF,EAAE,CAAmB;IAAG,CAAC;IAEtD,IAAI;QACF,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE;aAChB,OAAO,CACN;;;;;;;;;;;;;;8BAcsB,CACvB;aACA,GAAG,EAAkC,CAAC;QAEzC,OAAO,GAAG,CAAC,CAAC,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/C,CAAC;IAED,MAAM,CAAC,MAAqB;QAC1B,IAAI,CAAC,EAAE;aACJ,OAAO,CACN;;;;;;;;;;;;;uDAa+C,CAChD;aACA,GAAG,CACF,MAAM,CAAC,EAAE,EACT,MAAM,CAAC,WAAW,EAClB,MAAM,CAAC,UAAU,EACjB,MAAM,CAAC,aAAa,EACpB,MAAM,CAAC,UAAU,EACjB,MAAM,CAAC,cAAc,EACrB,MAAM,CAAC,aAAa,EACpB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,EAC9B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,EAC5B,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAC7B,MAAM,CAAC,aAAa,EACpB,MAAM,CAAC,SAAS,CACjB,CAAC;QAEJ,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,MAAqB;QAC1B,IAAI,CAAC,EAAE;aACJ,OAAO,CACN;;;;;;;;;;;sBAWc,CACf;aACA,GAAG,CACF,MAAM,CAAC,UAAU,EACjB,MAAM,CAAC,WAAW,EAClB,MAAM,CAAC,aAAa,EACpB,MAAM,CAAC,UAAU,EACjB,MAAM,CAAC,cAAc,EACrB,MAAM,CAAC,aAAa,EACpB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,EAC9B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,EAC5B,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAC7B,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,EAAE,CACV,CAAC;QAEJ,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAiBD,SAAS,mBAAmB,CAAC,GAAqB;IAChD,OAAO;QACL,EAAE,EAAE,GAAG,CAAC,EAAE;QACV,WAAW,EAAE,GAAG,CAAC,YAAY;QAC7B,UAAU,EAAE,GAAG,CAAC,WAAW;QAC3B,aAAa,EAAE,GAAG,CAAC,cAAc;QACjC,UAAU,EAAE,GAAG,CAAC,WAAW;QAC3B,cAAc,EAAE,GAAG,CAAC,gBAAgB;QACpC,aAAa,EAAE,GAAG,CAAC,cAAc;QACjC,OAAO,EAAE,eAAe,CAAC,GAAG,CAAC,YAAY,CAA6B;QACtE,KAAK,EAAE,eAAe,CAAC,GAAG,CAAC,UAAU,CAA2B;QAChE,cAAc,EAAE,GAAG,CAAC,eAAe,KAAK,CAAC;QACzC,aAAa,EAAE,GAAG,CAAC,cAAc;QACjC,SAAS,EAAE,GAAG,CAAC,UAAU;KAC1B,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAC,GAAW;IAClC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAY,CAAC;QAC1C,OAAO,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;YACnE,CAAC,CAAE,MAAkC;YACrC,CAAC,CAAC,EAAE,CAAC;IACT,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC"}
+{"version":3,"file":"butler-profile-repository.js","sourceRoot":"","sources":["../../../../src/storage/repositories/butler-profile-repository.ts"],"names":[],"mappings":"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"}

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

@@ -5,10 +5,12 @@ export declare class ButlerProjectRepository {
     constructor(db: Database.Database);
     create(record: ButlerProject): ButlerProject;
     list(filters?: {
+        userId?: string;
         workspaceId?: string;
         lifecycleStatus?: ButlerProject["lifecycleStatus"];
         riskLevel?: ButlerProject["riskLevel"];
     }): ButlerProject[];
     findById(id: string): ButlerProject | null;
+    findByIdForUser(id: string, userId: string): ButlerProject | null;
     update(record: ButlerProject): ButlerProject | null;
 }