@jingyi0605/codingns 0.9.5 → 0.9.6

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":"AAIA,MAAM,OAAO,uBAAuB;IACL;IAA7B,YAA6B,EAAqB;QAArB,OAAE,GAAF,EAAE,CAAmB;IAAG,CAAC;IAEtD,IAAI,CAAC,MAAe;QAClB,IAAI,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC;YACnB,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QACnC,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE;aAChB,OAAO,CACN;;;;;;;;;;;;;;;;iBAgBS,CACV;aACA,GAAG,EAAkC,CAAC;QAEzC,OAAO,GAAG,CAAC,CAAC,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/C,CAAC;IAED,YAAY,CAAC,MAAc;QACzB,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE;aAChB,OAAO,CACN;;;;;;;;;;;;;;;2BAemB,CACpB;aACA,GAAG,CAAC,MAAM,CAAiC,CAAC;QAE/C,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;;;;;;;;;;;;;;0DAckD,CACnD;aACA,GAAG,CACF,MAAM,CAAC,EAAE,EACT,MAAM,CAAC,MAAM,EACb,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;;;;;;;;;;;;2BAYmB,CACpB;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,EACT,MAAM,CAAC,MAAM,CACd,CAAC;QAEJ,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAkBD,SAAS,mBAAmB,CAAC,GAAqB;IAChD,OAAO;QACL,EAAE,EAAE,GAAG,CAAC,EAAE;QACV,MAAM,EAAE,GAAG,CAAC,OAAO;QACnB,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"}

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

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

