@open-agent-toolkit/cli 0.2.40 → 0.2.45

package/dist/commands/init/gitignore.js

@@ -1,8 +1,10 @@
 import { execFile } from 'node:child_process';
-import { readFile, writeFile } from 'node:fs/promises';
-import { join } from 'node:path';
+import { readFile, rm, writeFile } from 'node:fs/promises';
+import { dirname, isAbsolute, join, relative } from 'node:path';
 import { promisify } from 'node:util';
-import { fileExists } from '../../fs/io.js';
+import { canonicalizePath } from '../shared/project-scope.js';
+import { CliError } from '../../errors/cli-error.js';
+import { applyManagedBlock } from './managed-block.js';
 const SECTION_START = '# OAT core';
 const SECTION_END = '# END OAT core';
 const OAT_STATE_DASHBOARD_PATH = '.oat/state.md';
@@ -12,53 +14,156 @@ const CORE_ENTRIES = [
     '.oat/state.md',
     '.oat/projects/local/**',
     '.oat/projects/archived/**',
+    '.oat/projects/synced/*/',
     '!.oat/projects/local/.gitkeep',
     '!.oat/projects/archived/.gitkeep',
 ];
-function buildSection() {
-    return `${SECTION_START}\n${CORE_ENTRIES.join('\n')}\n${SECTION_END}`;
+function managedScopedRules(content) {
+    if (content === null)
+        return [];
+    const startIndex = content.indexOf(SECTION_START);
+    const endIndex = content.indexOf(SECTION_END);
+    if (startIndex === -1 || endIndex < startIndex)
+        return [];
+    return content
+        .slice(startIndex + SECTION_START.length, endIndex)
+        .split('\n')
+        .filter((line) => /^\/(?:.+\/)?(?:local\/\*\*|synced\/\*\/|archived\/\*\*)$/.test(line));
 }
-export async function applyOatCoreGitignore(repoRoot) {
-    const gitignorePath = join(repoRoot, '.gitignore');
-    const exists = await fileExists(gitignorePath);
-    const section = buildSection();
-    if (!exists) {
-        await writeFile(gitignorePath, `${section}\n`, 'utf8');
-        return {
-            action: 'created',
-            entries: CORE_ENTRIES,
-            stateDashboardIndexAction: await untrackOatStateDashboard(repoRoot),
-        };
-    }
-    const content = await readFile(gitignorePath, 'utf8');
-    const startIdx = content.indexOf(SECTION_START);
-    const endIdx = content.indexOf(SECTION_END);
-    if (startIdx !== -1 && endIdx !== -1) {
-        const existingSection = content.slice(startIdx, endIdx + SECTION_END.length);
-        if (existingSection === section) {
-            return {
-                action: 'no-change',
-                entries: CORE_ENTRIES,
-                stateDashboardIndexAction: await untrackOatStateDashboard(repoRoot),
-            };
+async function readOptionalFile(path) {
+    try {
+        return await readFile(path, 'utf8');
+    }
+    catch (error) {
+        if (error instanceof Error && 'code' in error && error.code === 'ENOENT') {
+            return null;
         }
-        const before = content.slice(0, startIdx);
-        const after = content.slice(endIdx + SECTION_END.length);
-        await writeFile(gitignorePath, `${before}${section}${after}`, 'utf8');
-        return {
-            action: 'updated',
-            entries: CORE_ENTRIES,
-            stateDashboardIndexAction: await untrackOatStateDashboard(repoRoot),
-        };
-    }
-    const separator = content.endsWith('\n') ? '\n' : '\n\n';
-    await writeFile(gitignorePath, `${content}${separator}${section}\n`, 'utf8');
+        throw error;
+    }
+}
+function removeUnmanagedRule(content, rule) {
+    let inManagedBlock = false;
+    return content
+        .split('\n')
+        .filter((line) => {
+        if (line === SECTION_START)
+            inManagedBlock = true;
+        const keep = line !== rule || inManagedBlock;
+        if (line === SECTION_END)
+            inManagedBlock = false;
+        return keep;
+    })
+        .join('\n');
+}
+export async function isSyncedRuleApplied(repoRoot) {
+    try {
+        await execFileAsync('git', [
+            'check-ignore',
+            '--quiet',
+            '--no-index',
+            '.oat/projects/synced/__probe__/',
+        ], { cwd: repoRoot });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+export async function applyOatCoreGitignore(repoRoot, additionalEntries = []) {
+    const gitignorePath = join(repoRoot, '.gitignore');
+    const existingScopedRules = managedScopedRules(await readOptionalFile(gitignorePath));
+    const result = await applyManagedBlock(gitignorePath, {
+        start: SECTION_START,
+        end: SECTION_END,
+        entries: [
+            ...new Set([
+                ...CORE_ENTRIES,
+                ...existingScopedRules,
+                ...additionalEntries,
+            ]),
+        ],
+    });
     return {
-        action: 'updated',
-        entries: CORE_ENTRIES,
+        ...result,
         stateDashboardIndexAction: await untrackOatStateDashboard(repoRoot),
     };
 }
+export async function ensureScopedRootGitignore(repoRoot, scopeRoot, scope, git, dirtyMessage = 'Cannot repair the configured project-root rule because .gitignore has staged or unstaged changes; commit or stash those changes, then retry.') {
+    const canonicalRepoRoot = canonicalizePath(repoRoot);
+    const canonicalScopeRoot = canonicalizePath(scopeRoot);
+    const scopeRelative = relative(canonicalRepoRoot, canonicalScopeRoot);
+    if (scopeRelative === '..' ||
+        scopeRelative.startsWith('../') ||
+        scopeRelative.startsWith('..\\') ||
+        isAbsolute(scopeRelative)) {
+        return { changed: false, before: undefined };
+    }
+    const normalizedRoot = scopeRelative.split('\\').join('/');
+    const scopeRule = scope === 'local' ? `/${normalizedRoot}/**` : `/${normalizedRoot}/*/`;
+    const defaultRoot = `.oat/projects/${scope}`;
+    const customRules = normalizedRoot === defaultRoot ? [] : [scopeRule];
+    if (scope === 'synced') {
+        const archiveRoot = `${normalizedRoot.slice(0, normalizedRoot.lastIndexOf('/') + 1)}archived`;
+        if (archiveRoot !== '.oat/projects/archived') {
+            customRules.push(`/${archiveRoot}/**`);
+        }
+    }
+    const gitignorePath = join(repoRoot, '.gitignore');
+    const current = await readOptionalFile(gitignorePath);
+    const sectionStart = current?.indexOf(SECTION_START) ?? -1;
+    const sectionEnd = current?.indexOf(SECTION_END) ?? -1;
+    const managedSection = current && sectionStart !== -1 && sectionEnd >= sectionStart
+        ? current.slice(sectionStart, sectionEnd)
+        : '';
+    const managedLines = managedSection.split('\n');
+    const customRulesManaged = customRules.every((rule) => managedLines.includes(rule));
+    const probes = [join(canonicalScopeRoot, '__probe__', 'artifact.md')];
+    if (scope === 'synced') {
+        probes.push(join(dirname(canonicalScopeRoot), 'archived', '__probe__', 'artifact.md'));
+    }
+    const ignoredResults = await Promise.all(probes.map((probe) => git.run(['check-ignore', '--quiet', '--no-index', probe], {
+        cwd: repoRoot,
+        allowFailure: true,
+    })));
+    if (ignoredResults.every((result) => result.code === 0) &&
+        customRulesManaged) {
+        return { changed: false, before: undefined };
+    }
+    const failedProbe = ignoredResults.find((result) => result.code !== 0 && result.code !== 1);
+    if (failedProbe) {
+        throw new CliError(`git check-ignore failed (exit ${failedProbe.code}): ${failedProbe.stderr || failedProbe.stdout || 'unknown Git error'}`, 2);
+    }
+    if (dirtyMessage !== null) {
+        const gitignoreStatus = await git.run(['status', '--porcelain=v1', '--', '.gitignore'], { cwd: repoRoot });
+        if (gitignoreStatus.stdout !== '')
+            throw new CliError(dirtyMessage, 1);
+    }
+    const before = await readOptionalFile(gitignorePath);
+    if (before !== null && customRules.length > 0) {
+        const cleaned = customRules.reduce(removeUnmanagedRule, before);
+        if (cleaned !== before)
+            await writeFile(gitignorePath, cleaned, 'utf8');
+    }
+    await applyOatCoreGitignore(repoRoot, customRules);
+    const verifiedResults = await Promise.all(probes.map((probe) => git.run(['check-ignore', '--quiet', '--no-index', probe], {
+        cwd: repoRoot,
+        allowFailure: true,
+    })));
+    const unverified = verifiedResults.find((result) => result.code !== 0);
+    if (unverified) {
+        if (before === null) {
+            await rm(gitignorePath, { force: true });
+        }
+        else {
+            await writeFile(gitignorePath, before, 'utf8');
+        }
+        throw new CliError(`git check-ignore failed after applying the managed block (exit ${unverified.code}): ${unverified.stderr || unverified.stdout || 'configured rule did not match'}`, 2);
+    }
+    return {
+        before,
+        changed: (await readOptionalFile(gitignorePath)) !== before,
+    };
+}
 /**
  * Removes the generated repo dashboard from the git index once the OAT core
  * ignore rule is present, while leaving the working-tree file intact.

package/dist/commands/init/index.d.ts

@@ -1,4 +1,5 @@
 import { type CommandContext, type GlobalOptions } from '../../app/command-context.js';
+import { type ApplyOatCoreGitattributesResult } from '../init/gitattributes.js';
 import { type ApplyOatCoreResult } from '../init/gitignore.js';
 import { type NativeSkillDisposition } from '../shared/native-skill-disposition.js';
 import { type MultiSelectChoice, type PromptContext, type SelectChoice } from '../shared/shared.prompts.js';
@@ -47,6 +48,7 @@ interface InitDependencies {
     saveSyncConfig: (configPath: string, config: SyncConfig) => Promise<SyncConfig>;
     getConfigAwareAdapters: (adapters: ProviderAdapter[], scopeRoot: string, config: SyncConfig) => Promise<ConfigAwareAdaptersResult>;
     applyOatCoreGitignore: (repoRoot: string) => Promise<ApplyOatCoreResult>;
+    applyOatCoreGitattributes: (repoRoot: string) => Promise<ApplyOatCoreGitattributesResult>;
     dirExists: (dirPath: string) => Promise<boolean>;
     readOatConfig: (repoRoot: string) => Promise<OatConfig>;
     resolveLocalPaths: (config: OatConfig) => string[];

package/dist/commands/init/index.d.ts.map

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

package/dist/commands/init/index.js

@@ -2,6 +2,7 @@ import { execSync } from 'node:child_process';
 import { mkdir } from 'node:fs/promises';
 import { basename, isAbsolute, join, relative, resolve, sep } from 'node:path';
 import { buildCommandContext, } from '../../app/command-context.js';
+import { applyOatCoreGitattributes, } from '../init/gitattributes.js';
 import { applyOatCoreGitignore, } from '../init/gitignore.js';
 import { applyGitignore } from '../local/apply.js';
 import { addLocalPaths } from '../local/manage.js';
@@ -165,6 +166,7 @@ function createDependencies() {
         saveSyncConfig,
         getConfigAwareAdapters,
         applyOatCoreGitignore,
+        applyOatCoreGitattributes,
         dirExists,
         readOatConfig,
         resolveLocalPaths,
@@ -506,6 +508,7 @@ async function runInitCommand(context, dependencies, hookFlag, setupFlag) {
         await dependencies.ensureCanonicalDirs(scopeRoot, scope);
         if (scope === 'project') {
             await dependencies.applyOatCoreGitignore(scopeRoot);
+            await dependencies.applyOatCoreGitattributes(scopeRoot);
         }
         const manifestPath = join(scopeRoot, '.oat', 'sync', 'manifest.json');
         let manifest = await dependencies.loadManifest(manifestPath);

package/dist/commands/init/managed-block.d.ts

@@ -0,0 +1,10 @@
+export interface ApplyManagedBlockResult {
+    action: 'created' | 'updated' | 'no-change';
+    entries: string[];
+}
+export declare function applyManagedBlock(filePath: string, options: {
+    start: string;
+    end: string;
+    entries: string[];
+}): Promise<ApplyManagedBlockResult>;
+//# sourceMappingURL=managed-block.d.ts.map

package/dist/commands/init/managed-block.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"managed-block.d.ts","sourceRoot":"","sources":["../../../src/commands/init/managed-block.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,uBAAuB;IACtC,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,WAAW,CAAC;IAC5C,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAaD,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,GACzD,OAAO,CAAC,uBAAuB,CAAC,CA8ClC"}

package/dist/commands/init/managed-block.js

@@ -0,0 +1,40 @@
+import { readFile, writeFile } from 'node:fs/promises';
+import { fileExists } from '../../fs/io.js';
+function preserveUnmanagedTail(tail, entries) {
+    const managedEntries = new Set(entries);
+    const lines = tail.startsWith('\n')
+        ? tail.slice(1).split('\n')
+        : tail.split('\n');
+    return lines.filter((line) => !managedEntries.has(line)).join('\n');
+}
+export async function applyManagedBlock(filePath, options) {
+    const section = `${options.start}\n${options.entries.join('\n')}\n${options.end}`;
+    if (!(await fileExists(filePath))) {
+        await writeFile(filePath, `${section}\n`, 'utf8');
+        return { action: 'created', entries: options.entries };
+    }
+    const content = await readFile(filePath, 'utf8');
+    const startIndex = content.indexOf(options.start);
+    const endIndex = content.indexOf(options.end);
+    if (startIndex !== -1 && endIndex !== -1 && endIndex >= startIndex) {
+        const existing = content.slice(startIndex, endIndex + options.end.length);
+        if (existing === section) {
+            return { action: 'no-change', entries: options.entries };
+        }
+        await writeFile(filePath, `${content.slice(0, startIndex)}${section}${content.slice(endIndex + options.end.length)}`, 'utf8');
+        return { action: 'updated', entries: options.entries };
+    }
+    if (startIndex !== -1) {
+        const prefix = content.slice(0, startIndex);
+        const preservedTail = preserveUnmanagedTail(content.slice(startIndex + options.start.length), options.entries);
+        const prefixSeparator = prefix.length === 0 || prefix.endsWith('\n') ? '' : '\n';
+        const preservedSuffix = preservedTail.length === 0
+            ? '\n'
+            : `\n${preservedTail.replace(/^\n+/, '')}`;
+        await writeFile(filePath, `${prefix}${prefixSeparator}${section}${preservedSuffix}`, 'utf8');
+        return { action: 'updated', entries: options.entries };
+    }
+    const separator = content.endsWith('\n') ? '\n' : '\n\n';
+    await writeFile(filePath, `${content}${separator}${section}\n`, 'utf8');
+    return { action: 'updated', entries: options.entries };
+}

package/dist/commands/init/tools/workflows/install-workflows.js

@@ -110,7 +110,7 @@ export async function installWorkflows(options) {
     if (!config.projects?.root?.trim()) {
         await writeOatConfig(options.targetRoot, {
             ...config,
-            projects: { root: '.oat/projects/shared' },
+            projects: { ...config.projects, root: '.oat/projects/shared' },
         });
         result.projectsRootConfigInitialized = true;
     }

package/dist/commands/local/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/local/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAOpC,wBAAgB,kBAAkB,IAAI,OAAO,CAmS5C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/local/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAOpC,wBAAgB,kBAAkB,IAAI,OAAO,CAwS5C"}

package/dist/commands/local/index.js

@@ -144,6 +144,7 @@ export function createLocalCommand() {
             }
             const direction = options.from ? 'from' : 'to';
             const result = await syncLocalPaths({
+                repoRoot,
                 sourceRoot: repoRoot,
                 targetRoot: worktreePath,
                 localPaths,
@@ -155,7 +156,10 @@ export function createLocalCommand() {
             }
             else {
                 for (const entry of result.entries) {
-                    context.logger.info(`  ${entry.status.padEnd(8)} ${entry.path}`);
+                    const reason = entry.status === 'skipped' && entry.reason
+                        ? ` (${entry.reason})`
+                        : '';
+                    context.logger.info(`  ${entry.status.padEnd(8)} ${entry.path}${reason}`);
                 }
                 context.logger.info(`\nSync complete: ${result.copied} copied, ${result.skipped} skipped, ${result.missing} missing`);
             }

package/dist/commands/local/sync.d.ts

@@ -1,7 +1,9 @@
+import { type GitRunner } from '../project/sync/git.js';
 export type SyncStatus = 'copied' | 'skipped' | 'missing';
 export interface SyncEntry {
     path: string;
     status: SyncStatus;
+    reason?: 'nested-worktree';
 }
 export interface SyncResult {
     entries: SyncEntry[];
@@ -10,11 +12,13 @@ export interface SyncResult {
     missing: number;
 }
 export interface SyncOptions {
+    repoRoot?: string;
     sourceRoot: string;
     targetRoot: string;
     localPaths: string[];
     direction: 'to' | 'from';
     force: boolean;
+    gitRunner?: GitRunner;
 }
 export declare function syncLocalPaths(options: SyncOptions): Promise<SyncResult>;
 //# sourceMappingURL=sync.d.ts.map

package/dist/commands/local/sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../../src/commands/local/sync.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAC;AAE1D,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,UAAU,CAAC;CACpB;AAED,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,EAAE,IAAI,GAAG,MAAM,CAAC;IACzB,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,UAAU,CAAC,CAoDrB"}
+{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../../src/commands/local/sync.ts"],"names":[],"mappings":"AAGA,OAAO,EAAoB,KAAK,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAM9E,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAC;AAE1D,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,UAAU,CAAC;IACnB,MAAM,CAAC,EAAE,iBAAiB,CAAC;CAC5B;AAED,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,EAAE,IAAI,GAAG,MAAM,CAAC;IACzB,KAAK,EAAE,OAAO,CAAC;IACf,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB;AAuID,wBAAsB,cAAc,CAClC,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,UAAU,CAAC,CAoFrB"}

package/dist/commands/local/sync.js

@@ -1,13 +1,116 @@
-import { rm } from 'node:fs/promises';
-import { join } from 'node:path';
+import { lstat, readdir, realpath, rm } from 'node:fs/promises';
+import { dirname, isAbsolute, join, relative, resolve, sep } from 'node:path';
+import { defaultGitRunner } from '../project/sync/git.js';
+import { CliError } from '../../errors/cli-error.js';
 import { copyDirectory, dirExists, fileExists } from '../../fs/io.js';
 import { expandLocalPaths } from './expand.js';
+async function canonicalizeLocalSyncPath(path) {
+    const absolute = resolve(path);
+    try {
+        return await realpath(absolute);
+    }
+    catch (error) {
+        if (!(error instanceof Error && 'code' in error && error.code === 'ENOENT')) {
+            throw error;
+        }
+        const parent = dirname(absolute);
+        if (parent === absolute)
+            return absolute;
+        return join(await canonicalizeLocalSyncPath(parent), relative(parent, absolute));
+    }
+}
+function pathsOverlap(left, right) {
+    const leftToRight = relative(left, right);
+    const rightToLeft = relative(right, left);
+    const isWithin = (candidate) => candidate === '' ||
+        (candidate !== '..' &&
+            !candidate.startsWith(`..${sep}`) &&
+            !isAbsolute(candidate));
+    return isWithin(leftToRight) || isWithin(rightToLeft);
+}
+function worktreeOwnsRoot(worktreePath, rootPath) {
+    const relativeRoot = relative(worktreePath, rootPath);
+    return (relativeRoot === '' ||
+        (relativeRoot !== '..' &&
+            !relativeRoot.startsWith(`..${sep}`) &&
+            !isAbsolute(relativeRoot)));
+}
+async function registeredNestedWorktrees(repoRoot, sourceRoot, targetRoot, git) {
+    const result = await git.run(['worktree', 'list', '--porcelain'], {
+        cwd: repoRoot,
+        allowFailure: true,
+    });
+    if (result.code !== 0) {
+        throw new CliError(`Unable to inspect registered worktrees before local sync: ${result.stderr || result.stdout || `git worktree list failed with exit ${result.code}`}`, 2);
+    }
+    const records = result.stdout ? result.stdout.split(/\n\n+/) : [];
+    const registered = [];
+    for (const record of records) {
+        const lines = record.split('\n').filter(Boolean);
+        const worktreeLines = lines.filter((line) => line.startsWith('worktree '));
+        const worktreeLine = worktreeLines[0];
+        if (lines.length === 0 ||
+            worktreeLines.length !== 1 ||
+            typeof worktreeLine !== 'string' ||
+            !worktreeLine.startsWith('worktree ') ||
+            lines[0] !== worktreeLine ||
+            worktreeLine.slice('worktree '.length).trim() === '') {
+            throw new CliError('Malformed `git worktree list --porcelain` output; refusing local sync.', 2);
+        }
+        registered.push(await canonicalizeLocalSyncPath(worktreeLine.slice('worktree '.length)));
+    }
+    if (registered.length === 0) {
+        throw new CliError('Git returned no registered worktrees; refusing repository-aware local sync.', 2);
+    }
+    const supportedRoots = await Promise.all([
+        canonicalizeLocalSyncPath(sourceRoot),
+        canonicalizeLocalSyncPath(targetRoot),
+    ]);
+    return [...new Set(registered)].filter((worktreePath) => !supportedRoots.some((rootPath) => worktreeOwnsRoot(worktreePath, rootPath)));
+}
+async function containsNestedGitMarker(root) {
+    let entries;
+    try {
+        entries = await readdir(root, { withFileTypes: true });
+    }
+    catch (error) {
+        if (error instanceof Error &&
+            'code' in error &&
+            (error.code === 'ENOENT' || error.code === 'ENOTDIR')) {
+            return false;
+        }
+        throw error;
+    }
+    for (const entry of entries) {
+        if (entry.name === '.git')
+            return true;
+        const entryPath = join(root, entry.name);
+        if (entry.isSymbolicLink()) {
+            // Local sync does not follow directory symlinks while looking for a
+            // worktree boundary. A symlink target is copied as a link by the I/O
+            // layer and cannot authorize recursive deletion of its destination.
+            continue;
+        }
+        if (entry.isDirectory() && (await containsNestedGitMarker(entryPath))) {
+            return true;
+        }
+        if (!entry.isDirectory() && !entry.isFile()) {
+            // Force filesystem errors to surface instead of silently treating an
+            // unfamiliar entry as safe.
+            await lstat(entryPath);
+        }
+    }
+    return false;
+}
 export async function syncLocalPaths(options) {
     const { sourceRoot, targetRoot, localPaths, direction, force } = options;
     // Determine actual from/to based on direction
     const fromRoot = direction === 'to' ? sourceRoot : targetRoot;
     const toRoot = direction === 'to' ? targetRoot : sourceRoot;
     const entries = [];
+    const registered = options.repoRoot
+        ? await registeredNestedWorktrees(options.repoRoot, sourceRoot, targetRoot, options.gitRunner ?? defaultGitRunner)
+        : [];
     const { resolved, missingGlobs } = await expandLocalPaths(fromRoot, localPaths);
     for (const pattern of missingGlobs) {
         entries.push({ path: pattern, status: 'missing' });
@@ -20,6 +123,24 @@ export async function syncLocalPaths(options) {
             entries.push({ path: localPath, status: 'missing' });
             continue;
         }
+        // This check must cover the whole selected entry on both sides and must
+        // happen before force-removal. A localPath may be an ancestor of a linked
+        // worktree, so checking only `<entry>/.git` is insufficient.
+        const [canonicalSourcePath, canonicalDestPath] = await Promise.all([
+            canonicalizeLocalSyncPath(sourcePath),
+            canonicalizeLocalSyncPath(destPath),
+        ]);
+        if (registered.some((worktreePath) => pathsOverlap(canonicalSourcePath, worktreePath) ||
+            pathsOverlap(canonicalDestPath, worktreePath)) ||
+            (await containsNestedGitMarker(sourcePath)) ||
+            (await containsNestedGitMarker(destPath))) {
+            entries.push({
+                path: localPath,
+                status: 'skipped',
+                reason: 'nested-worktree',
+            });
+            continue;
+        }
         const destExists = (await dirExists(destPath)) || (await fileExists(destPath));
         if (destExists && !force) {
             entries.push({ path: localPath, status: 'skipped' });

package/dist/commands/pjm/adoption.d.ts

@@ -1,3 +1,4 @@
+import { type OatConfig } from '../../config/oat-config.js';
 export type PjmAdoptionState = 'declared' | 'inferred-legacy' | 'partial-initialization' | 'none';
 export interface PjmAdoption {
     state: PjmAdoptionState;
@@ -7,6 +8,7 @@ export interface PjmAdoption {
 export interface ResolvePjmAdoptionOptions {
     projectRoot: string;
     repoRoot: string;
+    config?: OatConfig;
 }
 export declare function resolvePjmAdoption(options: ResolvePjmAdoptionOptions): Promise<PjmAdoption>;
 //# sourceMappingURL=adoption.d.ts.map

package/dist/commands/pjm/adoption.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adoption.d.ts","sourceRoot":"","sources":["../../../src/commands/pjm/adoption.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,gBAAgB,GACxB,UAAU,GACV,iBAAiB,GACjB,wBAAwB,GACxB,MAAM,CAAC;AAEX,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,gBAAgB,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,cAAc,GAAG,IAAI,CAAC;CACjC;AAED,MAAM,WAAW,yBAAyB;IACxC,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAmBD,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,WAAW,CAAC,CA8BtB"}
+{"version":3,"file":"adoption.d.ts","sourceRoot":"","sources":["../../../src/commands/pjm/adoption.ts"],"names":[],"mappings":"AAGA,OAAO,EAAiB,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAInE,MAAM,MAAM,gBAAgB,GACxB,UAAU,GACV,iBAAiB,GACjB,wBAAwB,GACxB,MAAM,CAAC;AAEX,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,gBAAgB,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,cAAc,GAAG,IAAI,CAAC;CACjC;AAED,MAAM,WAAW,yBAAyB;IACxC,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,SAAS,CAAC;CACpB;AAmBD,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,WAAW,CAAC,CA8BtB"}

package/dist/commands/pjm/adoption.js

@@ -18,7 +18,7 @@ async function pathExists(path) {
     }
 }
 export async function resolvePjmAdoption(options) {
-    const config = await readOatConfig(options.projectRoot);
+    const config = options.config ?? (await readOatConfig(options.projectRoot));
     if (config.pjm?.initialized === true) {
         return {
             state: 'declared',

package/dist/commands/project/archive/archive-utils.d.ts

@@ -1,4 +1,8 @@
 import { rename } from 'node:fs/promises';
+import { type GitRunner } from '../../project/sync/git.js';
+import { readSyncedRecord, writeSyncedRecord } from '../../project/sync/record.js';
+import { commitRecordChange, preflightSyncedCheckout, removeSyncedCheckout } from '../../project/sync/ref-sync.js';
+import { type ProjectScope } from '../../shared/project-scope.js';
 import { copyDirectory, copySingleFile, dirExists, ensureDir, fileExists } from '../../../fs/io.js';
 export type ExecFileResult = {
     stdout: string;
@@ -56,6 +60,7 @@ export interface ArchiveProjectOnCompletionOptions {
      * semantics as `awsProfile`.
      */
     awsRegion?: string | null;
+    commit?: boolean;
 }
 export interface ResolvePrimaryRepoRootDependencies {
     gitExecFile?: ExecFileLike;
@@ -66,6 +71,8 @@ export interface ResolveArchiveProjectTargetOptions {
     repoRoot: string;
     projectsRoot: string;
     projectName: string;
+    archiveSnapshot?: string;
+    archiveScope?: ProjectScope;
 }
 export interface ResolveArchiveProjectTargetDependencies extends ResolvePrimaryRepoRootDependencies {
     timestamp?: () => string;
@@ -92,6 +99,12 @@ interface ArchiveProjectOnCompletionDependencies extends EnsureS3ArchiveAccessDe
     fileExists?: typeof fileExists;
     renamePath?: typeof rename;
     timestamp?: () => string;
+    gitRunner?: GitRunner;
+    readSyncedRecord?: typeof readSyncedRecord;
+    writeSyncedRecord?: typeof writeSyncedRecord;
+    preflightSyncedCheckout?: typeof preflightSyncedCheckout;
+    removeSyncedCheckout?: typeof removeSyncedCheckout;
+    commitRecordChange?: typeof commitRecordChange;
 }
 export interface ArchiveProjectRecapExportV1 {
     sourceRunRoot: string;
@@ -104,9 +117,13 @@ export interface ArchiveProjectRecapExportV1 {
 export interface ArchiveProjectOnCompletionResult {
     archivePath: string;
     s3Path: string | null;
+    /** Absolute filesystem path; normalize only when rendering repository links. */
     summaryExportFile: string | null;
     projectRecapExport: ArchiveProjectRecapExportV1 | null;
     warnings: string[];
+    lifecycleCommit: string | null;
+    recapExportPaths: string[];
+    snapshotId: string;
 }
 export declare const ARCHIVE_SNAPSHOT_METADATA_FILENAME = ".oat-archive-source.json";
 /**
@@ -117,7 +134,14 @@ export declare const S3_ARCHIVE_SYNC_EXCLUDES: string[];
 export interface ArchiveSnapshotMetadata {
     projectName: string;
     snapshotName: string;
+    scope: ProjectScope;
+    sourceRefSha?: string;
 }
+export interface ExactArchiveProjectRoot {
+    canonicalProjectPath: string;
+    projectScope: ProjectScope;
+}
+export declare function assertExactArchiveProjectRoot(options: Pick<ArchiveProjectOnCompletionOptions, 'repoRoot' | 'projectsRoot' | 'projectPath' | 'projectName'>): ExactArchiveProjectRoot;
 /**
  * Build the env passed to every `aws` spawn in this module.
  *