openplanr 1.25.3 → 2.0.1

package/dist/services/landing/receipt-custody.js

@@ -0,0 +1,375 @@
+import { createHash, randomBytes } from 'node:crypto';
+import { chmod, lstat, mkdir, open, readFile, realpath, rename, stat, unlink, } from 'node:fs/promises';
+import path from 'node:path';
+import { sha256CanonicalJson } from '../canonical-json.js';
+export class LandingReceiptCustodyError extends Error {
+    code;
+    constructor(code, message) {
+        super(message);
+        this.name = 'LandingReceiptCustodyError';
+        this.code = code;
+    }
+}
+const HASH = /^sha256:[a-f0-9]{64}$/u;
+const PLAN_ID = /^land_[a-f0-9]{32}$/u;
+const PRIVATE_VALUE = /(?:^|[\s"'`(])\/(?:Users|home|private|var|etc|tmp)\/|(?:^|[\s"'`(])[A-Za-z]:[\\/][^\s]+|-----BEGIN [A-Z ]*PRIVATE KEY-----|\b(?:api[-_ ]?key|access[-_ ]?token|client[-_ ]?secret|password|passwd|secret|token)\s*[:=]\s*[^\s]+/iu;
+const SENSITIVE_KEY = /(?:authorization|cookie|password|passwd|secret|token|api[-_]?key|credential|private[-_]?key)/iu;
+function fail(code, message) {
+    throw new LandingReceiptCustodyError(code, message);
+}
+function record(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value)) {
+        fail('E_LANDING_CUSTODY_INVALID', 'Landing custody record is invalid.');
+    }
+    return value;
+}
+function scanPortable(value, key = '', seen = new Set()) {
+    if (SENSITIVE_KEY.test(key)) {
+        fail('E_LANDING_CUSTODY_UNSAFE', 'Landing custody contains restricted content.');
+    }
+    if (typeof value === 'string') {
+        if (PRIVATE_VALUE.test(value)) {
+            fail('E_LANDING_CUSTODY_UNSAFE', 'Landing custody contains restricted content.');
+        }
+        return;
+    }
+    if (!value || typeof value !== 'object')
+        return;
+    if (seen.has(value))
+        fail('E_LANDING_CUSTODY_INVALID', 'Landing custody contains a cycle.');
+    seen.add(value);
+    try {
+        if (Array.isArray(value)) {
+            for (const entry of value)
+                scanPortable(entry, key, seen);
+        }
+        else {
+            for (const [nestedKey, nested] of Object.entries(value)) {
+                scanPortable(nested, nestedKey, seen);
+            }
+        }
+    }
+    finally {
+        seen.delete(value);
+    }
+}
+function body(value) {
+    return value;
+}
+function freezeSnapshot(value) {
+    const { format: _format, version: _version, recordHash: _recordHash, ...snapshot } = value;
+    return Object.freeze(structuredClone(snapshot));
+}
+function journalHead(events) {
+    const last = events.at(-1);
+    return {
+        sequence: last === undefined ? 0 : Number(last.sequence),
+        hash: last === undefined ? null : last.eventHash,
+    };
+}
+function exactHead(left, right) {
+    const value = left && typeof left === 'object' ? left : null;
+    return value?.sequence === right.sequence && value.hash === right.hash;
+}
+export class LandingReceiptCustodyV1 {
+    #root;
+    #now;
+    #lockTtlMs;
+    constructor(input) {
+        const root = path.resolve(input.root);
+        const portableRoot = root.split(path.sep).join('/');
+        const lockTtlMs = input.lockTtlMs ?? 30_000;
+        if (!path.isAbsolute(root) ||
+            !portableRoot.endsWith('/.planr/landing') ||
+            portableRoot.includes('/.planr/operate/') ||
+            !Number.isSafeInteger(lockTtlMs) ||
+            lockTtlMs < 1_000 ||
+            lockTtlMs > 300_000) {
+            fail('E_LANDING_CUSTODY_INVALID', 'Landing custody root or lock policy is invalid.');
+        }
+        this.#root = root;
+        this.#now = input.now ?? Date.now;
+        this.#lockTtlMs = lockTtlMs;
+    }
+    async #ensureRoot() {
+        await mkdir(this.#root, { recursive: true, mode: 0o700 });
+        const metadata = await lstat(this.#root);
+        if (!metadata.isDirectory() || metadata.isSymbolicLink()) {
+            fail('E_LANDING_CUSTODY_UNSAFE', 'Landing custody root is unsafe.');
+        }
+        if ((await realpath(this.#root)) !== this.#root) {
+            fail('E_LANDING_CUSTODY_UNSAFE', 'Landing custody root is indirect.');
+        }
+        await chmod(this.#root, 0o700);
+    }
+    #paths(planId) {
+        if (!PLAN_ID.test(planId)) {
+            fail('E_LANDING_CUSTODY_INVALID', 'Landing plan identity is invalid.');
+        }
+        const id = createHash('sha256').update(planId, 'utf8').digest('hex');
+        return {
+            data: path.join(this.#root, `${id}.landing.json`),
+            lock: path.join(this.#root, `${id}.lock`),
+        };
+    }
+    async #withLock(planId, work) {
+        await this.#ensureRoot();
+        const paths = this.#paths(planId);
+        const nonce = randomBytes(32).toString('hex');
+        let handle;
+        try {
+            try {
+                handle = await open(paths.lock, 'wx', 0o600);
+            }
+            catch (error) {
+                if (error.code !== 'EEXIST')
+                    throw error;
+                const observed = await readFile(paths.lock, 'utf8')
+                    .then((value) => JSON.parse(value))
+                    .catch(() => null);
+                const metadata = await stat(paths.lock).catch(() => null);
+                if (observed &&
+                    metadata &&
+                    typeof observed.nonce === 'string' &&
+                    typeof observed.expiresAt === 'number' &&
+                    observed.expiresAt <= this.#now()) {
+                    const stale = `${paths.lock}.stale-${randomBytes(8).toString('hex')}`;
+                    await rename(paths.lock, stale).catch(() => {
+                        fail('E_LANDING_CUSTODY_LOCKED', 'Landing custody is locked.');
+                    });
+                    await unlink(stale).catch(() => undefined);
+                    handle = await open(paths.lock, 'wx', 0o600);
+                }
+                else {
+                    fail('E_LANDING_CUSTODY_LOCKED', 'Landing custody is locked.');
+                }
+            }
+            await handle.writeFile(JSON.stringify({ nonce, expiresAt: this.#now() + this.#lockTtlMs }), 'utf8');
+            await handle.sync();
+            return await work(paths.data);
+        }
+        finally {
+            await handle?.close().catch(() => undefined);
+            const current = await readFile(paths.lock, 'utf8')
+                .then((value) => JSON.parse(value))
+                .catch(() => null);
+            if (current?.nonce === nonce)
+                await unlink(paths.lock).catch(() => undefined);
+        }
+    }
+    async #readPath(dataPath) {
+        let metadata;
+        try {
+            metadata = await lstat(dataPath);
+        }
+        catch (error) {
+            if (error.code === 'ENOENT') {
+                fail('E_LANDING_CUSTODY_NOT_FOUND', 'Landing custody was not found.');
+            }
+            throw error;
+        }
+        if (!metadata.isFile() || metadata.isSymbolicLink() || metadata.size > 8 * 1024 * 1024) {
+            fail('E_LANDING_CUSTODY_UNSAFE', 'Landing custody file is unsafe.');
+        }
+        const parsed = record(JSON.parse(await readFile(dataPath, 'utf8')));
+        const { recordHash, ...recordBody } = parsed;
+        if (parsed.format !== 'openplanr-landing-receipt-custody' ||
+            parsed.version !== 1 ||
+            !HASH.test(recordHash) ||
+            sha256CanonicalJson(recordBody) !== recordHash ||
+            !PLAN_ID.test(String(parsed.plan?.planId)) ||
+            !HASH.test(String(parsed.plan?.planHash))) {
+            fail('E_LANDING_CUSTODY_INVALID', 'Landing custody hash or identity is invalid.');
+        }
+        scanPortable(parsed);
+        return parsed;
+    }
+    async #write(dataPath, value) {
+        scanPortable(value);
+        const stored = {
+            ...value,
+            recordHash: sha256CanonicalJson(value),
+        };
+        const tempPath = `${dataPath}.tmp-${randomBytes(16).toString('hex')}`;
+        const handle = await open(tempPath, 'wx', 0o600);
+        try {
+            await handle.writeFile(`${JSON.stringify(stored)}\n`, 'utf8');
+            await handle.sync();
+        }
+        finally {
+            await handle.close();
+        }
+        await rename(tempPath, dataPath);
+        await chmod(dataPath, 0o600);
+    }
+    async initialize(input) {
+        const plan = record(input.plan);
+        const planId = String(plan.planId);
+        if (!PLAN_ID.test(planId) ||
+            !HASH.test(input.receiptHash) ||
+            !Array.isArray(input.baseRecords)) {
+            fail('E_LANDING_CUSTODY_INVALID', 'Landing initialization is invalid.');
+        }
+        const repositories = plan.repositories;
+        if (!Array.isArray(repositories) || typeof plan.candidateDigest !== 'string') {
+            fail('E_LANDING_CUSTODY_INVALID', 'Landing plan custody is invalid.');
+        }
+        return this.#withLock(planId, async (dataPath) => {
+            const existing = await this.#readPath(dataPath).catch((error) => {
+                if (error instanceof LandingReceiptCustodyError &&
+                    error.code === 'E_LANDING_CUSTODY_NOT_FOUND') {
+                    return null;
+                }
+                throw error;
+            });
+            if (existing) {
+                if (existing.plan.planHash !== plan.planHash ||
+                    existing.receiptHash !== input.receiptHash) {
+                    fail('E_LANDING_CUSTODY_CONFLICT', 'Landing custody already contains divergent bytes.');
+                }
+                return freezeSnapshot(existing);
+            }
+            const initial = body({
+                format: 'openplanr-landing-receipt-custody',
+                version: 1,
+                feature: input.feature,
+                receiptHash: input.receiptHash,
+                plan: structuredClone(plan),
+                baseRecords: structuredClone(input.baseRecords),
+                candidateDigest: plan.candidateDigest,
+                repositoryHeads: repositories.map(({ repositoryKey, head }) => ({
+                    repositoryKey: String(repositoryKey),
+                    head: String(head),
+                })),
+                targetStateHash: plan.currentTargetHash,
+                events: [],
+                journalHead: { sequence: 0, hash: null },
+                landingReceipt: null,
+                pendingIntent: null,
+                phaseReceiptHeadHash: null,
+                phaseReceipts: [],
+                confirmations: [],
+                evidenceRecordsByOperation: {},
+                evidenceContextsByOperation: {},
+                startedAt: null,
+            });
+            await this.#write(dataPath, initial);
+            return freezeSnapshot({ ...initial, recordHash: sha256CanonicalJson(initial) });
+        });
+    }
+    async read(planId) {
+        await this.#ensureRoot();
+        return freezeSnapshot(await this.#readPath(this.#paths(planId).data));
+    }
+    async commitIntent(planId, request) {
+        return this.#withLock(planId, async (dataPath) => {
+            const current = await this.#readPath(dataPath);
+            const currentHead = journalHead(current.events);
+            if (request.kind !== 'landing-intent-cas' ||
+                request.planHash !== current.plan.planHash ||
+                !exactHead(request.expectedJournalHead, currentHead) ||
+                !Array.isArray(request.events)) {
+                fail('E_LANDING_CUSTODY_CONFLICT', 'Landing intent CAS binding changed.');
+            }
+            if (current.pendingIntent !== null) {
+                if (current.pendingIntent.requestHash !== request.requestHash ||
+                    current.pendingIntent.attemptIdentity !== request.attemptIdentity) {
+                    fail('E_LANDING_CUSTODY_CONFLICT', 'A different landing intent is already durable.');
+                }
+                return Object.freeze({
+                    commitId: current.pendingIntent.commitId,
+                    dispatcherId: current.pendingIntent.dispatcherId,
+                    committedAt: current.pendingIntent.committedAt,
+                    journalHead: current.pendingIntent.journalHead,
+                });
+            }
+            const events = [...current.events, ...structuredClone(request.events)];
+            const persistedHead = journalHead(events);
+            const committedAt = new Date(this.#now()).toISOString();
+            const commitId = `lcom_${createHash('sha256').update(String(request.attemptIdentity)).digest('hex').slice(0, 32)}`;
+            const dispatcherId = `ldsp_${randomBytes(16).toString('hex')}`;
+            const pendingBody = {
+                kind: 'landing-pending-intent',
+                schemaVersion: '1.0.0',
+                attemptIdentity: request.attemptIdentity,
+                commitId,
+                committedAt,
+                dispatcherId,
+                confirmation: structuredClone(request.confirmation),
+                intentEventHash: request.intentEventHash,
+                journalHead: persistedHead,
+                planHash: request.planHash,
+                runId: request.runId,
+                operationId: request.operationId,
+                requestHash: request.requestHash,
+                targetBeforeHash: request.targetBeforeHash,
+            };
+            const firstTimestamp = request.events[0]?.timestamp;
+            const { recordHash: _recordHash, ...currentBody } = current;
+            const next = body({
+                ...currentBody,
+                events,
+                journalHead: persistedHead,
+                pendingIntent: {
+                    ...pendingBody,
+                    pendingIntentHash: sha256CanonicalJson(pendingBody),
+                },
+                startedAt: current.startedAt ?? (typeof firstTimestamp === 'string' ? firstTimestamp : committedAt),
+            });
+            await this.#write(dataPath, next);
+            return Object.freeze({ commitId, dispatcherId, committedAt, journalHead: persistedHead });
+        });
+    }
+    async commitOutcome(planId, request) {
+        return this.#withLock(planId, async (dataPath) => {
+            const current = await this.#readPath(dataPath);
+            if (request.kind !== 'landing-outcome-cas' ||
+                current.pendingIntent === null ||
+                request.commitId !== current.pendingIntent.commitId ||
+                request.dispatcherId !== current.pendingIntent.dispatcherId ||
+                !exactHead(request.expectedJournalHead, journalHead(current.events)) ||
+                !Array.isArray(request.events)) {
+                fail('E_LANDING_CUSTODY_CONFLICT', 'Landing outcome CAS binding changed.');
+            }
+            const phaseReceipt = record(request.phaseReceipt);
+            const confirmation = record(request.confirmation);
+            const events = [...current.events, ...structuredClone(request.events)];
+            const persistedHead = journalHead(events);
+            const targetStateHash = (phaseReceipt.targetAfterHash ??
+                phaseReceipt.targetBeforeHash);
+            const evidenceRecordsByOperation = {
+                ...current.evidenceRecordsByOperation,
+                [String(phaseReceipt.operationId)]: structuredClone(request.evidenceRecords),
+            };
+            const evidenceContextsByOperation = {
+                ...current.evidenceContextsByOperation,
+                [String(phaseReceipt.operationId)]: structuredClone(request.evidenceContexts),
+            };
+            const { recordHash: _recordHash, ...currentBody } = current;
+            const next = body({
+                ...currentBody,
+                events,
+                journalHead: persistedHead,
+                targetStateHash,
+                landingReceipt: request.landingReceipt === null ? null : structuredClone(record(request.landingReceipt)),
+                pendingIntent: null,
+                phaseReceiptHeadHash: phaseReceipt.receiptHash,
+                phaseReceipts: [...current.phaseReceipts, structuredClone(phaseReceipt)],
+                confirmations: [...current.confirmations, structuredClone(confirmation)],
+                evidenceRecordsByOperation,
+                evidenceContextsByOperation,
+            });
+            await this.#write(dataPath, next);
+            return Object.freeze({
+                commitId: request.commitId,
+                committedAt: new Date(this.#now()).toISOString(),
+                journalHead: persistedHead,
+                phaseReceiptHash: phaseReceipt.receiptHash,
+                landingReceiptHash: request.landingReceipt === null
+                    ? null
+                    : request.landingReceipt.receiptHash,
+            });
+        });
+    }
+}
+//# sourceMappingURL=receipt-custody.js.map

