@open-agent-toolkit/cli 0.2.41 → 0.2.46

package/dist/commands/project/sync/resolve-target.d.ts

@@ -0,0 +1,27 @@
+import { realpath } from 'node:fs/promises';
+import { type GitRunner } from '../../project/sync/git.js';
+import { resolveProjectsRoot } from '../../shared/oat-paths.js';
+import { type OatLocalConfig } from '../../../config/oat-config.js';
+import { classifyAdoptionRecord, type AdoptionRecordState, type SyncTarget } from './ref-sync.js';
+export interface ResolveSyncedTargetContext {
+    repoRoot: string;
+    env?: NodeJS.ProcessEnv;
+}
+export interface ResolveSyncedTargetOptions {
+    allowMissingCheckout?: boolean;
+    allowStagedPruneDeletion?: boolean;
+}
+export interface ResolveSyncedTargetDependencies {
+    resolveProjectsRoot: typeof resolveProjectsRoot;
+    classifyAdoptionRecord: typeof classifyAdoptionRecord;
+    readOatLocalConfig: (repoRoot: string) => Promise<OatLocalConfig>;
+    pathExists: (path: string) => Promise<boolean>;
+    realpath: typeof realpath;
+    gitRunner: GitRunner;
+}
+export interface ResolvedSyncTarget extends SyncTarget {
+    adopt: boolean;
+    adoptionRecord: AdoptionRecordState;
+}
+export declare function resolveSyncedTarget(context: ResolveSyncedTargetContext, pathOrSlug?: string, overrides?: Partial<ResolveSyncedTargetDependencies>, options?: ResolveSyncedTargetOptions): Promise<ResolvedSyncTarget>;
+//# sourceMappingURL=resolve-target.d.ts.map

package/dist/commands/project/sync/resolve-target.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve-target.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/sync/resolve-target.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAQ,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAoB,KAAK,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAC9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAOjE,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAG7E,OAAO,EAIL,sBAAsB,EACtB,KAAK,mBAAmB,EACxB,KAAK,UAAU,EAChB,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,0BAA0B;IACzC,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACzB;AAED,MAAM,WAAW,0BAA0B;IACzC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACpC;AAED,MAAM,WAAW,+BAA+B;IAC9C,mBAAmB,EAAE,OAAO,mBAAmB,CAAC;IAChD,sBAAsB,EAAE,OAAO,sBAAsB,CAAC;IACtD,kBAAkB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;IAClE,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/C,QAAQ,EAAE,OAAO,QAAQ,CAAC;IAC1B,SAAS,EAAE,SAAS,CAAC;CACtB;AAED,MAAM,WAAW,kBAAmB,SAAQ,UAAU;IACpD,KAAK,EAAE,OAAO,CAAC;IACf,cAAc,EAAE,mBAAmB,CAAC;CACrC;AAsFD,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,0BAA0B,EACnC,UAAU,CAAC,EAAE,MAAM,EACnB,SAAS,GAAE,OAAO,CAAC,+BAA+B,CAAM,EACxD,OAAO,GAAE,0BAA+B,GACvC,OAAO,CAAC,kBAAkB,CAAC,CA+H7B"}

package/dist/commands/project/sync/resolve-target.js

