orizu 0.5.49 → 0.5.50

package/dist/setup-and-skills-commands.js

@@ -1,13 +1,13 @@
 // ORI-2044: moved from index.ts to keep setup and skills commands together.
 import { createInterface } from 'readline/promises';
 import { stdin as input, stdout as output } from 'process';
-import { emitKeypressEvents } from 'readline';
 import { join, relative, resolve } from 'path';
 import { mkdirSync, writeFileSync } from 'fs';
 import { randomBytes } from 'crypto';
 import { spawnSync } from 'child_process';
 import { isInteractiveTerminal, getArg, getArgs, hasJsonFlag, hasArg, normalizeSlugInput, getOptionalArgValue, expandHomePath, cliArgs, } from './command-line-arguments.js';
 import { printLine, getCliVersion, getErrorMessage, printJson, printBannerIfInteractive, } from './cli-console-output.js';
+import { datasetTransferTimeoutMs } from './dataset-transfer-policy.js';
 import { sanitizeTerminalText } from './json-response.js';
 import { SKILL_INSTALL_AGENTS, SKILL_INSTALL_TARGETS, getTargetForAgent, getSkillInstallPath, isSkillInstallAgent, isSkillInstallTarget, installSkillTarget, targetNeedsOverwrite, resolveSkillSource, getSkillTargetStatus, computeSkillContentHash, findLegacySkillInstalls, replaceLegacySkillInstalls, PROJECT_SKILL_COPY_TARGETS, compareProjectSkillCopies, withProjectSkillCopyPair, } from './skill-installer.js';
 import { createTeamOnServer, fetchTeams, fetchProjects, createProjectOnServer, } from './account-directory.js';
@@ -49,30 +49,13 @@ async function waitForAnyKeyOrEscape(message) {
         throw new Error('Interactive terminal required.');
     }
     printLine(message);
-    const rawInput = input;
-    const wasRaw = Boolean(rawInput.isRaw);
-    emitKeypressEvents(input);
-    return new Promise((resolvePromise, rejectPromise) => {
-        function cleanup() {
-            input.off('keypress', onKeypress);
-            if (rawInput.setRawMode && !wasRaw) {
-                rawInput.setRawMode(false);
-            }
-            input.pause();
-            printLine('');
-        }
-        function onKeypress(_chunk, key) {
-            cleanup();
-            if (key.ctrl && key.name === 'c') {
-                rejectPromise(new Error('Setup cancelled.'));
-                return;
-            }
-            resolvePromise(key.name !== 'escape');
-        }
-        input.on('keypress', onKeypress);
-        input.resume();
-        rawInput.setRawMode?.(true);
-    });
+    const { readKeys } = await import('./terminal-key-session.js');
+    try {
+        return await readKeys(key => ({ kind: 'done', value: key.name !== 'escape' }), { hideCursor: false });
+    }
+    finally {
+        printLine('');
+    }
 }
 async function promptKeyboardMultiSelect(title, items, label, defaultSelected, options = {}) {
     if (items.length === 0) {
@@ -91,9 +74,6 @@ async function promptKeyboardMultiSelect(title, items, label, defaultSelected, o
             checked.add(index);
         }
     });