package/dist/services/landing/receipt-custody.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"receipt-custody.js","sourceRoot":"","sources":["../../../src/services/landing/receipt-custody.ts"],"names":[],"mappings":"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"}

package/dist/services/linear/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/services/linear/constants.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,4EAA4E;AAC5E,eAAO,MAAM,qBAAqB,EAAG,QAAiB,CAAC;AAEvD;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB;IAC9B,2EAA2E;;IAE3E,0DAA0D;;IAE1D,mCAAmC;;IAEnC,iDAAiD;;IAEjD,+EAA+E;;IAE/E,oCAAoC;;IAEpC,qEAAqE;;IAErE,yCAAyC;;CAEjC,CAAC;AAEX;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAQ3F;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAQ5F;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAIhE;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAKxD"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/services/linear/constants.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,4EAA4E;AAC5E,eAAO,MAAM,qBAAqB,EAAG,QAAiB,CAAC;AAEvD;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB;IAC9B,2EAA2E;;IAE3E,0DAA0D;;IAE1D,mCAAmC;;IAEnC,iDAAiD;;IAEjD,+EAA+E;;IAE/E,oCAAoC;;IAEpC,qEAAqE;;IAErE,yCAAyC;;CAEjC,CAAC;AAEX;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAQ3F;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAQ5F;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAIhE;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAExD"}