@@ -0,0 +1,159 @@
+import { realpath, stat } from 'node:fs/promises';
+import { isAbsolute, relative, resolve, sep } from 'node:path';
+import { defaultGitRunner } from '../../project/sync/git.js';
+import { resolveProjectsRoot } from '../../shared/oat-paths.js';
+import { assertValidProjectSlug, resolveProjectScope, resolveScopeRoot, syncedRecordPath, } from '../../shared/project-scope.js';
+import { readOatLocalConfig } from '../../../config/oat-config.js';
+import { CliError } from '../../../errors/cli-error.js';
+import { assertCanonicalSyncTargetIdentity, buildSyncTarget, classifyRemoteRefLookup, classifyAdoptionRecord, } from './ref-sync.js';
+async function pathExists(path) {
+    try {
+        await stat(path);
+        return true;
+    }
+    catch (error) {
+        if (error instanceof Error && 'code' in error && error.code === 'ENOENT') {
+            return false;
+        }
+        throw error;
+    }
+}
+async function isStagedPruneDeletion(target, git) {
+    const recordPath = syncedRecordPath(target.syncedRoot, target.slug);
+    const relativeRecord = relative(target.repoRoot, recordPath)
+        .split('\\')
+        .join('/');
+    const [localRef, remoteRef, stagedDeletion, priorRecord] = await Promise.all([
+        git.run(['show-ref', '--verify', '--quiet', target.ref], {
+            cwd: target.repoRoot,
+            allowFailure: true,
+        }),
+        git.run(['ls-remote', '--exit-code', target.remote, target.ref], {
+            cwd: target.repoRoot,
+            allowFailure: true,
+        }),
+        git.run([
+            'diff',
+            '--cached',
+            '--diff-filter=D',
+            '--name-only',
+            '--',
+            relativeRecord,
+        ], { cwd: target.repoRoot, allowFailure: true }),
+        git.run(['show', `HEAD:${relativeRecord}`], {
+            cwd: target.repoRoot,
+            allowFailure: true,
+        }),
+    ]);
+    const remoteState = classifyRemoteRefLookup(remoteRef, target.remote, target.ref);
+    if (localRef.code === 0 ||
+        remoteState === 'present' ||
+        stagedDeletion.code !== 0 ||
+        stagedDeletion.stdout !== relativeRecord ||
+        priorRecord.code !== 0) {
+        return false;
+    }
+    try {
+        const record = JSON.parse(priorRecord.stdout);
+        return (record.slug === target.slug &&
+            record.ref === target.ref &&
+            record.scope === 'synced');
+    }
+    catch {
+        return false;
+    }
+}
+const DEFAULT_DEPENDENCIES = {
+    resolveProjectsRoot,
+    classifyAdoptionRecord,
+    readOatLocalConfig,
+    pathExists,
+    realpath,
+    gitRunner: defaultGitRunner,
+};
+export async function resolveSyncedTarget(context, pathOrSlug, overrides = {}, options = {}) {
+    const dependencies = { ...DEFAULT_DEPENDENCIES, ...overrides };
+    const projectsRoot = await dependencies.resolveProjectsRoot(context.repoRoot, context.env ?? process.env);
+    const syncedRoot = resolveScopeRoot(context.repoRoot, projectsRoot, 'synced');
+    let requested = pathOrSlug;
+    if (!requested) {
+        requested =
+            (await dependencies.readOatLocalConfig(context.repoRoot)).activeProject ??
+                undefined;
+        if (!requested) {
+            throw new CliError('No active project is configured.', 1);
+        }
+    }
+    const bareSlug = !isAbsolute(requested) && !/[\\/]/.test(requested);
+    if (bareSlug) {
+        assertValidProjectSlug(requested, 1);
+    }
+    const projectPath = bareSlug
+        ? resolve(syncedRoot, requested)
+        : isAbsolute(requested)
+            ? resolve(requested)
+            : resolve(context.repoRoot, requested);
+    let slug = requested;
+    if (!bareSlug) {
+        const scope = resolveProjectScope(projectPath, resolve(context.repoRoot, projectsRoot), context.repoRoot);
+        if (scope && scope !== 'synced') {
+            throw new CliError(`Project ${requested} is in ${scope} scope; this command requires synced scope.`, 1);
+        }
+        if (!scope) {
+            throw new CliError(`Project path is outside the synced project root: ${requested}`, 1);
+        }
+        const directChild = relative(syncedRoot, projectPath);
+        if (directChild === '' ||
+            directChild === '..' ||
+            directChild.startsWith(`..${sep}`) ||
+            isAbsolute(directChild) ||
+            directChild.includes(sep)) {
+            throw new CliError(`Project path must identify exactly one direct child of the synced project root: ${requested}`, 1);
+        }
+        assertValidProjectSlug(directChild, 1);
+        slug = directChild;
+    }
+    const target = buildSyncTarget(context.repoRoot, projectsRoot, slug);
+    const checkoutExists = await assertCanonicalSyncTargetIdentity(target, {
+        pathExists: dependencies.pathExists,
+        realpath: dependencies.realpath,
+        exitCode: 1,
+    });
+    if (!bareSlug &&
+        !checkoutExists &&
+        options.allowStagedPruneDeletion &&
+        (await isStagedPruneDeletion(target, dependencies.gitRunner))) {
+        return {
+            ...target,
+            adopt: false,
+            adoptionRecord: 'durable',
+        };
+    }
+    const adoptionRecord = await dependencies.classifyAdoptionRecord(target, dependencies.gitRunner);
+    let adopt = adoptionRecord === 'pending';
+    if (!checkoutExists && adoptionRecord === 'create') {
+        if (options.allowMissingCheckout) {
+            const remote = await dependencies.gitRunner.run(['ls-remote', '--exit-code', target.remote, target.ref], { cwd: context.repoRoot, allowFailure: true });
+            if (remote.code === 0) {
+                adopt = true;
+            }
+            else if (!(remote.code === 2 &&
+                remote.stdout.trim() === '' &&
+                remote.stderr.trim() === '')) {
+                throw new CliError(`git ls-remote ${target.remote} ${target.ref} failed (exit ${remote.code}): ${remote.stderr || remote.stdout || 'unknown Git error'}`, 2);
+            }
+        }
+        if (!adopt) {
+            throw new CliError(`No synced project named ${slug} locally or on origin.`, 1);
+        }
+    }
+    else if (!checkoutExists && !options.allowMissingCheckout) {
+        throw new CliError(`No synced project named ${slug}.`, 1);
+    }
+    else if (checkoutExists &&
+        adoptionRecord === 'create' &&
+        options.allowMissingCheckout) {
+        adopt = true;
+    }
+    return { ...target, adopt, adoptionRecord };
+}

package/dist/commands/shared/oat-paths.d.ts

