devchain-cli 0.22.1 → 0.23.1

package/dist/server/modules/external-integrations/models/external-time-mutation.models.d.ts

@@ -6,7 +6,7 @@ export declare const MAX_TIME_OPERATION_ID_LENGTH = 128;
 export declare const TIME_OPERATION_ID_PATTERN: RegExp;
 export declare const TIME_CREATE_BASELINE_WINDOW_MS: number;
 export declare const TIME_ENTRY_START_TOLERANCE_MS = 90000;
-export type ExternalTimeMutationKind = 'create' | 'delete';
+export type ExternalTimeMutationKind = 'create' | 'update' | 'delete';
 export type ExternalTimeMutationPhase = 'pending' | 'dispatched' | 'outcome_unknown' | 'succeeded' | 'failed' | 'already_deleted' | 'not_applied' | 'abandoned_unknown' | 'superseded';
 export declare const TERMINAL_TIME_MUTATION_PHASES: ReadonlySet<ExternalTimeMutationPhase>;
 export interface ExternalTimeMutationTuple {
@@ -23,6 +23,11 @@ export interface ExternalTimeCreateBaseline {
     matchingIds: string[];
     complete: boolean;
 }
+export interface ExternalTimeUpdateBaseline {
+    startedAt: string;
+    durationMs: number;
+    noteFingerprint: string;
+}
 export interface ExternalTimeMutationReceipt {
     operationId: string;
     kind: ExternalTimeMutationKind;
@@ -30,9 +35,18 @@ export interface ExternalTimeMutationReceipt {
     phase: ExternalTimeMutationPhase;
     remoteEntryId: string | null;
     baseline: ExternalTimeCreateBaseline | null;
+    updateBaseline: ExternalTimeUpdateBaseline | null;
     createdAt: number;
     updatedAt: number;
 }
+export interface ExternalTimeOperationInspection {
+    operationId: string;
+    kind: ExternalTimeMutationKind;
+    tuple: Readonly<ExternalTimeMutationTuple>;
+    phase: ExternalTimeMutationPhase;
+    canVerify: boolean;
+    expiresAt: string;
+}
 export interface ExternalTimeOperationReceiptView {
     operationId: string;
     kind: ExternalTimeMutationKind;
@@ -40,10 +54,17 @@ export interface ExternalTimeOperationReceiptView {
     remoteTaskId: string;
     remoteEntryId: string | null;
     phase: ExternalTimeMutationPhase;
+    canVerify: boolean;
     createdAt: string;
     updatedAt: string;
     expiresAt: string;
 }
+export declare function timeOperationCanVerify(receipt: {
+    kind: ExternalTimeMutationKind;
+    phase: ExternalTimeMutationPhase;
+    baseline: ExternalTimeCreateBaseline | null;
+    updateBaseline: ExternalTimeUpdateBaseline | null;
+}): boolean;
 export type ExternalTimeEntryCreateResult = {
     outcome: 'created';
     remoteEntryId: string | null;
@@ -66,7 +87,17 @@ export type ExternalTimeEntryDeleteResult = {
     outcome: 'outcome_unknown';
     receipt: ExternalTimeOperationReceiptView;
 };
-export type ExternalTimeOperationVerifyResolution = 'created' | 'deleted' | 'already_deleted' | 'not_applied' | 'completeness_not_provable' | 'unresolved' | 'connection_superseded' | 'verify_failed' | 'already_terminal';
+export type ExternalTimeEntryUpdateResult = {
+    outcome: 'updated';
+    receipt: ExternalTimeOperationReceiptView;
+} | {
+    outcome: 'not_applied';
+    receipt: ExternalTimeOperationReceiptView;
+} | {
+    outcome: 'outcome_unknown';
+    receipt: ExternalTimeOperationReceiptView;
+};
+export type ExternalTimeOperationVerifyResolution = 'created' | 'updated' | 'deleted' | 'already_deleted' | 'not_applied' | 'completeness_not_provable' | 'unresolved' | 'connection_superseded' | 'verify_failed' | 'already_terminal';
 export interface ExternalTimeOperationVerifyResult {
     receipt: ExternalTimeOperationReceiptView;
     resolved: boolean;

package/dist/server/modules/external-integrations/models/external-time-mutation.models.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TERMINAL_TIME_MUTATION_PHASES = exports.TIME_ENTRY_START_TOLERANCE_MS = exports.TIME_CREATE_BASELINE_WINDOW_MS = exports.TIME_OPERATION_ID_PATTERN = exports.MAX_TIME_OPERATION_ID_LENGTH = exports.TIME_OPERATION_MAX_RECEIPTS = exports.TIME_OPERATION_MAX_LIVE_RECEIPTS = exports.TIME_OPERATION_RECEIPT_TTL_MS = void 0;
+exports.timeOperationCanVerify = timeOperationCanVerify;
 exports.TIME_OPERATION_RECEIPT_TTL_MS = 24 * 60 * 60 * 1_000;
 exports.TIME_OPERATION_MAX_LIVE_RECEIPTS = 32;
 exports.TIME_OPERATION_MAX_RECEIPTS = 256;
@@ -16,4 +17,17 @@ exports.TERMINAL_TIME_MUTATION_PHASES = new Set([
     'abandoned_unknown',
     'superseded',
 ]);
+function timeOperationCanVerify(receipt) {
+    if (receipt.phase !== 'outcome_unknown') {
+        return false;
+    }
+    switch (receipt.kind) {
+        case 'create':
+            return receipt.baseline?.complete === true;
+        case 'update':
+            return receipt.updateBaseline !== null;
+        case 'delete':
+            return true;
+    }
+}
 //# sourceMappingURL=external-time-mutation.models.js.map

package/dist/server/modules/external-integrations/models/external-time-mutation.models.js.map

@@ -1 +1 @@
-{"version":3,"file":"external-time-mutation.models.js","sourceRoot":"","sources":["../../../../src/modules/external-integrations/models/external-time-mutation.models.ts"],"names":[],"mappings":";;;AAGa,QAAA,6BAA6B,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC;AACrD,QAAA,gCAAgC,GAAG,EAAE,CAAC;AACtC,QAAA,2BAA2B,GAAG,GAAG,CAAC;AAClC,QAAA,4BAA4B,GAAG,GAAG,CAAC;AACnC,QAAA,yBAAyB,GAAG,0BAA0B,CAAC;AAGvD,QAAA,8BAA8B,GAAG,EAAE,GAAG,MAAM,CAAC;AAG7C,QAAA,6BAA6B,GAAG,MAAM,CAAC;AAoBvC,QAAA,6BAA6B,GAA2C,IAAI,GAAG,CAAC;IAC3F,WAAW;IACX,QAAQ;IACR,iBAAiB;IACjB,aAAa;IACb,mBAAmB;IACnB,YAAY;CACb,CAAC,CAAC"}
+{"version":3,"file":"external-time-mutation.models.js","sourceRoot":"","sources":["../../../../src/modules/external-integrations/models/external-time-mutation.models.ts"],"names":[],"mappings":";;;AAiHA,wDAiBC;AA/HY,QAAA,6BAA6B,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC;AACrD,QAAA,gCAAgC,GAAG,EAAE,CAAC;AACtC,QAAA,2BAA2B,GAAG,GAAG,CAAC;AAClC,QAAA,4BAA4B,GAAG,GAAG,CAAC;AACnC,QAAA,yBAAyB,GAAG,0BAA0B,CAAC;AAGvD,QAAA,8BAA8B,GAAG,EAAE,GAAG,MAAM,CAAC;AAG7C,QAAA,6BAA6B,GAAG,MAAM,CAAC;AAoBvC,QAAA,6BAA6B,GAA2C,IAAI,GAAG,CAAC;IAC3F,WAAW;IACX,QAAQ;IACR,iBAAiB;IACjB,aAAa;IACb,mBAAmB;IACnB,YAAY;CACb,CAAC,CAAC;AAyEH,SAAgB,sBAAsB,CAAC,OAKtC;IACC,IAAI,OAAO,CAAC,KAAK,KAAK,iBAAiB,EAAE,CAAC;QACxC,OAAO,KAAK,CAAC;IACf,CAAC;IACD,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;QACrB,KAAK,QAAQ;YACX,OAAO,OAAO,CAAC,QAAQ,EAAE,QAAQ,KAAK,IAAI,CAAC;QAC7C,KAAK,QAAQ;YACX,OAAO,OAAO,CAAC,cAAc,KAAK,IAAI,CAAC;QACzC,KAAK,QAAQ;YACX,OAAO,IAAI,CAAC;IAChB,CAAC;AACH,CAAC"}

package/dist/server/modules/external-integrations/my-work/external-edit-session.service.d.ts

@@ -21,18 +21,18 @@ export declare class ExternalEditSessionService {
     private readonly store;
     private readonly capabilities;
     constructor(storage: StorageService, providers: ExternalTaskProviderRegistry, gate: ProviderOperationGate, store: ExternalEditSessionStore, capabilities?: ExternalRichCapabilityFlags);
-    readRichDescription(provider: IntegrationProvider, remoteTaskId: string): Promise<ExternalRichDescriptionRead>;
-    createDescriptionSession(provider: IntegrationProvider, remoteTaskId: string): Promise<ExternalEditSessionView>;
-    createCommentEditSession(provider: IntegrationProvider, remoteTaskId: string, commentId: string, lookupToken: string | null): Promise<ExternalEditSessionView>;
-    createCommentDeleteSession(provider: IntegrationProvider, remoteTaskId: string, commentId: string, pageProof: string | null): Promise<ExternalEditSessionView>;
-    touchSession(sessionId: string): Promise<ExternalEditSessionView>;
-    saveSession(sessionId: string, payload: ExternalRichDocumentV1, expectedRevision: number): Promise<ExternalSessionWriteOutcome>;
+    readRichDescription(projectId: string, provider: IntegrationProvider, remoteTaskId: string): Promise<ExternalRichDescriptionRead>;
+    createDescriptionSession(projectId: string, provider: IntegrationProvider, remoteTaskId: string): Promise<ExternalEditSessionView>;
+    createCommentEditSession(projectId: string, provider: IntegrationProvider, remoteTaskId: string, commentId: string, lookupToken: string | null): Promise<ExternalEditSessionView>;
+    createCommentDeleteSession(projectId: string, provider: IntegrationProvider, remoteTaskId: string, commentId: string, pageProof: string | null): Promise<ExternalEditSessionView>;
+    touchSession(projectId: string, sessionId: string): Promise<ExternalEditSessionView>;
+    saveSession(projectId: string, sessionId: string, payload: ExternalRichDocumentV1, expectedRevision: number): Promise<ExternalSessionWriteOutcome>;
     private saveDispatchPhase;
     private postWriteVerification;
     private freshContentFingerprint;
-    reloadSession(sessionId: string): Promise<ExternalSessionReloadResult>;
-    verifySession(sessionId: string): Promise<ExternalSessionVerifyResult>;
-    executeCommentDelete(sessionId: string): Promise<ExternalCommentDeleteOutcome>;
+    reloadSession(projectId: string, sessionId: string): Promise<ExternalSessionReloadResult>;
+    verifySession(projectId: string, sessionId: string): Promise<ExternalSessionVerifyResult>;
+    executeCommentDelete(projectId: string, sessionId: string): Promise<ExternalCommentDeleteOutcome>;
     private createCommentSession;
     private parseProviderDescription;
     private parseProviderComment;
@@ -51,6 +51,7 @@ export declare class ExternalEditSessionService {
     private sessionFailure;
     private storeFailure;
     private notConnected;
+    private sessionBelongsToProject;
     private unsupported;
     private context;
     private scopeKey;

package/dist/server/modules/external-integrations/my-work/external-edit-session.service.js

@@ -49,12 +49,12 @@ let ExternalEditSessionService = class ExternalEditSessionService {
         this.store = store;
         this.capabilities = capabilities;
     }
-    async readRichDescription(provider, remoteTaskId) {
+    async readRichDescription(projectId, provider, remoteTaskId) {
         const adapter = this.providers.get(provider);
         if (!adapter.descriptionEdit) {
             throw this.unsupported(provider);
         }
-        const { connection, credentials } = await this.loadStableConnection(provider);
+        const { connection, credentials } = await this.loadStableConnection(projectId, provider);
         const raw = await adapter.descriptionEdit.readDescription(credentials, this.context(connection), remoteTaskId);
         const parsed = this.parseProviderDescription(provider, raw);
         if (!parsed.supported) {
@@ -76,13 +76,13 @@ let ExternalEditSessionService = class ExternalEditSessionService {
             canDeleteOwnedComments: this.capabilities.ownedDelete,
         };
     }
-    async createDescriptionSession(provider, remoteTaskId) {
+    async createDescriptionSession(projectId, provider, remoteTaskId) {
         this.requireRichEditCapability();
         const adapter = this.providers.get(provider);
         if (!adapter.descriptionEdit) {
             throw this.unsupported(provider);
         }
-        const { connection, credentials } = await this.loadStableConnection(provider);
+        const { connection, credentials } = await this.loadStableConnection(projectId, provider);
         const raw = await adapter.descriptionEdit.readDescription(credentials, this.context(connection), remoteTaskId);
         const parsed = this.parseProviderDescription(provider, raw);
         if (!parsed.supported) {
@@ -94,6 +94,7 @@ let ExternalEditSessionService = class ExternalEditSessionService {
         const created = this.store.create({
             kind: 'description_edit',
             provider,
+            projectId,
             connectionId: connection.id,
             connectionGeneration: connection.generation,
             scopeKey: this.scopeKey(connection),
@@ -110,24 +111,30 @@ let ExternalEditSessionService = class ExternalEditSessionService {
         }
         return this.store.view(created.value);
     }
-    async createCommentEditSession(provider, remoteTaskId, commentId, lookupToken) {
+    async createCommentEditSession(projectId, provider, remoteTaskId, commentId, lookupToken) {
         this.requireRichEditCapability();
-        const { session } = await this.createCommentSession(provider, remoteTaskId, commentId, lookupToken, 'comment_edit');
+        const { session } = await this.createCommentSession(projectId, provider, remoteTaskId, commentId, lookupToken, 'comment_edit');
         return session;
     }
-    async createCommentDeleteSession(provider, remoteTaskId, commentId, pageProof) {
+    async createCommentDeleteSession(projectId, provider, remoteTaskId, commentId, pageProof) {
         this.requireOwnedDeleteCapability();
-        const { session } = await this.createCommentSession(provider, remoteTaskId, commentId, pageProof, 'comment_delete');
+        const { session } = await this.createCommentSession(projectId, provider, remoteTaskId, commentId, pageProof, 'comment_delete');
         return session;
     }
-    async touchSession(sessionId) {
+    async touchSession(projectId, sessionId) {
+        await this.storage.getProject(projectId);
+        const current = this.store.get(sessionId);
+        if (!current.ok || !this.sessionBelongsToProject(projectId, current.value)) {
+            throw this.sessionFailure('session_not_found');
+        }
         const touched = this.store.touch(sessionId);
         if (!touched.ok) {
             throw this.sessionFailure(touched.reason);
         }
         return this.store.view(touched.value);
     }
-    async saveSession(sessionId, payload, expectedRevision) {
+    async saveSession(projectId, sessionId, payload, expectedRevision) {
+        await this.storage.getProject(projectId);
         const canonical = (0, external_rich_document_1.canonicalizeRichDocument)(payload);
         if (canonical === null) {
             throw new error_types_1.ValidationError('The payload is outside the supported rich content set.', {
@@ -139,6 +146,9 @@ let ExternalEditSessionService = class ExternalEditSessionService {
         if (!initial.ok) {
             return this.writeRejected(null, this.writeFailure(initial.reason));
         }
+        if (!this.sessionBelongsToProject(projectId, initial.value)) {
+            return this.writeRejected(null, 'session_not_found');
+        }
         const kind = initial.value.kind;
         if (kind === 'comment_delete') {
             throw new error_types_1.ValidationError('The session does not support content saves.', {
@@ -149,7 +159,7 @@ let ExternalEditSessionService = class ExternalEditSessionService {
         const provider = initial.value.provider;
         let phase;
         try {
-            phase = await this.gate.run(provider, () => this.saveDispatchPhase(sessionId, provider, kind, canonical, fingerprint, expectedRevision));
+            phase = await this.gate.run({ projectId, provider }, () => this.saveDispatchPhase(projectId, sessionId, provider, kind, canonical, fingerprint, expectedRevision));
         }
         catch (error) {
             if (error instanceof error_types_1.BusyError) {
@@ -166,16 +176,17 @@ let ExternalEditSessionService = class ExternalEditSessionService {
                 ? this.writeRejected(null, 'session_not_found')
                 : { outcome: 'outcome_unknown', session: view };
         }
-        return this.postWriteVerification(sessionId, provider, kind, fingerprint, canonical);
+        return this.postWriteVerification(projectId, sessionId, provider, kind, fingerprint, canonical);
     }
-    async saveDispatchPhase(sessionId, provider, kind, canonical, fingerprint, expectedRevision) {
+    async saveDispatchPhase(projectId, sessionId, provider, kind, canonical, fingerprint, expectedRevision) {
         const adapter = this.providers.get(provider);
-        const connection = await this.storage.getIntegrationConnection(provider);
+        const connection = await this.storage.getIntegrationConnection({ projectId, provider });
         const session = this.store.get(sessionId);
         if (!session.ok) {
             return { phase: 'rejected', reason: this.writeFailure(session.reason) };
         }
         if (!connection ||
+            connection.projectId !== projectId ||
             connection.provider !== provider ||
             connection.id !== session.value.connectionId ||
             connection.generation !== session.value.connectionGeneration) {
@@ -189,7 +200,7 @@ let ExternalEditSessionService = class ExternalEditSessionService {
             if (!adapter.descriptionEdit) {
                 throw this.unsupported(provider);
             }
-            const raw = await adapter.descriptionEdit.readDescription((await this.storage.getIntegrationConnectionCredentials(provider)), context, session.value.remoteTaskId);
+            const raw = await adapter.descriptionEdit.readDescription((await this.storage.getIntegrationConnectionCredentials({ projectId, provider })), context, session.value.remoteTaskId);
             const parsed = this.parseProviderDescription(provider, raw);
             if (!parsed.supported) {
                 this.store.applyVerifyOutcome(sessionId, 'diverged');
@@ -211,7 +222,7 @@ let ExternalEditSessionService = class ExternalEditSessionService {
                 this.store.invalidate(sessionId);
                 return { phase: 'rejected', reason: 'connection_superseded' };
             }
-            const snapshot = await adapter.ownedMutations.findComment((await this.storage.getIntegrationConnectionCredentials(provider)), context, session.value.remoteTaskId, session.value.remoteCommentId, token.pageProof);
+            const snapshot = await adapter.ownedMutations.findComment((await this.storage.getIntegrationConnectionCredentials({ projectId, provider })), context, session.value.remoteTaskId, session.value.remoteCommentId, token.pageProof);
             if (snapshot === null) {
                 this.store.invalidate(sessionId);
                 return { phase: 'rejected', reason: 'target_gone' };
@@ -256,7 +267,7 @@ let ExternalEditSessionService = class ExternalEditSessionService {
             }
             const raw = 'ok' in emit && 'markdown' in emit ? emit.markdown : emit;
             try {
-                await adapter.descriptionEdit.writeDescription((await this.storage.getIntegrationConnectionCredentials(provider)), context, session.value.remoteTaskId, raw);
+                await adapter.descriptionEdit.writeDescription((await this.storage.getIntegrationConnectionCredentials({ projectId, provider })), context, session.value.remoteTaskId, raw);
             }
             catch (error) {
                 if (isUnknownOutcome(error)) {
@@ -268,7 +279,7 @@ let ExternalEditSessionService = class ExternalEditSessionService {
         }
         else {
             try {
-                await adapter.ownedMutations.updateOwnedComment((await this.storage.getIntegrationConnectionCredentials(provider)), context, session.value.remoteTaskId, session.value.remoteCommentId, canonical, commentMetadata);
+                await adapter.ownedMutations.updateOwnedComment((await this.storage.getIntegrationConnectionCredentials({ projectId, provider })), context, session.value.remoteTaskId, session.value.remoteCommentId, canonical, commentMetadata);
             }
             catch (error) {
                 if (isUnknownOutcome(error)) {
@@ -284,12 +295,12 @@ let ExternalEditSessionService = class ExternalEditSessionService {
         }
         return { phase: 'dispatched' };
     }
-    async postWriteVerification(sessionId, provider, kind, pendingFingerprint, canonical) {
+    async postWriteVerification(projectId, sessionId, provider, kind, pendingFingerprint, canonical) {
         const session = this.store.get(sessionId);
         if (!session.ok) {
             return this.writeRejected(null, this.writeFailure(session.reason));
         }
-        const read = await this.freshContentFingerprint(provider, kind, session.value);
+        const read = await this.freshContentFingerprint(projectId, provider, kind, session.value);
         if (read.generationChanged) {
             this.store.invalidate(sessionId);
             return { outcome: 'saved_unverified', session: this.currentView(sessionId) };
@@ -315,10 +326,11 @@ let ExternalEditSessionService = class ExternalEditSessionService {
         }
         return { outcome: 'saved_unverified', session: this.currentView(sessionId) };
     }
-    async freshContentFingerprint(provider, kind, session) {
+    async freshContentFingerprint(projectId, provider, kind, session) {
         const adapter = this.providers.get(provider);
-        const before = await this.storage.getIntegrationConnection(provider);
+        const before = await this.storage.getIntegrationConnection({ projectId, provider });
         if (!before ||
+            before.projectId !== projectId ||
             before.provider !== provider ||
             before.id !== session.connectionId ||
             before.generation !== session.connectionGeneration) {
@@ -330,7 +342,7 @@ let ExternalEditSessionService = class ExternalEditSessionService {
                 if (!adapter.descriptionEdit) {
                     throw this.unsupported(provider);
                 }
-                const raw = await adapter.descriptionEdit.readDescription((await this.storage.getIntegrationConnectionCredentials(provider)), this.context(before), session.remoteTaskId);
+                const raw = await adapter.descriptionEdit.readDescription((await this.storage.getIntegrationConnectionCredentials({ projectId, provider })), this.context(before), session.remoteTaskId);
                 const parsed = this.parseProviderDescription(provider, raw);
                 fingerprint = parsed.supported ? (0, external_rich_document_1.richDocumentFingerprint)(parsed.document) : null;
             }
@@ -341,7 +353,7 @@ let ExternalEditSessionService = class ExternalEditSessionService {
                 const token = this.sessionLookupToken(session.providerMetadata.lookupToken ?? '');
                 const snapshot = token === null
                     ? null
-                    : await adapter.ownedMutations.findComment((await this.storage.getIntegrationConnectionCredentials(provider)), this.context(before), session.remoteTaskId, session.remoteCommentId, token.pageProof);
+                    : await adapter.ownedMutations.findComment((await this.storage.getIntegrationConnectionCredentials({ projectId, provider })), this.context(before), session.remoteTaskId, session.remoteCommentId, token.pageProof);
                 if (snapshot !== null) {
                     const parsed = this.parseProviderComment(provider, snapshot.raw);
                     fingerprint = parsed.supported ? (0, external_rich_document_1.richDocumentFingerprint)(parsed.document) : null;
@@ -351,8 +363,9 @@ let ExternalEditSessionService = class ExternalEditSessionService {
         catch {
             return { ok: false, fingerprint: null, generationChanged: false };
         }
-        const after = await this.storage.getIntegrationConnection(provider);
+        const after = await this.storage.getIntegrationConnection({ projectId, provider });
         if (!after ||
+            after.projectId !== projectId ||
             after.provider !== provider ||
             after.id !== session.connectionId ||
             after.generation !== session.connectionGeneration) {
@@ -360,11 +373,15 @@ let ExternalEditSessionService = class ExternalEditSessionService {
         }
         return { ok: fingerprint !== null, fingerprint, generationChanged: false };
     }
-    async reloadSession(sessionId) {
+    async reloadSession(projectId, sessionId) {
+        await this.storage.getProject(projectId);
         const session = this.store.get(sessionId);
         if (!session.ok) {
             throw this.sessionFailure(session.reason);
         }
+        if (!this.sessionBelongsToProject(projectId, session.value)) {
+            throw this.sessionFailure('session_not_found');
+        }
         if (session.value.kind === 'comment_delete') {
             throw new error_types_1.ValidationError('The session does not support reload.', {
                 reason: 'wrong_session_kind',
@@ -372,7 +389,7 @@ let ExternalEditSessionService = class ExternalEditSessionService {
         }
         this.requireRichEditCapability();
         const provider = session.value.provider;
-        const { connection, credentials } = await this.loadStableConnection(provider);
+        const { connection, credentials } = await this.loadStableConnection(projectId, provider);
         if (connection.id !== session.value.connectionId) {
             this.store.invalidate(sessionId);
             throw new error_types_1.ValidationError('The connection was replaced; the session is invalid.', {
@@ -432,15 +449,19 @@ let ExternalEditSessionService = class ExternalEditSessionService {
         }
         return { status: 'reloaded', session: this.store.view(reloaded.value) };
     }
-    async verifySession(sessionId) {
+    async verifySession(projectId, sessionId) {
+        await this.storage.getProject(projectId);
         const session = this.store.get(sessionId);
         if (!session.ok) {
             return { session: null, remoteState: null, reason: this.verifyFailure(session.reason) };
         }
+        if (!this.sessionBelongsToProject(projectId, session.value)) {
+            return { session: null, remoteState: null, reason: 'session_not_found' };
+        }
         if (session.value.kind === 'comment_delete') {
-            return this.verifyDeleteSession(session.value);
+            return this.verifyDeleteSession(projectId, session.value);
         }
-        const read = await this.freshContentFingerprint(session.value.provider, session.value.kind, session.value);
+        const read = await this.freshContentFingerprint(projectId, session.value.provider, session.value.kind, session.value);
         if (read.generationChanged) {
             this.store.invalidate(sessionId);
             return this.verifyResult(sessionId, 'diverged');
@@ -466,7 +487,8 @@ let ExternalEditSessionService = class ExternalEditSessionService {
         const applied = this.store.applyVerifyOutcome(sessionId, 'diverged');
         return this.verifyResult(sessionId, applied.ok ? 'diverged' : null);
     }
-    async executeCommentDelete(sessionId) {
+    async executeCommentDelete(projectId, sessionId) {
+        await this.storage.getProject(projectId);
         this.requireOwnedDeleteCapability();
         const session = this.store.get(sessionId);
         if (!session.ok) {
@@ -476,6 +498,9 @@ let ExternalEditSessionService = class ExternalEditSessionService {
                 session: null,
             };
         }
+        if (!this.sessionBelongsToProject(projectId, session.value)) {
+            return { outcome: 'rejected', reason: 'session_not_found', session: null };
+        }
         if (session.value.kind !== 'comment_delete') {
             throw new error_types_1.ValidationError('The session does not support comment deletion.', {
                 reason: 'wrong_session_kind',
@@ -487,9 +512,10 @@ let ExternalEditSessionService = class ExternalEditSessionService {
             throw this.unsupported(provider);
         }
         try {
-            return await this.gate.run(provider, async () => {
-                const connection = await this.storage.getIntegrationConnection(provider);
+            return await this.gate.run({ projectId, provider }, async () => {
+                const connection = await this.storage.getIntegrationConnection({ projectId, provider });
                 if (!connection ||
+                    connection.projectId !== projectId ||
                     connection.provider !== provider ||
                     connection.id !== session.value.connectionId ||
                     connection.generation !== session.value.connectionGeneration) {
@@ -527,7 +553,7 @@ let ExternalEditSessionService = class ExternalEditSessionService {
                     return this.deleteRejected(this.currentView(sessionId), this.deleteFailure('session_not_editable'));
                 }
                 try {
-                    await adapter.ownedMutations.deleteComment((await this.storage.getIntegrationConnectionCredentials(provider)), this.context(connection), session.value.remoteTaskId, session.value.remoteCommentId);
+                    await adapter.ownedMutations.deleteComment((await this.storage.getIntegrationConnectionCredentials({ projectId, provider })), this.context(connection), session.value.remoteTaskId, session.value.remoteCommentId);
                 }
                 catch (error) {
                     if (isProviderNotFound(error)) {
@@ -557,12 +583,12 @@ let ExternalEditSessionService = class ExternalEditSessionService {
             throw error;
         }
     }
-    async createCommentSession(provider, remoteTaskId, commentId, lookupProof, kind) {
+    async createCommentSession(projectId, provider, remoteTaskId, commentId, lookupProof, kind) {
         const adapter = this.providers.get(provider);
         if (!adapter.ownedMutations) {
             throw this.unsupported(provider);
         }
-        const { connection, credentials } = await this.loadStableConnection(provider);
+        const { connection, credentials } = await this.loadStableConnection(projectId, provider);
         const [ownerRemoteId, snapshot] = await Promise.all([
             adapter.ownedMutations.getCurrentOwnerRemoteId(credentials),
             adapter.ownedMutations.findComment(credentials, this.context(connection), remoteTaskId, commentId, lookupProof),
@@ -605,6 +631,7 @@ let ExternalEditSessionService = class ExternalEditSessionService {
         const created = this.store.create({
             kind,
             provider,
+            projectId,
             connectionId: connection.id,
             connectionGeneration: connection.generation,
             scopeKey: this.scopeKey(connection),
@@ -644,19 +671,22 @@ let ExternalEditSessionService = class ExternalEditSessionService {
             });
         }
     }
-    async loadStableConnection(provider) {
+    async loadStableConnection(projectId, provider) {
+        await this.storage.getProject(projectId);
+        const identity = { projectId, provider };
         for (let attempt = 0; attempt < 3; attempt += 1) {
-            const before = await this.storage.getIntegrationConnection(provider);
-            if (!before || before.provider !== provider) {
-                throw this.notConnected(provider);
+            const before = await this.storage.getIntegrationConnection(identity);
+            if (before?.projectId !== projectId || before.provider !== provider) {
+                throw this.notConnected(projectId, provider);
             }
-            const credentials = await this.storage.getIntegrationConnectionCredentials(provider);
-            const after = await this.storage.getIntegrationConnection(provider);
+            const credentials = await this.storage.getIntegrationConnectionCredentials(identity);
+            const after = await this.storage.getIntegrationConnection(identity);
             if (!credentials ||
                 credentials.provider !== provider ||
                 !after ||
+                after.projectId !== projectId ||
                 after.provider !== provider) {
-                throw this.notConnected(provider);
+                throw this.notConnected(projectId, provider);
             }
             if (before.id === after.id && before.generation === after.generation) {
                 return { connection: after, credentials };
@@ -664,6 +694,7 @@ let ExternalEditSessionService = class ExternalEditSessionService {
         }
         throw new error_types_1.BusyError('Integration connection changed during the operation.', {
             provider,
+            projectId,
             reason: 'connection_changed',
         });
     }
@@ -679,7 +710,7 @@ let ExternalEditSessionService = class ExternalEditSessionService {
             reason: null,
         };
     }
-    async verifyDeleteSession(session) {
+    async verifyDeleteSession(projectId, session) {
         const adapter = this.providers.get(session.provider);
         if (!adapter.ownedMutations) {
             throw this.unsupported(session.provider);
@@ -689,7 +720,7 @@ let ExternalEditSessionService = class ExternalEditSessionService {
             this.store.invalidate(session.sessionId);
             return this.verifyResult(session.sessionId, 'diverged');
         }
-        const { connection, credentials } = await this.loadStableConnection(session.provider);
+        const { connection, credentials } = await this.loadStableConnection(projectId, session.provider);
         if (connection.id !== session.connectionId) {
             this.store.invalidate(session.sessionId);
             return this.verifyResult(session.sessionId, 'diverged');
@@ -741,12 +772,16 @@ let ExternalEditSessionService = class ExternalEditSessionService {
             reason: reason === 'baseline_too_large' ? 'baseline_too_large' : 'store_limit_exceeded',
         });
     }
-    notConnected(provider) {
+    notConnected(projectId, provider) {
         return new error_types_1.ValidationError('Connect the integration before editing.', {
             provider,
+            projectId,
             reason: 'not_connected',
         });
     }
+    sessionBelongsToProject(projectId, session) {
+        return session.projectId === projectId;
+    }
     unsupported(provider) {
         return new error_types_1.ValidationError('The provider does not support this operation.', {
             provider,