orizu 0.5.52 → 0.5.53

package/dist/instruction-delivery.js

@@ -1,11 +1,13 @@
+import { join } from 'node:path';
 import { Cause, Effect, Exit } from 'effect';
+import { runWithStops } from './cli-stops.js';
 import { authedFetch } from './http.js';
 import { responsePayload } from './json-response.js';
-import { stageSyncPayload, startSyncLockClaim, tryClaimSyncLock } from './instruction-set-sync/index.js';
-import { applyUpdate, lockedProfileIdentity, makeUpdatePlan, readUpdateLock } from './instruction-set-update/index.js';
-// Existing file steps throw plain errors; keep them as the failure value so the
-// CLI prints exactly the same message.
-const attempt = (operation) => Effect.try({ try: operation, catch: cause => cause });
+import { stageSyncPayload } from './instruction-set-sync/index.js';
+import { applyUpdate, lockedProfileIdentity, makeUpdatePlan, publishNoSyncUpdate, readUpdateLock } from './instruction-set-update/index.js';
+import { attempt, holdSyncLock } from './instruction-sync-lock.js';
+// Loaded only through `await import(...)` from instruction-sets-cli, so CLI
+// startup and the published loader never load Effect.
 function readPayload(path, action) {
     return Effect.tryPromise({
         // The body stays unchecked here, as before: stageSyncPayload and makeUpdatePlan validate it.
@@ -14,51 +16,29 @@ function readPayload(path, action) {
         catch: cause => cause,
     });
 }
-// Waiting for another process's lock is the only interruptible part: nothing
-// is held yet. Publishing runs to completion once the lock is ours.
-function holdSyncLock(appRoot, use) {
-    const acquire = Effect.gen(function* () {
-        const claim = yield* attempt(() => startSyncLockClaim(appRoot));
-        while (true) {
-            const claimed = yield* attempt(() => tryClaimSyncLock(claim));
-            if (typeof claimed === 'function')
-                return claimed;
-            yield* Effect.interruptible(Effect.sleep(claimed));
-        }
-    });
-    return Effect.acquireUseRelease(acquire, () => use, release => Effect.sync(release));
-}
-// Stage the version, publish it under the lock, and always remove an
-// unpublished stage, including after Ctrl-C or SIGTERM.
+// Stage the version, publish it under the lock (to completion once the lock
+// is ours), and always remove an unpublished stage, including after Ctrl-C or
+// SIGTERM.
 function deliverPayload(...args) {
     return Effect.acquireUseRelease(attempt(() => stageSyncPayload(...args)), staged => holdSyncLock(staged.appRoot, attempt(staged.publish)).pipe(Effect.map(warnings => ({ destination: staged.destination, wasPresent: staged.wasPresent, warnings }))), staged => Effect.sync(staged.discard));
 }
+/** Stages and publishes one version under the folder lock (tests and the fixture script). */
+export function syncPayloadToDisk(...args) {
+    return runOrThrow(deliverPayload(...args), new AbortController().signal);
+}
 async function runOrThrow(program, signal) {
     const exit = await Effect.runPromiseExit(program, { signal });
     if (Exit.isSuccess(exit))
         return exit.value;
     throw Cause.squash(exit.cause);
 }
-// `once`: a second signal falls through to Node's default kill.
 async function runDelivery(program) {
-    const controller = new AbortController();
-    let interrupted;
-    const handleInterrupt = () => { interrupted ??= 130; controller.abort(); };
-    const handleTerminate = () => { interrupted ??= 143; controller.abort(); };
-    process.once('SIGINT', handleInterrupt);
-    process.once('SIGTERM', handleTerminate);
-    try {
-        return await runOrThrow(program(controller.signal), controller.signal);
-    }
-    catch (error) {
-        if (interrupted !== undefined)
-            return { interrupted };
-        throw error;
-    }
-    finally {
-        process.removeListener('SIGINT', handleInterrupt);
-        process.removeListener('SIGTERM', handleTerminate);
-    }
+    const { exit, interrupted } = await runWithStops(program);
+    if (Exit.isSuccess(exit))
+        return exit.value;
+    if (interrupted !== undefined)
+        return { interrupted };
+    throw Cause.squash(exit.cause);
 }
 export function syncInstructionSet(out, project, plan, options) {
     return runDelivery(() => Effect.gen(function* () {
@@ -84,12 +64,18 @@ export function updateInstructionSets(out, project, isApproved, noSync) {
         const plan = yield* attempt(() => makeUpdatePlan(project, lock, payloads));
         if (!isApproved)
             return { plan, result: { absent: [], warnings: [] } };
-        // applyUpdate's own steps are not interruptible; each version it syncs is
-        // a nested delivery that the shared signal interrupts and cleans up.
-        const result = yield* Effect.uninterruptible(Effect.tryPromise({
-            try: () => applyUpdate(out, project, plan, noSync, undefined, (...args) => runOrThrow(deliverPayload(...args), signal)),
-            catch: cause => cause,
-        }));
+        // --no-sync writes the Lock under the folder lock. Otherwise applyUpdate's
+        // own steps are not interruptible; each version it syncs is a nested
+        // delivery that the shared signal interrupts and cleans up.
+        const result = noSync
+            ? yield* holdSyncLock(join(out, 'orizu'), Effect.uninterruptible(Effect.tryPromise({
+                try: () => publishNoSyncUpdate(out, project, plan),
+                catch: cause => cause,
+            })))
+            : yield* Effect.uninterruptible(Effect.tryPromise({
+                try: () => applyUpdate(out, project, plan, () => new Date(), (...args) => runOrThrow(deliverPayload(...args), signal)),
+                catch: cause => cause,
+            }));
         return { plan, result };
     });
     // --no-sync stages nothing to clean up, so keep Node's default signal

package/dist/instruction-prune.d.ts

@@ -0,0 +1,24 @@
+import { type Interrupted } from './cli-stops.js';
+import { type PrunePlan, type PruneResult } from './instruction-set-update/index.js';
+/** What the removal step did before a stop was handled. */
+export type PruneOutcome = {
+    kind: 'not started';
+} | {
+    kind: 'removed';
+    count: number;
+} | {
+    kind: 'rolled back';
+    error: unknown;
+} | {
+    kind: 'rollback failed';
+};
+export type PruneStopped = Interrupted & {
+    outcome: PruneOutcome;
+};
+/**
+ * Removes the approved Versions under the folder lock. Waiting for the lock
+ * and planning again can be stopped and change nothing. The removal itself
+ * always settles once it starts: applied and verified, or fully rolled back.
+ */
+export declare function pruneInstructionSets(out: string, plan: PrunePlan, keepSpecifiers: string[]): Promise<PruneResult | PruneStopped>;
+//# sourceMappingURL=instruction-prune.d.ts.map

package/dist/instruction-prune.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"instruction-prune.d.ts","sourceRoot":"","sources":["../src/instruction-prune.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgB,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC/D,OAAO,EAOL,KAAK,SAAS,EACd,KAAK,WAAW,EACjB,MAAM,mCAAmC,CAAA;AAM1C,2DAA2D;AAC3D,MAAM,MAAM,YAAY,GACpB;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,GACvB;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAClC;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,GACvC;IAAE,IAAI,EAAE,iBAAiB,CAAA;CAAE,CAAA;AAE/B,MAAM,MAAM,YAAY,GAAG,WAAW,GAAG;IAAE,OAAO,EAAE,YAAY,CAAA;CAAE,CAAA;AAElE;;;;GAIG;AACH,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,WAAW,GAAG,YAAY,CAAC,CAwBtI"}

package/dist/instruction-prune.js

@@ -0,0 +1,33 @@
+import { join } from 'node:path';
+import { Cause, Effect, Exit } from 'effect';
+import { runWithStops } from './cli-stops.js';
+import { finishPrune, rollBackPrune, selectPruneRemovals, stagePruneRemovals, startPrune, verifyPrunedTree, } from './instruction-set-update/index.js';
+import { attempt, holdSyncLock } from './instruction-sync-lock.js';
+/**
+ * Removes the approved Versions under the folder lock. Waiting for the lock
+ * and planning again can be stopped and change nothing. The removal itself
+ * always settles once it starts: applied and verified, or fully rolled back.
+ */
+export async function pruneInstructionSets(out, plan, keepSpecifiers) {
+    const state = { outcome: { kind: 'not started' } };
+    const program = holdSyncLock(join(out, 'orizu'), Effect.gen(function* () {
+        const selection = yield* Effect.tryPromise({ try: () => selectPruneRemovals(out, plan, keepSpecifiers), catch: cause => cause });
+        yield* Effect.uninterruptible(Effect.gen(function* () {
+            const prune = yield* attempt(() => startPrune(out));
+            yield* Effect.gen(function* () {
+                yield* attempt(() => stagePruneRemovals(out, prune, selection));
+                yield* Effect.tryPromise({ try: () => verifyPrunedTree(out), catch: cause => cause });
+                yield* attempt(() => finishPrune(prune));
+            }).pipe(Effect.catch(error => attempt(() => rollBackPrune(prune)).pipe(Effect.tapError(() => Effect.sync(() => { state.outcome = { kind: 'rollback failed' }; })), Effect.andThen(Effect.sync(() => { state.outcome = { kind: 'rolled back', error }; })), Effect.andThen(Effect.fail(error)))));
+            state.outcome = { kind: 'removed', count: selection.removals.length };
+        }));
+        return { skipped: selection.skipped };
+    }));
+    const { exit, interrupted } = await runWithStops(() => program);
+    // A failed rollback always surfaces its error, stop or not.
+    if (interrupted !== undefined && state.outcome.kind !== 'rollback failed')
+        return { interrupted, outcome: state.outcome };
+    if (Exit.isSuccess(exit))
+        return exit.value;
+    throw Cause.squash(exit.cause);
+}

package/dist/instruction-set-sync/index.d.ts

@@ -51,7 +51,6 @@ export interface SyncLockClaim {
 }
 export declare function startSyncLockClaim(appRoot: string): SyncLockClaim;
 export declare function tryClaimSyncLock({ lockPath, metadata, deadline }: SyncLockClaim): (() => void) | number;
-export declare function withSyncLock<T>(appRoot: string, operation: () => T): T;
 export interface SyncDiskResult {
     destination: string;
     wasPresent: boolean;
@@ -73,6 +72,5 @@ export interface StagedSync {
     /** Removes the staged version if it was not published. Safe to call more than once. */
     discard: () => void;
 }
-export declare function syncPayloadToDisk(out: string, project: string, plan: SyncRequestPlan, payload: SyncPayload, options?: SyncDiskOptions): SyncDiskResult;
 export declare function stageSyncPayload(out: string, project: string, plan: SyncRequestPlan, payload: SyncPayload, options?: SyncDiskOptions): StagedSync;
 //# sourceMappingURL=index.d.ts.map

package/dist/instruction-set-sync/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/instruction-set-sync/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/instruction-set-sync/index.ts"],"names":[],"mappings":"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"}

package/dist/instruction-set-sync/index.js

@@ -10,9 +10,6 @@ const SYNC_LOCK_STALE_MS = 60_000;
 function isNodeError(error) {
     return error instanceof Error;
 }
-function sleepSync(milliseconds) {
-    Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, milliseconds);
-}
 export function parseSyncTarget(value) {
     const target = value ?? 'ts';
     if (target !== 'ts')
@@ -421,7 +418,7 @@ export function startSyncLockClaim(appRoot) {
     };
 }
 // One claim attempt: returns the release function, or how long to wait before
-// trying again. Waiting is the caller's job so it can be blocking or not.
+// trying again. The caller waits without blocking (instruction-sync-lock.ts).
 export function tryClaimSyncLock({ lockPath, metadata, deadline }) {
     while (true) {
         try {
@@ -462,27 +459,6 @@ export function tryClaimSyncLock({ lockPath, metadata, deadline }) {
         }
     };
 }
-export function withSyncLock(appRoot, operation) {
-    const claim = startSyncLockClaim(appRoot);
-    let release = tryClaimSyncLock(claim);
-    while (typeof release === 'number') {
-        sleepSync(release);
-        release = tryClaimSyncLock(claim);
-    }
-    let result;
-    try {
-        result = operation();
-    }
-    catch (error) {
-        release();
-        throw error;
-    }
-    if (result && typeof result.then === 'function') {
-        return Promise.resolve(result).finally(release);
-    }
-    release();
-    return result;
-}
 // Test-only process boundary hooks. Production behavior is unchanged unless a
 // test child explicitly supplies one of the bounded ORIZU_TEST_SYNC_* values.
 function processTestMilliseconds(name, minimum, maximum) {
@@ -497,21 +473,12 @@ function processTestMilliseconds(name, minimum, maximum) {
     }
     return milliseconds;
 }
+// Holds the real step in place, as a slow disk would, so a test can act mid-step.
 function holdForProcessTest(name) {
     const milliseconds = processTestMilliseconds(name, 0, 10_000);
     if (milliseconds === undefined)
         return;
-    sleepSync(milliseconds);
-}
-export function syncPayloadToDisk(out, project, plan, payload, options = {}) {
-    const staged = stageSyncPayload(out, project, plan, payload, options);
-    try {
-        const warnings = withSyncLock(staged.appRoot, staged.publish);
-        return { destination: staged.destination, wasPresent: staged.wasPresent, warnings };
-    }
-    finally {
-        staged.discard();
-    }
+    Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, milliseconds);
 }
 export function stageSyncPayload(out, project, plan, payload, options = {}) {
     const target = parseSyncTarget(options.target);

package/dist/instruction-set-update/index.d.ts

@@ -1,5 +1,5 @@
 import { type InstructionSetLockV1 } from '../instruction-set-lock/index.js';
-import { syncPayloadToDisk, type SyncDiskResult, type SyncPayload } from '../instruction-set-sync/index.js';
+import { type SyncDiskOptions, type SyncDiskResult, type SyncPayload, type SyncRequestPlan } from '../instruction-set-sync/index.js';
 export interface UpdateResolution {
     payload: SyncPayload;
     profileIdentity: string;
@@ -16,7 +16,11 @@ export interface UpdateResult {
     absent: string[];
     warnings: string[];
 }
-export declare function applyUpdate(out: string, project: string, plan: UpdatePlan, noSync: boolean, now?: () => Date, sync?: (...args: Parameters<typeof syncPayloadToDisk>) => SyncDiskResult | Promise<SyncDiskResult>): Promise<UpdateResult>;
+/** --no-sync: records the planned Pointers in the Lock. The caller holds the folder lock. */
+export declare function publishNoSyncUpdate(out: string, project: string, plan: UpdatePlan, now?: () => Date): Promise<UpdateResult>;
+export type SyncStep = (out: string, project: string, plan: SyncRequestPlan, payload: SyncPayload, options: SyncDiskOptions) => Promise<SyncDiskResult>;
+/** Syncs every newly referenced Version; `sync` takes the folder lock for each one. */
+export declare function applyUpdate(out: string, project: string, plan: UpdatePlan, now: () => Date, sync: SyncStep): Promise<UpdateResult>;
 export interface PrunePlan {
     lock: InstructionSetLockV1;
     removals: Array<{
@@ -38,5 +42,39 @@ export declare function planPrune(out: string, keepSpecifiers: string[]): Promis
 export interface PruneResult {
     skipped: PrunePlan['removals'];
 }
-export declare function applyPrune(out: string, plan: PrunePlan, keepSpecifiers?: string[]): Promise<PruneResult>;
+export interface PruneSelection {
+    lock: InstructionSetLockV1;
+    removals: PrunePlan['removals'];
+    skipped: PrunePlan['removals'];
+}
+/**
+ * Plans again under the folder lock: keeps only approved removals that are
+ * still unreferenced (never adds one) and skips profiles holding unmanaged
+ * files. Reads only.
+ */
+export declare function selectPruneRemovals(out: string, plan: PrunePlan, keepSpecifiers: string[]): Promise<PruneSelection>;
+/** A prune in progress: what it moved aside and what it must restore on failure. */
+export interface StagedPrune {
+    lockPath: string;
+    importMapPath: string;
+    priorLock: string;
+    priorImportMap: string | null;
+    stagingRoot: string;
+    staged: Array<{
+        removal: PrunePlan['removals'][number];
+        stagedPath: string;
+    }>;
+}
+export declare function startPrune(out: string): StagedPrune;
+/**
+ * Moves each removal into the staging folder, then writes the new Lock and
+ * generated index. Records each move as it happens so a failure part-way can
+ * be rolled back.
+ */
+export declare function stagePruneRemovals(out: string, prune: StagedPrune, selection: PruneSelection): void;
+/** Verifies the pruned tree; the error names the first failure. */
+export declare function verifyPrunedTree(out: string): Promise<void>;
+export declare function finishPrune(prune: StagedPrune): void;
+/** Puts back every moved folder, the prior Lock and the prior generated index. */
+export declare function rollBackPrune(prune: StagedPrune): void;
 //# sourceMappingURL=index.d.ts.map

package/dist/instruction-set-update/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/instruction-set-update/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAIL,KAAK,oBAAoB,EAC1B,MAAM,kCAAkC,CAAA;AAEzC,OAAO,EAA4C,iBAAiB,EAAgB,KAAK,cAAc,EAAE,KAAK,WAAW,EAAE,MAAM,kCAAkC,CAAA;AAGnK,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,WAAW,CAAA;IACpB,eAAe,EAAE,MAAM,CAAA;CACxB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,oBAAoB,CAAA;IAC1B,WAAW,EAAE,gBAAgB,EAAE,CAAA;IAC/B,KAAK,EAAE,MAAM,EAAE,CAAA;CAChB;AAMD,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,oBAAoB,CAIlF;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,MAAM,CAmCpG;AAED,wBAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,oBAAoB,EAC1B,QAAQ,EAAE,WAAW,EAAE,GACtB,UAAU,CAiDZ;AA8CD,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,QAAQ,EAAE,MAAM,EAAE,CAAA;CACnB;AA2CD,wBAAsB,WAAW,CAC/B,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,OAAO,EACf,GAAG,GAAE,MAAM,IAAuB,EAClC,IAAI,GAAE,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,KAAK,cAAc,GAAG,OAAO,CAAC,cAAc,CAAqB,GACpH,OAAO,CAAC,YAAY,CAAC,CA4DvB;AAMD,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,oBAAoB,CAAA;IAC1B,QAAQ,EAAE,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC,CAAA;CAC5F;AAED,qBAAa,wBAAyB,SAAQ,KAAK;IACjD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,CAAA;gBAEjB,OAAO,EAAE,KAAK,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,QAAQ,GAAG,UAAU,CAAA;KAAE,CAAC;CAQjF;AAyBD,wBAAsB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAiEzF;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,SAAS,CAAC,UAAU,CAAC,CAAA;CAC/B;AAED,wBAAsB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,cAAc,GAAE,MAAM,EAAO,GAAG,OAAO,CAAC,WAAW,CAAC,CAmFlH"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/instruction-set-update/index.ts"],"names":[],"mappings":"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"}