-    const rawInput = input;
-    const wasRaw = Boolean(rawInput.isRaw);
-    emitKeypressEvents(input);
     function render() {
         if (rendered) {
             output.write(`\x1b[${items.length}A`);
@@ -107,58 +87,34 @@ async function promptKeyboardMultiSelect(title, items, label, defaultSelected, o
         rendered = true;
     }
     render();
-    output.write('\x1b[?25l');
-    return new Promise((resolvePromise, rejectPromise) => {
-        function cleanup() {
-            input.off('keypress', onKeypress);
-            if (rawInput.setRawMode && !wasRaw) {
-                rawInput.setRawMode(false);
-            }
-            input.pause();
-            output.write('\x1b[?25h');
-            printLine('');
-        }
-        function onKeypress(_chunk, key) {
-            if (key.ctrl && key.name === 'c') {
-                cleanup();
-                rejectPromise(new Error('Setup cancelled.'));
-                return;
-            }
+    const { readKeys } = await import('./terminal-key-session.js');
+    try {
+        return await readKeys(key => {
             if (key.name === 'escape') {
-                cleanup();
-                resolvePromise(options.escapeKeepsDefaults ? items.filter((item, index) => defaultSelected(item, index)) : []);
-                return;
-            }
-            if (key.name === 'up') {
-                selected = (selected - 1 + items.length) % items.length;
-                render();
-                return;
+                return { kind: 'done', value: options.escapeKeepsDefaults ? items.filter((item, index) => defaultSelected(item, index)) : [] };
             }
-            if (key.name === 'down') {
-                selected = (selected + 1) % items.length;
+            if (key.name === 'up' || key.name === 'down') {
+                selected = (selected + (key.name === 'up' ? -1 : 1) + items.length) % items.length;
                 render();
-                return;
+                return { kind: 'wait' };
             }
             if (key.name === 'space') {
-                if (checked.has(selected)) {
+                if (checked.has(selected))
                     checked.delete(selected);
-                }
-                else {
+                else
                     checked.add(selected);
-                }
                 render();
-                return;
+                return { kind: 'wait' };
             }
             if (key.name === 'return' || key.name === 'enter') {
-                const selectedItems = items.filter((_item, index) => checked.has(index));
-                cleanup();
-                resolvePromise(selectedItems);
+                return { kind: 'done', value: items.filter((_item, index) => checked.has(index)) };
             }
-        }
-        input.on('keypress', onKeypress);
-        input.resume();
-        rawInput.setRawMode?.(true);
-    });
+            return { kind: 'wait' };
+        }, { hideCursor: true });
+    }
+    finally {
+        printLine('');
+    }
 }
 function formatFindingCount(count, label) {
     return `${count} ${label}${count === 1 ? '' : 's'}`;
@@ -332,13 +288,13 @@ function describePlannedWrite(target, action, mode, path) {
 async function applySkillInstallTargets(targets, options) {
     const cliVersion = getCliVersion();
     const jsonMode = hasJsonFlag();
-    const planned = targets.map(target => installSkillTarget(target, {
+    const planned = await Promise.all(targets.map(target => installSkillTarget(target, {
         cwd: options.cwd,
         homeDir: options.homeDir,
         dryRun: true,
         mode: options.mode,
         cliVersion,
-    }));
+    })));
     const showPlan = options.showPlan ?? true;
     const printResults = options.printResults ?? true;
     if (showPlan && !jsonMode) {
@@ -377,7 +333,7 @@ async function applySkillInstallTargets(targets, options) {
             }
         }
         try {
-            const result = installSkillTarget(target, {
+            const result = await installSkillTarget(target, {
                 cwd: options.cwd,
                 homeDir: options.homeDir,
                 overwrite,
@@ -386,13 +342,17 @@ async function applySkillInstallTargets(targets, options) {
             });
             if (printResults && !jsonMode) {
                 const suffix = result.mode === 'link' ? ' (symlink)' : '';
-                printLine(`${formatSkillInstallAction(result.action)} ${result.path}${suffix}`);
+                printLine(`${formatSkillInstallAction(result.action)} ${result.path}${suffix}${describeBackup(result.backup)}`);
+                if (result.warning)
+                    printLine(sanitizeSetupHumanInlineText(`Warning: ${result.warning}`));
             }
             outcomes.push({
                 target,
                 path: result.path,
                 action: result.action,
                 mode: result.mode,
+                ...(result.backup ? { backup: result.backup } : {}),
+                ...(result.warning ? { warning: result.warning } : {}),
             });
         }
         catch (error) {
@@ -405,6 +365,9 @@ async function applySkillInstallTargets(targets, options) {
     }
     return outcomes;
 }
+function describeBackup(backup) {
+    return backup ? `; moved your earlier folder to ${backup}` : '';
+}
 async function installSkillCommand() {
     const skipConfirm = hasArg('--yes');
     const dryRun = hasArg('--dry-run');
@@ -424,14 +387,14 @@ async function installSkillCommand() {
         return;
     }
     const outcomes = await applySkillInstallTargets(targets, { mode, skipConfirm, dryRun });
-    const failedCopy = outcomes.some(outcome => outcome.action === 'failed' && PROJECT_SKILL_COPY_TARGETS.includes(outcome.target));
-    if (failedCopy) {
+    if (outcomes.some(outcome => outcome.action === 'failed')) {
         process.exitCode = 1;
-        if (!hasJsonFlag()) {
-            printLine('The two project copies were not both written. Fix the error above and run the command again.');
-        }
     }
-    const legacy = replaceLegacySkillInstalls({
+    const failedCopy = outcomes.some(outcome => outcome.action === 'failed' && PROJECT_SKILL_COPY_TARGETS.includes(outcome.target));
+    if (failedCopy && !hasJsonFlag()) {
+        printLine('The two project copies were not both written. Fix the error above and run the command again.');
+    }
+    const legacy = await replaceLegacySkillInstalls({
         ...legacyScopeAfterInstall(targets, outcomes, dryRun),
         mode,
         dryRun,
@@ -579,7 +542,18 @@ async function skillsUpdateCommand() {
     const dryRun = hasArg('--dry-run');
     const cliVersion = getCliVersion();
     const updates = [];
-    const legacy = replaceLegacySkillInstalls({ dryRun, cliVersion });
+    // A failed target is reported with its reason; the old install there stays whole.
+    const refresh = async (target, path, options, action) => {
+        try {
+            const result = await installSkillTarget(target, options);
+            updates.push({ target, path, action: action(result), ...(result.backup ? { backup: result.backup } : {}), ...(result.warning ? { warning: result.warning } : {}) });
+        }
+        catch (error) {
+            process.exitCode = 1;
+            updates.push({ target, path, action: 'failed', error: getErrorMessage(error) });
+        }
+    };
+    const legacy = await replaceLegacySkillInstalls({ dryRun, cliVersion });
     // Two project copies that differ are both rewritten from the installed CLI
     // skill, including a hand-made copy the loop below would leave alone.
     const projectCopies = compareProjectSkillCopies();
@@ -591,8 +565,7 @@ async function skillsUpdateCommand() {
                 updates.push({ target, path, action: 'would-rewrite' });
                 continue;
             }
-            installSkillTarget(target, { overwrite: true, mode: 'copy', cliVersion });
-            updates.push({ target, path, action: 'rewrote' });
+            await refresh(target, path, { overwrite: true, mode: 'copy', cliVersion }, () => 'rewrote');
         }
     }
     for (const target of SKILL_INSTALL_TARGETS) {
@@ -612,16 +585,7 @@ async function skillsUpdateCommand() {
             continue;
         }
         const refreshMode = status.mode === 'link' ? 'auto' : 'copy';
-        const result = installSkillTarget(target, {
-            overwrite: true,
-            mode: refreshMode,
-            cliVersion,
-        });
-        updates.push({
-            target,
-            path: status.path,
-            action: status.state === 'broken-link' ? 'relinked' : result.action,
-        });
+        await refresh(target, status.path, { overwrite: true, mode: refreshMode, cliVersion }, result => status.state === 'broken-link' ? 'relinked' : result.action);
     }
     if (hasJsonFlag()) {
         printJson({ updates, legacy: legacy.replacements, legacyProblems: legacy.problems });
@@ -633,14 +597,30 @@ async function skillsUpdateCommand() {
         return;
     }
     if (rewriteProjectCopies) {
-        const verb = dryRun ? 'Would rewrite' : 'Rewrote';
-        printLine(`${verb} both project copies from the installed CLI skill: ${projectCopies.paths.join(' and ')}`);
+        const rewrote = updates.filter(update => update.action === 'rewrote');
+        if (dryRun) {
+            printLine(`Would rewrite both project copies from the installed CLI skill: ${projectCopies.paths.join(' and ')}`);
+        }
+        else if (rewrote.length === PROJECT_SKILL_COPY_TARGETS.length) {
+            printLine(`Rewrote both project copies from the installed CLI skill: ${projectCopies.paths.join(' and ')}`);
+        }
     }
     for (const update of updates) {
-        if (update.action === 'rewrote' || update.action === 'would-rewrite') {
+        if (update.action === 'failed') {
+            printLine(sanitizeSetupHumanInlineText(`Failed ${update.path}: ${update.error}`));
+            continue;
+        }
+        if (update.action === 'would-rewrite') {
             continue;
         }
-        if (update.action === 'already-current') {
+        if (update.action === 'rewrote') {
+            // With both rewritten, the line above names them; otherwise each says so here.
+            const bothRewritten = updates.filter(other => other.action === 'rewrote').length === PROJECT_SKILL_COPY_TARGETS.length;
+            if (!bothRewritten || update.backup) {
+                printLine(sanitizeSetupHumanInlineText(`Rewrote ${update.path} from the installed CLI skill${describeBackup(update.backup)}`));
+            }
+        }
+        else if (update.action === 'already-current') {
             printLine(`Current ${update.path}`);
         }
         else if (update.action === 'would-update') {
@@ -650,8 +630,10 @@ async function skillsUpdateCommand() {
             printLine(`Relinked ${update.path}`);
         }
         else {
-            printLine(`Updated ${update.path}`);
+            printLine(sanitizeSetupHumanInlineText(`Updated ${update.path}${describeBackup(update.backup)}`));
         }
+        if (update.warning)
+            printLine(sanitizeSetupHumanInlineText(`Warning: ${update.warning}`));
     }
 }
 function skillsPathCommand() {
@@ -684,7 +666,7 @@ async function resolveSetupTeam(teamSlugArg, createTeamName, noInput, dryRun, wo
             throw new Error('--create-team requires a non-empty team name.');
         return await createSetupTeam(name, request);
     }
-    const teams = await fetchTeams(request);
+    const teams = await fetchTeams(request, datasetTransferTimeoutMs());
     const normalizedTeamSlug = teamSlugArg ? normalizeSlugInput(teamSlugArg) : null;
     if (normalizedTeamSlug) {
         const team = teams.find(candidate => candidate.slug === normalizedTeamSlug);
@@ -731,7 +713,7 @@ async function resolveSetupProjects(team, projectSlugArg, createProjectName, noI
     if (createProjectName && !canCreateProject) {
         throw new Error(`Only team admins can create projects in '${team.slug}'. Choose an existing project or ask a team admin to create one.`);
     }
-    const projects = await fetchProjects(team.slug, request);
+    const projects = await fetchProjects(team.slug, request, datasetTransferTimeoutMs());
     if (createProjectName) {
         if (dryRun) {
             throw new Error('--create-project cannot be used with --dry-run because setup cannot preview a server-generated project slug.');
@@ -926,7 +908,7 @@ async function setupCommand() {
             throw new Error(`This directory is already an Orizu workspace for team '${workspaceTeamSlug}'. Run setup in another directory to set up team '${setupTeam.slug}'.`);
         }
         if (fix) {
-            setupProjects = await fetchProjects(setupTeam.slug, setupRequest);
+            setupProjects = await fetchProjects(setupTeam.slug, setupRequest, datasetTransferTimeoutMs());
             if (setupProjects.length === 0)
                 throw new Error(`Team '${setupTeam.slug}' has no projects to restore.`);
         }
@@ -1052,7 +1034,7 @@ async function setupCommand() {
             if (dryRun) {
                 printLine('Dry run: no skill files were changed.');
             }
-            const legacy = replaceLegacySkillInstalls({
+            const legacy = await replaceLegacySkillInstalls({
                 ...legacyScopeAfterInstall(targets, installOutcomes, dryRun),
                 mode: installMode,
                 dryRun,
@@ -1070,7 +1052,9 @@ async function setupCommand() {
                     printLine(`${label} skipped`);
                 }
                 else {
-                    printLine(`${label} installed`);
+                    printLine(sanitizeSetupHumanInlineText(`${label} installed${describeBackup(outcome.backup)}`));
+                    if (outcome.warning)
+                        printLine(sanitizeSetupHumanInlineText(`Warning: ${outcome.warning}`));
                 }
             }
         }
@@ -1165,6 +1149,8 @@ async function setupCommand() {
                 action: outcome.action,
                 mode: outcome.mode,
                 error: outcome.error,
+                ...(outcome.backup ? { backup: outcome.backup } : {}),
+                ...(outcome.warning ? { warning: outcome.warning } : {}),
             })),
             skill: {
                 root: source.root,

package/dist/skill-install-workflow.d.ts

@@ -0,0 +1,23 @@
+export interface ReplaceSkillFolderInput {
+    sourceRoot: string;
+    targetPath: string;
+    mode: 'link' | 'copy';
+    /** Where a person's own folder is moved; no agent looks for skills there. */
+    backupPath: string;
+    /** Writes Orizu's marker into the new copy before it is put in place. */
+    writeMarker: (dir: string) => void;
+}
+export interface ReplaceSkillFolderResult {
+    /** Where a person's own folder was moved, when there was one. */
+    backup: string | null;
+    /** Why a person's folder, or part of it, is still beside the skill. */
+    warning?: string;
+}
+/** One replacement whose renames go through `move`, so a test can make one fail. */
+export declare function replaceSkillFolderUsing(move: (from: string, to: string) => Promise<void>, input: ReplaceSkillFolderInput): Promise<ReplaceSkillFolderResult>;
+/**
+ * Runs one replacement. Ctrl-C or SIGTERM interrupts it; once staging is
+ * removed and the old folder is back, the process ends by that same signal.
+ */
+export declare function runSkillFolderReplacement(input: ReplaceSkillFolderInput): Promise<ReplaceSkillFolderResult>;
+//# sourceMappingURL=skill-install-workflow.d.ts.map

package/dist/skill-install-workflow.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"skill-install-workflow.d.ts","sourceRoot":"","sources":["../src/skill-install-workflow.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,uBAAuB;IACtC,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;IACrB,6EAA6E;IAC7E,UAAU,EAAE,MAAM,CAAA;IAClB,yEAAyE;IACzE,WAAW,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;CACnC;AAED,MAAM,WAAW,wBAAwB;IACvC,iEAAiE;IACjE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;IACrB,uEAAuE;IACvE,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAuJD,oFAAoF;AACpF,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,uBAAuB,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAElK;AAaD;;;GAGG;AACH,wBAAsB,yBAAyB,CAAC,KAAK,EAAE,uBAAuB,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAgBjH"}

package/dist/skill-install-workflow.js

@@ -0,0 +1,184 @@
+// Reads the skill source and the install target it is given.
+// @tia-reads: skills/orizu
+// Replaces one skill folder without ever leaving a half-written one, and never
+// deletes a person's files: they are moved to a backup first. Loaded only
+// through `await import(...)`, so `orizu skills path` never loads Effect.
+import { cp, lstat, mkdir, readdir, readlink, readFile, rename, rm, symlink, unlink, copyFile } from 'node:fs/promises';
+import { basename, dirname, join, resolve } from 'node:path';
+import { Context, Effect, Exit, Option, Schema } from 'effect';
+import { computeSkillContentHash, SKILL_META_FILENAME, shouldCopySkillPath } from './skill-installer.js';
+/** Every rename the replacement makes. Tests swap it to make one rename fail. */
+const SkillFolderRename = Context.Reference('orizu/SkillFolderRename', {
+    defaultValue: () => rename,
+});
+const renameEntry = (from, to) => Effect.gen(function* () {
+    const move = yield* SkillFolderRename;
+    yield* attempt(() => move(from, to));
+});
+const SkillMarker = Schema.Struct({ skillHash: Schema.String });
+const attempt = (run) => 
+// One file step at a time: an interruption lands between steps, never during one.
+Effect.uninterruptible(Effect.tryPromise({ try: run, catch: cause => cause instanceof Error ? cause : new Error(String(cause)) }));
+const exists = (path) => attempt(() => lstat(path).then(() => true, () => false));
+// Orizu's own install is a link, or a copy whose files still match its marker
+// or the skill being installed. Anything else may hold a person's work.
+function classify(targetPath, sourceRoot) {
+    return Effect.gen(function* () {
+        const stats = yield* attempt(() => lstat(targetPath).then(found => found, () => null));
+        if (!stats)
+            return 'missing';
+        if (stats.isSymbolicLink())
+            return 'link';
+        if (!stats.isDirectory())
+            return 'person';
+        const marker = yield* attempt(() => readFile(join(targetPath, SKILL_META_FILENAME), 'utf8').then(text => JSON.parse(text), () => null));
+        const installedHash = computeSkillContentHash(targetPath);
+        const recorded = Schema.decodeUnknownOption(SkillMarker)(marker);
+        if (Option.isSome(recorded) && recorded.value.skillHash === installedHash)
+            return 'orizu';
+        return installedHash === computeSkillContentHash(sourceRoot) ? 'orizu' : 'person';
+    });
+}
+function copyTree(root, from, to) {
+    return Effect.gen(function* () {
+        yield* attempt(() => mkdir(to, { recursive: true }));
+        const entries = yield* attempt(() => readdir(from, { withFileTypes: true }));
+        for (const entry of entries) {
+            const source = join(from, entry.name);
+            const target = join(to, entry.name);
+            if (!shouldCopySkillPath(root, source))
+                continue;
+            if (entry.isDirectory())
+                yield* copyTree(root, source, target);
+            else if (entry.isFile())
+                yield* attempt(() => copyFile(source, target));
+            else if (entry.isSymbolicLink())
+                yield* attempt(async () => symlink(await readlink(source), target));
+            else
+                yield* Effect.fail(new Error(`${source} is not a file or folder, so the skill can't be copied.`));
+        }
+    });
+}
+// Links are removed as links, never by following them.
+const removeEntry = (path) => attempt(async () => {
+    const stats = await lstat(path).catch(() => null);
+    if (!stats)
+        return;
+    if (stats.isSymbolicLink())
+        await unlink(path);
+    else
+        await rm(path, { recursive: true, force: true });
+});
+/**
+ * Moves a person's folder to the backup. Once the copy is whole, the backup
+ * is reported even when the original cannot be removed; if nothing could be
+ * moved, the folder stays where it is and the warning says why.
+ */
+function moveToBackup(from, to) {
+    const stayed = (cause) => ({
+        backup: resolve(from),
+        warning: `Could not move your earlier folder to ${to}: ${cause.message}. It is still at ${from}, where agents may load it as a second skill; move it somewhere else.`,
+    });
+    return Effect.gen(function* () {
+        yield* attempt(() => mkdir(dirname(to), { recursive: true }));
+        // A project on another disk cannot be renamed into the home folder, so it is copied.
+        const renamed = yield* renameEntry(from, to).pipe(Effect.as(true), Effect.catch(error => error.code === 'EXDEV' ? Effect.succeed(false) : Effect.fail(error)));
+        if (renamed)
+            return { backup: resolve(to) };
+        // Our own half-made copy is removed; the person's folder is untouched.
+        yield* attempt(() => cp(from, to, { recursive: true, verbatimSymlinks: true })).pipe(Effect.tapError(() => removeEntry(to).pipe(Effect.ignore)));
+        return yield* attempt(() => rm(from, { recursive: true })).pipe(Effect.as({ backup: resolve(to) }), Effect.catch(cause => Effect.succeed({
+            backup: resolve(to),
+            warning: `Copied your earlier folder to ${to}, but could not remove it from ${from}: ${cause.message}. Agents may load it there as a second skill; remove it once you have checked the copy.`,
+        })));
+    }).pipe(Effect.catch(cause => Effect.succeed(stayed(cause))));
+}
+/**
+ * Stage the new skill beside the target, move the old folder aside, rename the
+ * staged one into place, then drop Orizu's old copy or back up a person's.
+ * On a failure or an interruption, staging is removed and the old folder is
+ * put back.
+ */
+function replaceSkillFolder(input) {
+    const { sourceRoot, targetPath, mode } = input;
+    const id = `${process.pid}-${Date.now().toString(36)}`;
+    const name = basename(targetPath);
+    const staging = join(dirname(targetPath), `${name}.orizu-staging-${id}`);
+    const aside = join(dirname(targetPath), `${name}.orizu-previous-${id}`);
+    // Set when the old folder could not be put back after a failure.
+    let strandedAt = null;
+    // Only the copy into staging can be interrupted. Once the old folder moves
+    // aside, the swap and the clean-up after it always finish, so Ctrl-C can
+    // never skip putting the old folder back or moving a person's folder out.
+    return Effect.uninterruptibleMask(restore => Effect.gen(function* () {
+        const existing = yield* classify(targetPath, sourceRoot);
+        yield* attempt(() => mkdir(dirname(targetPath), { recursive: true }));
+        const swapped = yield* Effect.scoped(Effect.gen(function* () {
+            // Registered before staging starts, so a copy that stops part way is removed too.
+            // Gone already once it has been renamed into place.
+            yield* Effect.addFinalizer(() => removeEntry(staging).pipe(Effect.ignore));
+            yield* restore(mode === 'link'
+                ? attempt(() => symlink(sourceRoot, staging, 'dir'))
+                : copyTree(sourceRoot, sourceRoot, staging).pipe(Effect.andThen(Effect.try({ try: () => input.writeMarker(staging), catch: cause => cause instanceof Error ? cause : new Error(String(cause)) }))));
+            if (existing !== 'missing') {
+                yield* Effect.acquireRelease(renameEntry(targetPath, aside), (_, exit) => Exit.isSuccess(exit)
+                    ? Effect.void
+                    // Put the old folder back unless something already holds its place.
+                    : exists(targetPath).pipe(Effect.flatMap(taken => taken ? Effect.fail(new Error(`${targetPath} is taken`)) : renameEntry(aside, targetPath)), Effect.catch(() => Effect.sync(() => { strandedAt = aside; }))));
+            }
+            yield* renameEntry(staging, targetPath);
+            return existing;
+        })).pipe(Effect.mapError(error => strandedAt
+            ? new Error(`${error.message} Your earlier folder could not be put back at ${targetPath}; it is at ${strandedAt}.`)
+            : error));
+        if (swapped === 'missing')
+            return { backup: null };
+        if (swapped !== 'person') {
+            yield* removeEntry(aside).pipe(Effect.mapError(cause => new Error(`Installed ${targetPath}, but could not remove the earlier copy at ${aside}: ${cause.message}`)));
+            return { backup: null };
+        }
+        // The person's folder is safe beside the target; move it out of agents' sight.
+        return yield* moveToBackup(aside, input.backupPath);
+    }));
+}
+/** One replacement whose renames go through `move`, so a test can make one fail. */
+export async function replaceSkillFolderUsing(move, input) {
+    return await Effect.runPromise(replaceSkillFolder(input).pipe(Effect.provideService(SkillFolderRename, move)));
+}
+const STOP_SIGNALS = ['SIGINT', 'SIGTERM'];
+/** Ends the process by the signal that stopped it, once its handlers are gone. */
+async function endBy(signal, handlers) {
+    for (const [name, handler] of handlers)
+        process.removeListener(name, handler);
+    process.kill(process.pid, signal);
+    // The signal ends the process; if another listener holds it, exit as a shell would.
+    setTimeout(() => process.exit(signal === 'SIGINT' ? 130 : 143), 1_000);
+    return await new Promise(() => { });
+}
+/**
+ * Runs one replacement. Ctrl-C or SIGTERM interrupts it; once staging is
+ * removed and the old folder is back, the process ends by that same signal.
+ */
+export async function runSkillFolderReplacement(input) {
+    const controller = new AbortController();
+    const stop = { by: null };
+    const handlers = STOP_SIGNALS.map(signal => [signal, () => { stop.by = signal; controller.abort(); }]);
+    for (const [signal, handler] of handlers)
+        process.once(signal, handler);
+    try {
+        const result = await Effect.runPromise(replaceSkillFolder(input), { signal: controller.signal });
+        // A stop that arrived as the replacement finished still stops the command.
+        if (stop.by)
+            return await endBy(stop.by, handlers);
+        return result;
+    }
+    catch (error) {
+        if (!stop.by)
+            throw error;
+        return await endBy(stop.by, handlers);
+    }
+    finally {
+        for (const [signal, handler] of handlers)
+            process.removeListener(signal, handler);
+    }
+}

package/dist/skill-installer.d.ts

@@ -21,6 +21,10 @@ export interface SkillInstallResult {
     path: string;
     action: 'created' | 'updated' | 'would-create' | 'would-update';
     mode: 'link' | 'copy' | 'section';
+    /** Where a person's own folder at the path was moved before replacing it. */
+    backup?: string;
+    /** Why a person's folder, or part of it, is still beside the skill. */
+    warning?: string;
 }
 export interface SkillInstallMeta {
     name: string;
@@ -65,9 +69,10 @@ export declare function compareProjectSkillCopies(options?: SkillInstallOptions)
 export declare function isProjectLevelTarget(target: SkillInstallTarget): boolean;
 export declare function isStableSkillSourcePath(root: string): boolean;
 export declare function resolveEffectiveInstallMode(target: SkillInstallTarget, sourceRoot: string, mode?: SkillInstallMode): 'link' | 'copy' | 'section';
+export declare function shouldCopySkillPath(sourceRoot: string, sourcePath: string): boolean;
 export declare function targetNeedsOverwrite(target: SkillInstallTarget, options?: SkillInstallOptions): boolean;
 export declare function readSkillMeta(targetDir: string): SkillInstallMeta | null;
-export declare function installSkillTarget(target: SkillInstallTarget, options?: SkillInstallOptions): SkillInstallResult;
+export declare function installSkillTarget(target: SkillInstallTarget, options?: SkillInstallOptions): Promise<SkillInstallResult>;
 export type SkillTargetState = 'current' | 'stale' | 'missing' | 'broken-link' | 'unmanaged';
 export interface SkillTargetStatus {
     target: SkillInstallTarget;
@@ -109,8 +114,8 @@ export interface LegacySkillReplaceOptions extends SkillInstallOptions {
     heldBack?: Partial<Record<SkillInstallTarget, string>>;
 }
 export declare function findLegacySkillInstalls(options?: SkillInstallOptions): LegacySkillScan;
-export declare function replaceLegacySkillInstalls(options?: LegacySkillReplaceOptions): {
+export declare function replaceLegacySkillInstalls(options?: LegacySkillReplaceOptions): Promise<{
     replacements: LegacySkillReplacement[];
     problems: LegacySkillProblem[];
-};
+}>;
 //# sourceMappingURL=skill-installer.d.ts.map

package/dist/skill-installer.d.ts.map

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