@@ -1,2 +1,5 @@
-export declare function resolveProjectsRoot(repoRoot: string, env: NodeJS.ProcessEnv): Promise<string>;
+import { type OatConfig } from '../../config/oat-config.js';
+type OatConfigReader = (repoRoot: string) => Promise<OatConfig>;
+export declare function resolveProjectsRoot(repoRoot: string, env: NodeJS.ProcessEnv, readConfig?: OatConfigReader): Promise<string>;
+export {};
 //# sourceMappingURL=oat-paths.d.ts.map

package/dist/commands/shared/oat-paths.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oat-paths.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/oat-paths.ts"],"names":[],"mappings":"AAEA,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,CAAC,UAAU,GACrB,OAAO,CAAC,MAAM,CAAC,CAajB"}
+{"version":3,"file":"oat-paths.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/oat-paths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEnE,KAAK,eAAe,GAAG,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;AAEhE,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,UAAU,GAAE,eAA+B,GAC1C,OAAO,CAAC,MAAM,CAAC,CAajB"}

package/dist/commands/shared/oat-paths.js

@@ -1,10 +1,10 @@
 import { readOatConfig } from '../../config/oat-config.js';
-export async function resolveProjectsRoot(repoRoot, env) {
+export async function resolveProjectsRoot(repoRoot, env, readConfig = readOatConfig) {
     const envRoot = env.OAT_PROJECTS_ROOT?.trim();
     if (envRoot) {
         return envRoot.replace(/\/+$/, '');
     }
-    const config = await readOatConfig(repoRoot);
+    const config = await readConfig(repoRoot);
     const configRoot = config.projects?.root?.trim();
     if (configRoot) {
         return configRoot.replace(/\/+$/, '');

package/dist/commands/shared/project-scope.d.ts

@@ -0,0 +1,23 @@
+export type ProjectScope = 'shared' | 'local' | 'synced';
+export declare const PROJECT_SCOPES: readonly ["shared", "local", "synced"];
+export declare const SYNCED_REF_NAMESPACE = "refs/oat/projects";
+export declare const SYNCED_REMOTE = "origin";
+export declare function canonicalizePath(path: string): string;
+interface EffectiveConfigResult {
+    resolved: Record<string, {
+        value: unknown;
+    }>;
+}
+interface ProjectScopeDependencies {
+    resolveEffectiveConfig: (repoRoot: string, userConfigDir: string, env: NodeJS.ProcessEnv) => Promise<EffectiveConfigResult>;
+}
+export declare function resolveProjectsParent(repoRoot: string, projectsRoot: string): string;
+export declare function resolveScopeRoot(repoRoot: string, projectsRoot: string, scope: ProjectScope): string;
+export declare function resolveProjectScope(projectPath: string, projectsRoot: string, repoRoot: string): ProjectScope | null;
+export declare function assertValidProjectSlug(slug: string, exitCode?: 1 | 2): void;
+export declare function syncedRefName(slug: string): string;
+export declare function syncedRecordPath(scopeRoot: string, slug: string): string;
+export declare function isSyncedCheckout(projectPath: string): Promise<boolean>;
+export declare function resolveDefaultScope(repoRoot: string, env: NodeJS.ProcessEnv, dependencies?: Partial<ProjectScopeDependencies>): Promise<ProjectScope>;
+export {};
+//# sourceMappingURL=project-scope.d.ts.map

package/dist/commands/shared/project-scope.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"project-scope.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/project-scope.ts"],"names":[],"mappings":"AAgBA,MAAM,MAAM,YAAY,GAAG,QAAQ,GAAG,OAAO,GAAG,QAAQ,CAAC;AAEzD,eAAO,MAAM,cAAc,wCAIiB,CAAC;AAC7C,eAAO,MAAM,oBAAoB,sBAAsB,CAAC;AACxD,eAAO,MAAM,aAAa,WAAW,CAAC;AAItC,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAoBrD;AAED,UAAU,qBAAqB;IAC7B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;CAC9C;AAED,UAAU,wBAAwB;IAChC,sBAAsB,EAAE,CACtB,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,GAAG,EAAE,MAAM,CAAC,UAAU,KACnB,OAAO,CAAC,qBAAqB,CAAC,CAAC;CACrC;AAMD,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,GACnB,MAAM,CAKR;AAED,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,YAAY,GAClB,MAAM,CAOR;AAED,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,GACf,YAAY,GAAG,IAAI,CAmBrB;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,MAAM,EACZ,QAAQ,GAAE,CAAC,GAAG,CAAK,GAClB,IAAI,CAON;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAGlD;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAGxE;AAED,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAa5E;AAeD,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,YAAY,GAAE,OAAO,CAAC,wBAAwB,CAAM,GACnD,OAAO,CAAC,YAAY,CAAC,CAqBvB"}

package/dist/commands/shared/project-scope.js

@@ -0,0 +1,106 @@
+import { realpathSync } from 'node:fs';
+import { stat } from 'node:fs/promises';
+import { homedir } from 'node:os';
+import { basename, dirname, isAbsolute, join, relative, resolve, sep, } from 'node:path';
+import { resolveEffectiveConfig as defaultResolveEffectiveConfig } from '../../config/resolve.js';
+import { CliError } from '../../errors/cli-error.js';
+export const PROJECT_SCOPES = [
+    'shared',
+    'local',
+    'synced',
+];
+export const SYNCED_REF_NAMESPACE = 'refs/oat/projects';
+export const SYNCED_REMOTE = 'origin';
+const PROJECT_SLUG_PATTERN = /^[a-zA-Z0-9_-]+$/;
+export function canonicalizePath(path) {
+    const absolute = resolve(path);
+    try {
+        return realpathSync(absolute);
+    }
+    catch (error) {
+        if (!(error instanceof Error && 'code' in error && error.code === 'ENOENT')) {
+            const detail = error instanceof Error ? error.message : String(error);
+            throw new CliError(`Unable to resolve canonical path \`${absolute}\`: ${detail}`, 2);
+        }
+        const parent = dirname(absolute);
+        if (parent === absolute) {
+            return absolute;
+        }
+        return join(canonicalizePath(parent), basename(absolute));
+    }
+}
+const DEFAULT_DEPENDENCIES = {
+    resolveEffectiveConfig: defaultResolveEffectiveConfig,
+};
+export function resolveProjectsParent(repoRoot, projectsRoot) {
+    const resolvedRoot = isAbsolute(projectsRoot)
+        ? canonicalizePath(projectsRoot)
+        : resolve(repoRoot, projectsRoot);
+    return dirname(resolvedRoot);
+}
+export function resolveScopeRoot(repoRoot, projectsRoot, scope) {
+    const resolvedSharedRoot = isAbsolute(projectsRoot)
+        ? canonicalizePath(projectsRoot)
+        : resolve(repoRoot, projectsRoot);
+    return scope === 'shared'
+        ? resolvedSharedRoot
+        : join(dirname(resolvedSharedRoot), scope);
+}
+export function resolveProjectScope(projectPath, projectsRoot, repoRoot) {
+    const canonicalProjectPath = canonicalizePath(isAbsolute(projectPath) ? projectPath : resolve(repoRoot, projectPath));
+    for (const scope of PROJECT_SCOPES) {
+        const scopeRoot = canonicalizePath(resolveScopeRoot(repoRoot, projectsRoot, scope));
+        const projectRelative = relative(scopeRoot, canonicalProjectPath);
+        if (projectRelative !== '' &&
+            projectRelative !== '..' &&
+            !projectRelative.startsWith(`..${sep}`) &&
+            !isAbsolute(projectRelative)) {
+            return scope;
+        }
+    }
+    return null;
+}
+export function assertValidProjectSlug(slug, exitCode = 2) {
+    if (slug.startsWith('-') || !PROJECT_SLUG_PATTERN.test(slug)) {
+        throw new CliError(`Invalid project slug "${slug}". Use letters, numbers, dash, and underscore, and do not start with a dash.`, exitCode);
+    }
+}
+export function syncedRefName(slug) {
+    assertValidProjectSlug(slug);
+    return `${SYNCED_REF_NAMESPACE}/${slug}`;
+}
+export function syncedRecordPath(scopeRoot, slug) {
+    assertValidProjectSlug(slug);
+    return join(scopeRoot, `${slug}.json`);
+}
+export async function isSyncedCheckout(projectPath) {
+    try {
+        return (await stat(join(projectPath, '.git'))).isFile();
+    }
+    catch (error) {
+        if (error instanceof Error &&
+            'code' in error &&
+            (error.code === 'ENOENT' || error.code === 'ENOTDIR')) {
+            return false;
+        }
+        throw error;
+    }
+}
+function parseScope(value, source) {
+    if (value === undefined || value === null || value === '') {
+        return null;
+    }
+    if (PROJECT_SCOPES.includes(value)) {
+        return value;
+    }
+    throw new CliError(`Invalid project scope from ${source}: "${String(value)}". Expected one of: ${PROJECT_SCOPES.join(', ')}.`, 2);
+}
+export async function resolveDefaultScope(repoRoot, env, dependencies = {}) {
+    const envScope = parseScope(env.OAT_PROJECTS_DEFAULT_SCOPE?.trim(), 'OAT_PROJECTS_DEFAULT_SCOPE');
+    if (envScope) {
+        return envScope;
+    }
+    const deps = { ...DEFAULT_DEPENDENCIES, ...dependencies };
+    const effective = await deps.resolveEffectiveConfig(repoRoot, join(homedir(), '.oat'), env);
+    return (parseScope(effective.resolved['projects.defaultScope']?.value, 'projects.defaultScope') ?? 'synced');
+}

package/dist/commands/tools/migrate/index.js

@@ -51,7 +51,7 @@ async function writeGenerated(scopeRoot, operation) {
                 return;
             await writeOatConfig(scopeRoot, {
                 ...config,
-                projects: { root: '.oat/projects/shared' },
+                projects: { ...config.projects, root: '.oat/projects/shared' },
             });
             return;
         }

package/dist/commands/tools/shared/pack-inventory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pack-inventory.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/shared/pack-inventory.ts"],"names":[],"mappings":"AAWA,OAAO,EACL,KAAK,aAAa,EAEnB,MAAM,eAAe,CAAC;AAIvB,OAAO,EAEL,KAAK,gBAAgB,EAEtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EACV,mBAAmB,EACnB,eAAe,EACf,gBAAgB,EAChB,QAAQ,EACT,MAAM,SAAS,CAAC;AAEjB,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,mBAAmB,CAAC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,eAAe,CAAC;IACxB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EACA,uBAAuB,GACvB,iBAAiB,GACjB,0BAA0B,GAC1B,2BAA2B,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;CACjC;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,aAAa,CAAC;IACrB,MAAM,EAAE,gBAAgB,CAAC;IACzB,YAAY,EAAE,gBAAgB,CAAC;IAC/B,MAAM,EAAE,kBAAkB,EAAE,CAAC;IAC7B,WAAW,EAAE,cAAc,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,aAAa,CAAC;IACvD,MAAM,EAAE,mBAAmB,EAAE,CAAC;IAC9B,WAAW,EAAE,cAAc,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,aAAa,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,QAAQ,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AA0KD,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,wBAAwB,GAC9B,OAAO,CAAC,mBAAmB,CAAC,CAmC9B;AAED,wBAAgB,8BAA8B,CAC5C,SAAS,EAAE,mBAAmB,GAC7B,OAAO,CAUT;AAED,wBAAsB,aAAa,CACjC,KAAK,EAAE,kBAAkB,GACxB,OAAO,CAAC,aAAa,CAAC,CA0DxB"}
+{"version":3,"file":"pack-inventory.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/shared/pack-inventory.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,KAAK,aAAa,EAEnB,MAAM,eAAe,CAAC;AAIvB,OAAO,EAEL,KAAK,gBAAgB,EAEtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EACV,mBAAmB,EACnB,eAAe,EACf,gBAAgB,EAChB,QAAQ,EACT,MAAM,SAAS,CAAC;AAEjB,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,mBAAmB,CAAC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,eAAe,CAAC;IACxB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EACA,uBAAuB,GACvB,iBAAiB,GACjB,0BAA0B,GAC1B,2BAA2B,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;CACjC;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,aAAa,CAAC;IACrB,MAAM,EAAE,gBAAgB,CAAC;IACzB,YAAY,EAAE,gBAAgB,CAAC;IAC/B,MAAM,EAAE,kBAAkB,EAAE,CAAC;IAC7B,WAAW,EAAE,cAAc,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,aAAa,CAAC;IACvD,MAAM,EAAE,mBAAmB,EAAE,CAAC;IAC9B,WAAW,EAAE,cAAc,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,aAAa,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,QAAQ,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AA8QD,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,wBAAwB,GAC9B,OAAO,CAAC,mBAAmB,CAAC,CAmC9B;AAED,wBAAgB,8BAA8B,CAC5C,SAAS,EAAE,mBAAmB,GAC7B,OAAO,CAUT;AAED,wBAAsB,aAAa,CACjC,KAAK,EAAE,kBAAkB,GACxB,OAAO,CAAC,aAAa,CAAC,CA0DxB"}

package/dist/commands/tools/shared/pack-inventory.js

@@ -1,8 +1,9 @@
-import { lstat } from 'node:fs/promises';
+import { lstat, readdir, readlink } from 'node:fs/promises';
 import { join } from 'node:path';
 import { compareVersions } from '../../init/tools/shared/version.js';
 import { getAgentVersion, getSkillVersion } from '../../shared/frontmatter.js';
-import { resolveManagedScopeRoots, validateManagedPath, } from '../../../fs/paths.js';
+import { readOatConfig } from '../../../config/oat-config.js';
+import { resolveManagedScopeRoots, validateManagedPath, validateRealPathWithinScope, } from '../../../fs/paths.js';
 import { USER_SCOPE_MANAGED_AGENT_FILES, } from '../../../shared/types.js';
 import { digestDirectory, digestFile } from './content-digest.js';
 import { getPackDefinition } from './pack-manifest.js';
@@ -28,14 +29,62 @@ async function inventoryVersionedAsset(definition, installedPath, bundledPath) {
         readVersion(installedPath),
         readVersion(bundledPath),
     ]);