@@ -7,6 +7,7 @@ export class ButlerProjectRepository {
         this.db
             .prepare(`INSERT INTO butler_projects (
            id,
+           user_id,
            workspace_id,
            name,
            repo_root,
@@ -21,13 +22,17 @@ export class ButlerProjectRepository {
            created_at,
            updated_at,
            archived_at
-         ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
-            .run(record.id, record.workspaceId, record.name, record.repoRoot, record.defaultProvider, record.instructionProfileId, record.approvalMode, record.lifecycleStatus, record.riskLevel, JSON.stringify(record.config), record.lastPatrolAt, record.lastVerificationAt, record.createdAt, record.updatedAt, record.archivedAt);
+         ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
+            .run(record.id, record.userId, record.workspaceId, record.name, record.repoRoot, record.defaultProvider, record.instructionProfileId, record.approvalMode, record.lifecycleStatus, record.riskLevel, JSON.stringify(record.config), record.lastPatrolAt, record.lastVerificationAt, record.createdAt, record.updatedAt, record.archivedAt);
         return record;
     }
     list(filters) {
         const conditions = [];
         const values = [];
+        if (filters?.userId) {
+            conditions.push("user_id = ?");
+            values.push(filters.userId);
+        }
         if (filters?.workspaceId) {
             conditions.push("workspace_id = ?");
             values.push(filters.workspaceId);
@@ -44,6 +49,7 @@ export class ButlerProjectRepository {
         return this.db
             .prepare(`SELECT
            id,
+           user_id,
            workspace_id,
            name,
            repo_root,
@@ -68,6 +74,7 @@ export class ButlerProjectRepository {
         const row = this.db
             .prepare(`SELECT
            id,
+           user_id,
            workspace_id,
            name,
            repo_root,
@@ -87,6 +94,31 @@ export class ButlerProjectRepository {
             .get(id);
         return row ? mapButlerProjectRow(row) : null;
     }
+    findByIdForUser(id, userId) {
+        const row = this.db
+            .prepare(`SELECT
+           id,
+           user_id,
+           workspace_id,
+           name,
+           repo_root,
+           default_provider,
+           instruction_profile_id,
+           approval_mode,
+           lifecycle_status,
+           risk_level,
+           config_json,
+           last_patrol_at,
+           last_verification_at,
+           created_at,
+           updated_at,
+           archived_at
+         FROM butler_projects
+         WHERE id = ?
+           AND user_id = ?`)
+            .get(id, userId);
+        return row ? mapButlerProjectRow(row) : null;
+    }
     update(record) {
         this.db
             .prepare(`UPDATE butler_projects
@@ -102,14 +134,16 @@ export class ButlerProjectRepository {
              last_verification_at = ?,
              archived_at = ?,
              updated_at = ?
-         WHERE id = ?`)
-            .run(record.name, record.repoRoot, record.defaultProvider, record.instructionProfileId, record.approvalMode, record.lifecycleStatus, record.riskLevel, JSON.stringify(record.config), record.lastPatrolAt, record.lastVerificationAt, record.archivedAt, record.updatedAt, record.id);
+         WHERE id = ?
+           AND user_id = ?`)
+            .run(record.name, record.repoRoot, record.defaultProvider, record.instructionProfileId, record.approvalMode, record.lifecycleStatus, record.riskLevel, JSON.stringify(record.config), record.lastPatrolAt, record.lastVerificationAt, record.archivedAt, record.updatedAt, record.id, record.userId);
         return this.findById(record.id);
     }
 }
 function mapButlerProjectRow(row) {
     return {
         id: row.id,
+        userId: row.user_id,
         workspaceId: row.workspace_id,
         name: row.name,
         repoRoot: row.repo_root,

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

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

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

@@ -4,8 +4,9 @@ export declare class ButlerSessionRepository {
     private readonly db;
     constructor(db: Database.Database);
     create(record: ButlerSession): ButlerSession;
-    listByProject(projectId: string): ButlerSession[];
+    listByProject(projectId: string, userId?: string): ButlerSession[];
     findById(id: string): ButlerSession | null;
     findBySessionId(sessionId: string): ButlerSession | null;
+    findBySessionIdForUser(sessionId: string, userId: string): ButlerSession | null;
     update(record: ButlerSession): ButlerSession | null;
 }

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

@@ -7,6 +7,7 @@ export class ButlerSessionRepository {
         this.db
             .prepare(`INSERT INTO butler_sessions (
            id,
+           user_id,
            project_id,
            session_id,
            role,
@@ -16,14 +17,17 @@ export class ButlerSessionRepository {
            last_checkpoint_at,
            created_at,
            updated_at
-         ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
-            .run(record.id, record.projectId, record.sessionId, record.role, record.ownershipMode, record.status, record.lastSummary, record.lastCheckpointAt, record.createdAt, record.updatedAt);
+         ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
+            .run(record.id, record.userId, record.projectId, record.sessionId, record.role, record.ownershipMode, record.status, record.lastSummary, record.lastCheckpointAt, record.createdAt, record.updatedAt);
         return record;
     }
-    listByProject(projectId) {
+    listByProject(projectId, userId) {
+        const userClause = userId?.trim() ? "AND user_id = ?" : "";
+        const values = userId?.trim() ? [projectId, userId] : [projectId];
         return this.db
             .prepare(`SELECT
            id,
+           user_id,
            project_id,
            session_id,
            role,
@@ -35,14 +39,16 @@ export class ButlerSessionRepository {
            updated_at
          FROM butler_sessions
          WHERE project_id = ?
+           ${userClause}
          ORDER BY updated_at DESC, created_at DESC`)
-            .all(projectId)
+            .all(...values)
             .map((row) => mapButlerSessionRow(row));
     }
     findById(id) {
         const row = this.db
             .prepare(`SELECT
            id,
+           user_id,
            project_id,
            session_id,
            role,
@@ -61,6 +67,7 @@ export class ButlerSessionRepository {
         const row = this.db
             .prepare(`SELECT
            id,
+           user_id,
            project_id,
            session_id,
            role,
@@ -75,6 +82,26 @@ export class ButlerSessionRepository {
             .get(sessionId);
         return row ? mapButlerSessionRow(row) : null;
     }
+    findBySessionIdForUser(sessionId, userId) {
+        const row = this.db
+            .prepare(`SELECT
+           id,
+           user_id,
+           project_id,
+           session_id,
+           role,
+           ownership_mode,
+           status,
+           last_summary,
+           last_checkpoint_at,
+           created_at,
+           updated_at
+         FROM butler_sessions
+         WHERE session_id = ?
+           AND user_id = ?`)
+            .get(sessionId, userId);
+        return row ? mapButlerSessionRow(row) : null;
+    }
     update(record) {
         this.db
             .prepare(`UPDATE butler_sessions
@@ -84,14 +111,16 @@ export class ButlerSessionRepository {
              last_summary = ?,
              last_checkpoint_at = ?,
              updated_at = ?
-         WHERE id = ?`)
-            .run(record.role, record.ownershipMode, record.status, record.lastSummary, record.lastCheckpointAt, record.updatedAt, record.id);
+         WHERE id = ?
+           AND user_id = ?`)
+            .run(record.role, record.ownershipMode, record.status, record.lastSummary, record.lastCheckpointAt, record.updatedAt, record.id, record.userId);
         return this.findById(record.id);
     }
 }
 function mapButlerSessionRow(row) {
     return {
         id: row.id,
+        userId: row.user_id,
         projectId: row.project_id,
         sessionId: row.session_id,
         role: row.role,

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

@@ -1 +1 @@
-{"version":3,"file":"butler-session-repository.js","sourceRoot":"","sources":["../../../../src/storage/repositories/butler-session-repository.ts"],"names":[],"mappings":"AAIA,MAAM,OAAO,uBAAuB;IACL;IAA7B,YAA6B,EAAqB;QAArB,OAAE,GAAF,EAAE,CAAmB;IAAG,CAAC;IAEtD,MAAM,CAAC,MAAqB;QAC1B,IAAI,CAAC,EAAE;aACJ,OAAO,CACN;;;;;;;;;;;iDAWyC,CAC1C;aACA,GAAG,CACF,MAAM,CAAC,EAAE,EACT,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,aAAa,EACpB,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,WAAW,EAClB,MAAM,CAAC,gBAAgB,EACvB,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,SAAS,CACjB,CAAC;QAEJ,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,aAAa,CAAC,SAAiB;QAC7B,OAAO,IAAI,CAAC,EAAE;aACX,OAAO,CACN;;;;;;;;;;;;;mDAa2C,CAC5C;aACA,GAAG,CAAC,SAAS,CAAC;aACd,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,mBAAmB,CAAC,GAAuB,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,QAAQ,CAAC,EAAU;QACjB,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE;aAChB,OAAO,CACN;;;;;;;;;;;;sBAYc,CACf;aACA,GAAG,CAAC,EAAE,CAAiC,CAAC;QAE3C,OAAO,GAAG,CAAC,CAAC,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/C,CAAC;IAED,eAAe,CAAC,SAAiB;QAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE;aAChB,OAAO,CACN;;;;;;;;;;;;8BAYsB,CACvB;aACA,GAAG,CAAC,SAAS,CAAiC,CAAC;QAElD,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;;;;;;;sBAOc,CACf;aACA,GAAG,CACF,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,aAAa,EACpB,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,WAAW,EAClB,MAAM,CAAC,gBAAgB,EACvB,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,EAAE,CACV,CAAC;QAEJ,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAClC,CAAC;CACF;AAeD,SAAS,mBAAmB,CAAC,GAAqB;IAChD,OAAO;QACL,EAAE,EAAE,GAAG,CAAC,EAAE;QACV,SAAS,EAAE,GAAG,CAAC,UAAU;QACzB,SAAS,EAAE,GAAG,CAAC,UAAU;QACzB,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,aAAa,EAAE,GAAG,CAAC,cAAc;QACjC,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,WAAW,EAAE,GAAG,CAAC,YAAY;QAC7B,gBAAgB,EAAE,GAAG,CAAC,kBAAkB;QACxC,SAAS,EAAE,GAAG,CAAC,UAAU;QACzB,SAAS,EAAE,GAAG,CAAC,UAAU;KAC1B,CAAC;AACJ,CAAC"}
+{"version":3,"file":"butler-session-repository.js","sourceRoot":"","sources":["../../../../src/storage/repositories/butler-session-repository.ts"],"names":[],"mappings":"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"}

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

@@ -8,7 +8,10 @@ export declare class SessionBindingRepository {
     private readonly upsertStatement;
     constructor(db: Database.Database);
     findBySessionId(sessionId: string): SessionBinding | null;
+    findBySessionIdForUser(sessionId: string, userId: string): SessionBinding | null;
     findByProviderSession(provider: string, providerSessionId: string): SessionBinding | null;
+    findByProviderSessionForUser(provider: string, providerSessionId: string, userId: string): SessionBinding | null;
     findByRawStoreRef(provider: string, rawStoreRef: string): SessionBinding | null;
+    findByRawStoreRefForUser(provider: string, rawStoreRef: string, userId: string): SessionBinding | null;
     upsert(record: SessionBinding): void;
 }