package/dist/services/linear/constants.js

@@ -6,6 +6,7 @@
  * free. Shape validators (`isLikelyLinear*Id`) fence off stale frontmatter
  * before it reaches the Linear API.
  */
+import { isLikelyLinearIssueId as isSharedLinearIssueId } from '../../../lib/integrations.mjs';
 import { logger } from '../../utils/logger.js';
 /** Credential-service provider key under which the Linear PAT is stored. */
 export const LINEAR_CREDENTIAL_KEY = 'linear';
@@ -74,11 +75,6 @@ export function isLikelyLinearWorkflowStateId(s) {
  * hitting the API.
  */
 export function isLikelyLinearIssueId(s) {
-    const trimmed = s.trim();
-    if (trimmed.length === 0)
-        return false;
-    if (isLikelyLinearWorkflowStateId(trimmed))
-        return true;
-    return /^[A-Z]{2,}-\d+$/.test(trimmed);
+    return isSharedLinearIssueId(s);
 }
 //# sourceMappingURL=constants.js.map

package/dist/services/linear/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/services/linear/constants.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE/C,4EAA4E;AAC5E,MAAM,CAAC,MAAM,qBAAqB,GAAG,QAAiB,CAAC;AAEvD;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,2EAA2E;IAC3E,aAAa,EAAE,EAAE;IACjB,0DAA0D;IAC1D,SAAS,EAAE,EAAE;IACb,mCAAmC;IACnC,WAAW,EAAE,GAAG;IAChB,iDAAiD;IACjD,UAAU,EAAE,GAAG;IACf,+EAA+E;IAC/E,kBAAkB,EAAE,MAAM;IAC1B,oCAAoC;IACpC,oBAAoB,EAAE,MAAM;IAC5B,qEAAqE;IACrE,gBAAgB,EAAE,GAAG;IACrB,yCAAyC;IACzC,gBAAgB,EAAE,MAAM;CAChB,CAAC;AAEX;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAAC,KAAa,EAAE,MAAc,EAAE,UAAkB;IACjF,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,IAAI,OAAO,CAAC,MAAM,IAAI,MAAM;QAAE,OAAO,OAAO,CAAC;IAC7C,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IAC3C,MAAM,CAAC,IAAI,CACT,GAAG,UAAU,mBAAmB,OAAO,CAAC,MAAM,MAAM,MAAM,mCAAmC,CAC9F,CAAC;IACF,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,eAAe,CAAC,KAAgC,EAAE,UAAkB;IAClF,MAAM,OAAO,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9D,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CACb,GAAG,UAAU,kGAAkG,CAChH,CAAC;IACJ,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,6BAA6B,CAAC,CAAS;IACrD,OAAO,4EAA4E,CAAC,IAAI,CACtF,CAAC,CAAC,IAAI,EAAE,CACT,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,qBAAqB,CAAC,CAAS;IAC7C,MAAM,OAAO,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IACzB,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACvC,IAAI,6BAA6B,CAAC,OAAO,CAAC;QAAE,OAAO,IAAI,CAAC;IACxD,OAAO,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AACzC,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/services/linear/constants.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,qBAAqB,IAAI,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAC/F,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE/C,4EAA4E;AAC5E,MAAM,CAAC,MAAM,qBAAqB,GAAG,QAAiB,CAAC;AAEvD;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,2EAA2E;IAC3E,aAAa,EAAE,EAAE;IACjB,0DAA0D;IAC1D,SAAS,EAAE,EAAE;IACb,mCAAmC;IACnC,WAAW,EAAE,GAAG;IAChB,iDAAiD;IACjD,UAAU,EAAE,GAAG;IACf,+EAA+E;IAC/E,kBAAkB,EAAE,MAAM;IAC1B,oCAAoC;IACpC,oBAAoB,EAAE,MAAM;IAC5B,qEAAqE;IACrE,gBAAgB,EAAE,GAAG;IACrB,yCAAyC;IACzC,gBAAgB,EAAE,MAAM;CAChB,CAAC;AAEX;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAAC,KAAa,EAAE,MAAc,EAAE,UAAkB;IACjF,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,IAAI,OAAO,CAAC,MAAM,IAAI,MAAM;QAAE,OAAO,OAAO,CAAC;IAC7C,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IAC3C,MAAM,CAAC,IAAI,CACT,GAAG,UAAU,mBAAmB,OAAO,CAAC,MAAM,MAAM,MAAM,mCAAmC,CAC9F,CAAC;IACF,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,eAAe,CAAC,KAAgC,EAAE,UAAkB;IAClF,MAAM,OAAO,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9D,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CACb,GAAG,UAAU,kGAAkG,CAChH,CAAC;IACJ,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,6BAA6B,CAAC,CAAS;IACrD,OAAO,4EAA4E,CAAC,IAAI,CACtF,CAAC,CAAC,IAAI,EAAE,CACT,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,qBAAqB,CAAC,CAAS;IAC7C,OAAO,qBAAqB,CAAC,CAAC,CAAC,CAAC;AAClC,CAAC"}

package/dist/services/linear/task-status-aggregation.d.ts

@@ -3,7 +3,7 @@
  * canonical OpenPlanr `TaskStatus`, used to set the merged TaskList Linear
  * issue's `stateId` on push (via the existing resolver pipeline).
  *
- * BL-014. Closes the deferred-since-BL-007 gap where pushing a TASK file
+ * Keeps remote workflow state aligned when pushing a TASK file, which previously
  * never propagated workflow state — Linear TaskList issues sat in
  * Backlog while local files said `done`.
  *

package/dist/services/linear/task-status-aggregation.js

@@ -3,7 +3,7 @@
  * canonical OpenPlanr `TaskStatus`, used to set the merged TaskList Linear
  * issue's `stateId` on push (via the existing resolver pipeline).
  *
- * BL-014. Closes the deferred-since-BL-007 gap where pushing a TASK file
+ * Keeps remote workflow state aligned when pushing a TASK file, which previously
  * never propagated workflow state — Linear TaskList issues sat in
  * Backlog while local files said `done`.
  *

package/dist/services/linear-pull-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"linear-pull-service.d.ts","sourceRoot":"","sources":["../../src/services/linear-pull-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAiErF,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,GACvC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAczB;AAED,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,GAC9B,UAAU,GAAG,SAAS,CAExB;AAwBD,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,GACvC,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAc5B;AAED,wBAAgB,4BAA4B,CAC1C,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,GACjC,aAAa,GAAG,SAAS,CAE3B;AAED,MAAM,WAAW,uBAAuB;IACtC,4EAA4E;IAC5E,OAAO,EAAE,MAAM,CAAC;IAChB,2EAA2E;IAC3E,cAAc,EAAE,MAAM,CAAC;IACvB,kEAAkE;IAClE,SAAS,EAAE,MAAM,CAAC;IAClB,+FAA+F;IAC/F,iBAAiB,EAAE,MAAM,CAAC;IAC1B,6DAA6D;IAC7D,QAAQ,EAAE,MAAM,CAAC;IACjB,6DAA6D;IAC7D,WAAW,EAAE,MAAM,CAAC;IACpB,4DAA4D;IAC5D,cAAc,EAAE,MAAM,CAAC;IACvB,gFAAgF;IAChF,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;;GAIG;AACH,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG,OAAO,GAAG,QAAQ,CAAC;AAE7D;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CACrC,CAAC,EAAE,cAAc,EACjB,QAAQ,EAAE,gBAAgB,GACzB;IACD,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,WAAW,GAAG,OAAO,GAAG,QAAQ,CAAC;IACvC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,cAAc,EAAE,OAAO,CAAC;CACzB,CAiCA;AA0BD,wBAAsB,6BAA6B,CACjD,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,YAAY,EACpB,OAAO,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,gBAAgB,CAAA;CAAE,GAC5D,OAAO,CAAC,uBAAuB,CAAC,CA0NlC;AA8BD,wBAAgB,0BAA0B,CAAC,CAAC,EAAE,uBAAuB,GAAG,MAAM,CAE7E;AAMD,MAAM,MAAM,4BAA4B,GAAG,QAAQ,GAAG,OAAO,GAAG,QAAQ,CAAC;AAEzE,MAAM,WAAW,6BAA6B;IAC5C,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,oGAAoG;IACpG,iBAAiB,EAAE,MAAM,CAAC;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,kFAAkF;IAClF,cAAc,EAAE,MAAM,CAAC;CACxB;AAMD;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,aAAa,EAAE,EACtB,MAAM,EAAE,aAAa,EAAE,EACvB,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,GAClC,aAAa,EAAE,CAmBjB;AAED,qHAAqH;AACrH,wBAAgB,uCAAuC,CACrD,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,gBAAgB,EAAE,MAAM,GACvB,MAAM,CAkBR;AAaD,wBAAgB,qCAAqC,CACnD,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,GACrB,MAAM,CAcR;AAED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,OAAO,GAAG,SAAS,CAAC;IAC1B,KAAK,EAAE,OAAO,GAAG,SAAS,CAAC;IAC3B,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC;CAC7B;AAED;;;;GAIG;AACH,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,OAAO,GAAG,SAAS,CAAC;IAC1B,KAAK,EAAE,OAAO,GAAG,SAAS,CAAC;IAC3B,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC;IAC5B,MAAM,EAAE,OAAO,GAAG,QAAQ,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;GAGG;AACH,wBAAsB,8BAA8B,CAClD,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,EAC3B,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,EAC1B,QAAQ,EAAE,4BAA4B,EACtC,KAAK,EAAE,MAAM,EACb,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,GACpD,OAAO,CAAC;IAAE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAAC,iBAAiB,EAAE,MAAM,CAAA;CAAE,CAAC,CA6ErE;AAkCD,0IAA0I;AAC1I,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,EACnC,OAAO,EAAE,aAAa,EAAE,GACvB,MAAM,CAyBR;AAED;;;GAGG;AACH,wBAAsB,yBAAyB,CAC7C,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,YAAY,EACpB,IAAI,GAAE;IAAE,UAAU,CAAC,EAAE,4BAA4B,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO,GACzE,OAAO,CAAC,6BAA6B,CAAC,CAqJxC"}
+{"version":3,"file":"linear-pull-service.d.ts","sourceRoot":"","sources":["../../src/services/linear-pull-service.ts"],"names":[],"mappings":"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"}

package/dist/services/linear-pull-service.js

@@ -16,6 +16,7 @@
  * `planr linear sync` and gives the next reader one file to understand
  * everything that pulls state from Linear.
  */
+import { reconcileStatus } from '../../lib/integrations.mjs';
 import { parseTaskMarkdown } from '../agents/task-parser.js';
 import { isVerbose, logger } from '../utils/logger.js';
 import { applyTaskCheckboxStateMap, parseTaskCheckboxLines, parseTaskCheckboxReconciled, serializeTaskCheckboxReconciled, } from '../utils/markdown.js';
@@ -123,35 +124,11 @@ export function mapLinearNameToBacklogStatus(stateName, byName) {
  * resolved per `strategy`.
  */
 export function resolveStatusFinalState(c, strategy) {
-    const { base, local, remote } = c;
-    // Fast path: nothing to do.
-    if (local === remote) {
-        return { final: local, side: 'unchanged', conflictDecisions: 0, isTrueConflict: false };
-    }
-    // Only one side diverged from base — propagate its change.
-    if (base !== undefined) {
-        if (base === local && local !== remote) {
-            // Linear changed since last sync → pull.
-            return { final: remote, side: 'linear', conflictDecisions: 0, isTrueConflict: false };
-        }
-        if (base === remote && local !== remote) {
-            // Local changed since last sync → push.
-            return { final: local, side: 'local', conflictDecisions: 0, isTrueConflict: false };
-        }
-    }
-    // True conflict: both changed, or no base and they disagree.
-    // Strategy dictates which wins; we always record a conflict decision so
-    // the summary + audit log reflect reality.
-    if (strategy === 'local') {
-        return { final: local, side: 'local', conflictDecisions: 1, isTrueConflict: true };
-    }
-    if (strategy === 'linear') {
-        return { final: remote, side: 'linear', conflictDecisions: 1, isTrueConflict: true };
-    }
-    // strategy === 'prompt': caller resolves interactively after seeing the
-    // conflict. Report the true-conflict marker so the sync loop can dispatch
-    // to promptSelect and increment the counter.
-    return { final: local, side: 'local', conflictDecisions: 1, isTrueConflict: true };
+    const decision = reconcileStatus(c, strategy === 'linear' ? 'remote' : strategy);
+    return {
+        ...decision,
+        side: decision.side === 'remote' ? 'linear' : decision.side,
+    };
 }
 export async function syncLinearStatusIntoArtifacts(projectDir, config, client, options) {
     const dryRun = options?.dryRun === true;
@@ -593,7 +570,7 @@ export async function runLinearTaskCheckboxSync(projectDir, config, client, opts
         // (UUID or `ENG-42` identifier). We deliberately do NOT pre-screen for
         // "looks like a workflow state UUID" — Linear issue ids and workflow-state
         // ids are both UUIDv4, so shape alone cannot distinguish them. Healthy
-        // pushed issue ids are UUIDs and must pass through (BL-016).
+        // pushed issue ids are UUIDs and must pass through.
         if (!isLikelyLinearIssueId(issueId)) {
             summary.skippedStaleId++;
             logger.warn(`Task ${t.id}: linearIssueId "${issueId}" is not a valid Linear issue id (expected uuid or \`ENG-42\` identifier). Re-run \`planr linear push\` to repair.`);