+    const versionStatus = compareVersions(installedVersion, bundledVersion);
+    const contentMatches = versionStatus !== 'current'
+        ? null
+        : definition.kind === 'skill'
+            ? await canonicalDirectoryMatches(installedPath, bundledPath)
+            : await canonicalFileMatches(installedPath, bundledPath);
     return {
         definition,
         path: installedPath,
-        status: compareVersions(installedVersion, bundledVersion),
+        status: versionStatus === 'current' && !contentMatches
+            ? 'outdated'
+            : versionStatus,
         installedVersion,
         bundledVersion,
     };
 }
+async function canonicalFileMatches(installedPath, bundledPath) {
+    const [installedDigest, bundledDigest] = await Promise.all([
+        digestFile(installedPath, 0o644),
+        digestFile(bundledPath, 0o644),
+    ]);
+    return installedDigest === bundledDigest;
+}
+async function canonicalDirectoryMatches(installedRoot, bundledRoot) {
+    const entries = await readdir(bundledRoot, { withFileTypes: true });
+    for (const entry of entries) {
+        const installedPath = join(installedRoot, entry.name);
+        const bundledPath = join(bundledRoot, entry.name);
+        if (!(await pathExists(installedPath)))
+            return false;
+        const installedMetadata = await lstat(installedPath);
+        if (entry.isDirectory()) {
+            if (!installedMetadata.isDirectory() ||
+                !(await canonicalDirectoryMatches(installedPath, bundledPath))) {
+                return false;
+            }
+            continue;
+        }
+        if (entry.isFile()) {
+            if (!installedMetadata.isFile() ||
+                !(await canonicalFileMatches(installedPath, bundledPath))) {
+                return false;
+            }
+            continue;
+        }
+        if (entry.isSymbolicLink()) {
+            if (!installedMetadata.isSymbolicLink() ||
+                (await readlink(installedPath)) !== (await readlink(bundledPath))) {
+                return false;
+            }
+            continue;
+        }
+        throw new Error(`Unsupported filesystem entry in pack asset: ${bundledPath}`);
+    }
+    return true;
+}
 async function inventoryStaticAsset(definition, installedPath, bundledPath) {
     const [installedDigest, bundledDigest] = definition.kind === 'directory'
         ? await Promise.all([
@@ -71,18 +120,40 @@ async function inventoryAsset(definition, scope, scopeRoot, assetsRoot, managedR
         };
     }
     if (definition.ownership[scope] === 'seed-if-missing') {
+        if (definition.generation) {
+            if (definition.generation === 'projects-config-default') {
+                const config = await readOatConfig(scopeRoot);
+                return {
+                    definition,
+                    path: installedPath,
+                    status: config.projects?.root?.trim() ? 'present' : 'outdated',
+                    installedVersion: null,
+                    bundledVersion: null,
+                };
+            }
+            return {
+                definition,
+                path: installedPath,
+                status: 'present',
+                installedVersion: null,
+                bundledVersion: null,
+            };
+        }
+        if (!definition.source) {
+            throw new Error(`Seeded pack asset ${definition.id} has no materialized source`);
+        }
+        const { realPath: bundledPath } = await validateRealPathWithinScope(join(assetsRoot, definition.source), assetsRoot);
+        const inventory = await inventoryStaticAsset(definition, realPath, bundledPath);
         return {
-            definition,
+            ...inventory,
             path: installedPath,
-            status: 'present',
-            installedVersion: null,
-            bundledVersion: null,
+            status: inventory.status === 'current' ? 'current' : 'present',
         };
     }
     if (!definition.source) {
         throw new Error(`Managed pack asset ${definition.id} has no materialized source`);
     }
-    const bundledPath = join(assetsRoot, definition.source);
+    const { realPath: bundledPath } = await validateRealPathWithinScope(join(assetsRoot, definition.source), assetsRoot);
     if (definition.kind === 'skill' || definition.kind === 'agent') {
         const inventory = await inventoryVersionedAsset(definition, realPath, bundledPath);
         return { ...inventory, path: installedPath };

package/dist/commands/tools/shared/pack-lifecycle.js

@@ -17,7 +17,7 @@ async function writeGenerated(scopeRoot, operation) {
                 return;
             await writeOatConfig(scopeRoot, {
                 ...config,
-                projects: { root: '.oat/projects/shared' },
+                projects: { ...config.projects, root: '.oat/projects/shared' },
             });
             return;
         }

package/dist/commands/tools/shared/pack-reconcile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pack-reconcile.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/shared/pack-reconcile.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEnD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAE5D,OAAO,KAAK,EAEV,mBAAmB,EACnB,gBAAgB,EAChB,QAAQ,EACT,MAAM,SAAS,CAAC;AAEjB,MAAM,MAAM,mBAAmB,GAC3B,SAAS,GACT,QAAQ,GACR,QAAQ,GACR,qBAAqB,CAAC;AAE1B,MAAM,MAAM,sBAAsB,GAC9B;IACE,IAAI,EAAE,UAAU,GAAG,WAAW,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,OAAO,CAAC;CAChB,GACD;IACE,IAAI,EAAE,iBAAiB,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,mBAAmB,CAAC;IAChC,WAAW,EAAE,MAAM,CAAC;CACrB,GACD;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC9D;IAAE,IAAI,EAAE,YAAY,GAAG,aAAa,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACrE;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,aAAa,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEN,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,aAAa,CAAC;IACrB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,UAAU,EAAE,SAAS,sBAAsB,EAAE,CAAC;IAC9C,oBAAoB,EAAE,gBAAgB,CAAC;IACvC,qBAAqB,EAAE,SAAS,MAAM,EAAE,CAAC;IACzC,cAAc,EAAE,SAAS,wBAAwB,EAAE,CAAC;CACrD;AAED,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,SAAS,QAAQ,EAAE,CAAC;IAChC,MAAM,EAAE,uBAAuB,CAAC;CACjC;AAED,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,aAAa,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,SAAS,EAAE,mBAAmB,CAAC;IAC/B,cAAc,CAAC,EAAE,SAAS,wBAAwB,EAAE,CAAC;CACtD;AAED,MAAM,WAAW,iCAAiC;IAChD,KAAK,EAAE,SAAS,QAAQ,EAAE,CAAC;IAC3B,KAAK,EAAE,aAAa,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,oBAAoB,EAAE,CACpB,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,aAAa,EACpB,SAAS,EAAE,MAAM,KACd,OAAO,CAAC,OAAO,CAAC,CAAC;CACvB;AAED,wBAAsB,4BAA4B,CAChD,KAAK,EAAE,iCAAiC,GACvC,OAAO,CAAC,wBAAwB,EAAE,CAAC,CAmDrC;AA6ED,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,sBAAsB,GAC5B,iBAAiB,CA4EnB;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,iBAAiB,GAAG,MAAM,CAE1E"}
+{"version":3,"file":"pack-reconcile.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/shared/pack-reconcile.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEnD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAE5D,OAAO,KAAK,EAEV,mBAAmB,EACnB,gBAAgB,EAChB,QAAQ,EACT,MAAM,SAAS,CAAC;AAEjB,MAAM,MAAM,mBAAmB,GAC3B,SAAS,GACT,QAAQ,GACR,QAAQ,GACR,qBAAqB,CAAC;AAE1B,MAAM,MAAM,sBAAsB,GAC9B;IACE,IAAI,EAAE,UAAU,GAAG,WAAW,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,OAAO,CAAC;CAChB,GACD;IACE,IAAI,EAAE,iBAAiB,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,mBAAmB,CAAC;IAChC,WAAW,EAAE,MAAM,CAAC;CACrB,GACD;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC9D;IAAE,IAAI,EAAE,YAAY,GAAG,aAAa,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACrE;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,aAAa,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEN,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,aAAa,CAAC;IACrB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,UAAU,EAAE,SAAS,sBAAsB,EAAE,CAAC;IAC9C,oBAAoB,EAAE,gBAAgB,CAAC;IACvC,qBAAqB,EAAE,SAAS,MAAM,EAAE,CAAC;IACzC,cAAc,EAAE,SAAS,wBAAwB,EAAE,CAAC;CACrD;AAED,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,SAAS,QAAQ,EAAE,CAAC;IAChC,MAAM,EAAE,uBAAuB,CAAC;CACjC;AAED,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,aAAa,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,SAAS,EAAE,mBAAmB,CAAC;IAC/B,cAAc,CAAC,EAAE,SAAS,wBAAwB,EAAE,CAAC;CACtD;AAED,MAAM,WAAW,iCAAiC;IAChD,KAAK,EAAE,SAAS,QAAQ,EAAE,CAAC;IAC3B,KAAK,EAAE,aAAa,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,oBAAoB,EAAE,CACpB,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,aAAa,EACpB,SAAS,EAAE,MAAM,KACd,OAAO,CAAC,OAAO,CAAC,CAAC;CACvB;AAED,wBAAsB,4BAA4B,CAChD,KAAK,EAAE,iCAAiC,GACvC,OAAO,CAAC,wBAAwB,EAAE,CAAC,CAmDrC;AAqFD,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,sBAAsB,GAC5B,iBAAiB,CA4EnB;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,iBAAiB,GAAG,MAAM,CAE1E"}

package/dist/commands/tools/shared/pack-reconcile.js

@@ -49,7 +49,10 @@ function materializationOperations(asset, input) {
     const observed = input.inventory.assets.find(({ definition }) => definition.id === asset.id);
     const ownership = asset.ownership[input.scope];
     const isMissing = observed?.status === 'missing';
-    if (ownership === 'seed-if-missing' && !isMissing)
+    if (ownership === 'seed-if-missing' &&
+        !isMissing &&
+        !(asset.generation === 'projects-config-default' &&
+            observed?.status === 'outdated'))
         return [];
     if (ownership === 'managed' && observed?.status === 'current')
         return [];

package/dist/commands/tools/shared/project-tools-config.d.ts

@@ -1,6 +1,6 @@
 import { type OatConfig } from '../../../config/oat-config.js';
 import { type ScanToolsOptions } from './scan-tools.js';
-import type { ToolInfo } from './types.js';
+import type { PackName, ToolInfo } from './types.js';
 export interface ReconcileProjectToolsOptions {
     repoRoot: string;
     cwd: string;
@@ -12,5 +12,9 @@ export interface ProjectToolsConfigDependencies {
     readOatConfig: (repoRoot: string) => Promise<OatConfig>;
     writeOatConfig: (repoRoot: string, config: OatConfig) => Promise<void>;
 }
-export declare function reconcileProjectToolsConfig(options: ReconcileProjectToolsOptions, dependencies?: ProjectToolsConfigDependencies): Promise<'written' | 'unchanged'>;
+export interface ReconcileProjectToolsResult {
+    action: 'written' | 'unchanged';
+    adoptedPacks: PackName[];
+}
+export declare function reconcileProjectToolsConfig(options: ReconcileProjectToolsOptions, dependencies?: ProjectToolsConfigDependencies): Promise<ReconcileProjectToolsResult>;
 //# sourceMappingURL=project-tools-config.d.ts.map

package/dist/commands/tools/shared/project-tools-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"project-tools-config.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/shared/project-tools-config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,SAAS,EAIf,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAa,KAAK,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAExC,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,8BAA8B;IAC7C,iBAAiB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IACzC,SAAS,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC9D,aAAa,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;IACxD,cAAc,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACxE;AASD,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,4BAA4B,EACrC,YAAY,GAAE,8BAAoD,GACjE,OAAO,CAAC,SAAS,GAAG,WAAW,CAAC,CA2BlC"}
+{"version":3,"file":"project-tools-config.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/shared/project-tools-config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,SAAS,EAIf,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAa,KAAK,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAElD,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,8BAA8B;IAC7C,iBAAiB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IACzC,SAAS,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC9D,aAAa,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;IACxD,cAAc,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACxE;AAED,MAAM,WAAW,2BAA2B;IAC1C,MAAM,EAAE,SAAS,GAAG,WAAW,CAAC;IAChC,YAAY,EAAE,QAAQ,EAAE,CAAC;CAC1B;AASD,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,4BAA4B,EACrC,YAAY,GAAE,8BAAoD,GACjE,OAAO,CAAC,2BAA2B,CAAC,CA6BtC"}

package/dist/commands/tools/shared/project-tools-config.js

@@ -1,5 +1,6 @@
 import { readOatConfig, writeOatConfig, } from '../../../config/oat-config.js';
 import { resolveAssetsRoot } from '../../../fs/assets.js';
+import { PACK_NAMES } from './pack-manifest.js';
 import { scanTools } from './scan-tools.js';
 const defaultDependencies = {
     resolveAssetsRoot,
@@ -16,18 +17,19 @@ export async function reconcileProjectToolsConfig(options, dependencies = defaul
     });
     const config = await dependencies.readOatConfig(options.repoRoot);
     const tools = { ...config.tools };
-    let changed = false;
+    const adopted = new Set();
     for (const tool of projectTools) {
         if (tool.scope === 'project' &&
             tool.pack !== 'custom' &&
             tools[tool.pack] !== true) {
             tools[tool.pack] = true;
-            changed = true;
+            adopted.add(tool.pack);
         }
     }
-    if (!changed) {
-        return 'unchanged';
+    const adoptedPacks = PACK_NAMES.filter((pack) => adopted.has(pack));
+    if (adoptedPacks.length === 0) {
+        return { action: 'unchanged', adoptedPacks };
     }
     await dependencies.writeOatConfig(options.repoRoot, { ...config, tools });
-    return 'written';
+    return { action: 'written', adoptedPacks };
 }

package/dist/commands/tools/update/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/update/index.ts"],"names":[],"mappings":"AAeA,OAAO,EACL,KAAK,oBAAoB,EAE1B,MAAM,kCAAkC,CAAC;AAK1C,OAAO,KAAK,EAAY,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAKvE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,YAAY,EACjB,KAAK,uBAAuB,EAE7B,MAAM,gBAAgB,CAAC;AAkBxB,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAAE,EAClB,OAAO,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,SAAS,GAAG,MAAM,CAAA;CAAE,GAClD,MAAM,EAAE,CAaV;AAgCD,wBAAgB,wBAAwB,CACtC,YAAY,GAAE,uBAA6C,EAC3D,gBAAgB,GAAE,oBAA8C,GAC/D,OAAO,CAoLT;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAI7E;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,YAAY,GACnB,OAAO,CAOT;AAED,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,QAAQ,EACd,MAAM,EAAE,OAAO,GACd,MAAM,CAMR"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/update/index.ts"],"names":[],"mappings":"AAgBA,OAAO,EACL,KAAK,oBAAoB,EAE1B,MAAM,kCAAkC,CAAC;AAK1C,OAAO,KAAK,EAAY,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAKvE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,YAAY,EACjB,KAAK,uBAAuB,EAE7B,MAAM,gBAAgB,CAAC;AAmBxB,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAAE,EAClB,OAAO,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,SAAS,GAAG,MAAM,CAAA;CAAE,GAClD,MAAM,EAAE,CAaV;AAgCD,wBAAgB,wBAAwB,CACtC,YAAY,GAAE,uBAA6C,EAC3D,gBAAgB,GAAE,oBAA8C,GAC/D,OAAO,CA8MT;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAS7E;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,YAAY,GACnB,OAAO,CAOT;AAED,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,QAAQ,EACd,MAAM,EAAE,OAAO,GACd,MAAM,CAMR"}