@open-agent-toolkit/cli 0.2.40 → 0.2.45

package/dist/commands/project/list.js

@@ -1,19 +1,38 @@
-import { isAbsolute, join } from 'node:path';
+import { stat } from 'node:fs/promises';
+import { basename, extname, isAbsolute, join, relative, resolve, sep, } from 'node:path';
 import { buildCommandContext, } from '../../app/command-context.js';
+import { defaultGitRunner } from '../project/sync/git.js';
+import { listSyncedRecords } from '../project/sync/record.js';
 import { parseFrontmatterField } from '../shared/frontmatter.js';
 import { resolveProjectsRoot } from '../shared/oat-paths.js';
+import { PROJECT_SCOPES, resolveScopeRoot, } from '../shared/project-scope.js';
 import { readGlobalOptions } from '../shared/shared.utils.js';
+import { CliError } from '../../errors/cli-error.js';
 import { resolveProjectRoot } from '../../fs/paths.js';
 import { listProjects, } from '@open-agent-toolkit/control-plane';
-import { Command } from 'commander';
+import { Command, Option } from 'commander';
 const DEFAULT_DEPENDENCIES = {
     buildCommandContext,
     resolveProjectRoot,
     resolveProjectsRoot,
     listProjects,
+    listSyncedRecords,
+    directoryExists,
     readProjectMetadata,
     processEnv: process.env,
+    gitRunner: defaultGitRunner,
 };
+async function directoryExists(path) {
+    try {
+        return (await stat(path)).isDirectory();
+    }
+    catch (error) {
+        if (error instanceof Error && 'code' in error && error.code === 'ENOENT') {
+            return false;
+        }
+        throw error;
+    }
+}
 async function readProjectMetadata(projectPath) {
     const stateFile = join(projectPath, 'state.md');
     const [kind, phase, phaseStatus] = await Promise.all([
@@ -50,44 +69,196 @@ function formatProjectTable(projects) {
     }
     const rows = projects.map((project) => ({
         name: project.name,
-        phase: `${project.phase} (${project.phaseStatus})`,
-        progress: `${project.progress.completed}/${project.progress.total}`,
+        scope: project.scope,
+        phase: project.phase === null
+            ? '—'
+            : `${project.phase} (${project.phaseStatus})`,
+        progress: project.progress === null
+            ? '—'
+            : `${project.progress.completed}/${project.progress.total}`,
         recommendation: project.recommendation.skill,
+        hint: project.kind === 'materialized'
+            ? project.recordError
+                ? 'restore record from Git'
+                : '—'
+            : project.kind === 'recorded-invalid'
+                ? 'restore record from Git'
+                : `oat project pull ${project.name}`,
     }));
     const widths = {
         name: Math.max('NAME'.length, ...rows.map((row) => row.name.length)),
+        scope: Math.max('SCOPE'.length, ...rows.map((row) => row.scope.length)),
         phase: Math.max('PHASE'.length, ...rows.map((row) => row.phase.length)),
         progress: Math.max('PROGRESS'.length, ...rows.map((row) => row.progress.length)),
         recommendation: Math.max('RECOMMENDATION'.length, ...rows.map((row) => row.recommendation.length)),
+        hint: Math.max('HINT'.length, ...rows.map((row) => row.hint.length)),
     };
     const header = [
         'NAME'.padEnd(widths.name),
+        'SCOPE'.padEnd(widths.scope),
         'PHASE'.padEnd(widths.phase),
         'PROGRESS'.padEnd(widths.progress),
         'RECOMMENDATION'.padEnd(widths.recommendation),
+        'HINT'.padEnd(widths.hint),
     ].join('  ');
     const divider = [
         '-'.repeat(widths.name),
+        '-'.repeat(widths.scope),
         '-'.repeat(widths.phase),
         '-'.repeat(widths.progress),
         '-'.repeat(widths.recommendation),
+        '-'.repeat(widths.hint),
     ].join('  ');
     const lines = rows.map((row) => [
         row.name.padEnd(widths.name),
+        row.scope.padEnd(widths.scope),
         row.phase.padEnd(widths.phase),
         row.progress.padEnd(widths.progress),
         row.recommendation.padEnd(widths.recommendation),
+        row.hint.padEnd(widths.hint),
     ].join('  '));
     return [header, divider, ...lines];
 }
+function displayPath(repoRoot, absolutePath) {
+    return relative(repoRoot, absolutePath).split(sep).join('/');
+}
+async function collectProjectRows(repoRoot, projectsRoot, options, context, dependencies) {
+    const configuredSharedRoot = isAbsolute(projectsRoot)
+        ? resolve(projectsRoot)
+        : resolve(repoRoot, projectsRoot);
+    const roots = [
+        { scope: 'shared', path: configuredSharedRoot },
+        {
+            scope: 'synced',
+            path: resolveScopeRoot(repoRoot, projectsRoot, 'synced'),
+        },
+        {
+            scope: 'local',
+            path: resolveScopeRoot(repoRoot, projectsRoot, 'local'),
+        },
+    ];
+    const selected = options.scope
+        ? roots.filter((entry) => entry.scope === options.scope)
+        : roots;
+    const rows = [];
+    for (const root of selected) {
+        if (await dependencies.directoryExists(root.path)) {
+            const projects = await filterProjectsForList(await dependencies.listProjects(root.path), root.path, options.includeCoordination ?? false, dependencies);
+            rows.push(...projects.map((project) => ({
+                ...project,
+                kind: 'materialized',
+                scope: root.scope,
+                checkout: 'present',
+            })));
+        }
+        if (root.scope === 'synced') {
+            const materialized = new Set(rows
+                .filter((row) => row.scope === 'synced' && row.kind === 'materialized')
+                .map((row) => row.name));
+            const records = await dependencies.listSyncedRecords(root.path, {
+                onInvalid: (path, error) => {
+                    const message = error instanceof Error ? error.message : String(error);
+                    const name = basename(path, extname(path));
+                    const materializedRow = rows.find((row) => row.scope === 'synced' &&
+                        row.kind === 'materialized' &&
+                        row.name === name);
+                    if (materializedRow) {
+                        materializedRow.recordError = message;
+                        materializedRow.recommendation = {
+                            skill: 'none',
+                            reason: 'restore invalid record from a trusted Git revision',
+                        };
+                    }
+                    else {
+                        rows.push({
+                            kind: 'recorded-invalid',
+                            name,
+                            path: displayPath(repoRoot, path),
+                            scope: 'synced',
+                            checkout: 'invalid',
+                            recordError: message,
+                            phase: null,
+                            phaseStatus: null,
+                            workflowMode: null,
+                            lifecycle: null,
+                            progress: null,
+                            recommendation: {
+                                skill: 'none',
+                                reason: 'restore invalid record from a trusted Git revision',
+                            },
+                        });
+                    }
+                    context.logger.warn(`Skipping invalid synced project record ${displayPath(repoRoot, path)}: ${message}`);
+                },
+            });
+            for (const record of records) {
+                if (!materialized.has(record.slug)) {
+                    rows.push({
+                        kind: 'recorded-absent',
+                        name: record.slug,
+                        path: displayPath(repoRoot, join(root.path, record.slug)),
+                        scope: 'synced',
+                        checkout: 'absent',
+                        phase: null,
+                        phaseStatus: null,
+                        workflowMode: null,
+                        lifecycle: null,
+                        progress: null,
+                        recommendation: {
+                            skill: 'oat project pull',
+                            reason: 'checkout absent',
+                        },
+                    });
+                }
+            }
+        }
+    }
+    return rows.sort((left, right) => left.name.localeCompare(right.name) ||
+        left.scope.localeCompare(right.scope));
+}
+async function appendRemoteRows(rows, repoRoot, context, dependencies) {
+    const remote = await dependencies.gitRunner.run(['ls-remote', 'origin', 'refs/oat/projects/*'], { cwd: repoRoot, allowFailure: true });
+    if (remote.code !== 0) {
+        context.logger.warn(`Warning: unable to list remote synced projects: ${remote.stderr || remote.stdout || 'origin is unreachable'}`);
+        return rows;
+    }
+    const localSlugs = new Set(rows.filter((row) => row.scope === 'synced').map((row) => row.name));
+    for (const line of remote.stdout.split('\n')) {
+        const [, ref] = line.trim().split(/\s+/);
+        if (!ref?.startsWith('refs/oat/projects/'))
+            continue;
+        const name = ref.slice('refs/oat/projects/'.length);
+        if (!name || localSlugs.has(name))
+            continue;
+        rows.push({
+            kind: 'remote',
+            name,
+            scope: 'synced',
+            origin: 'remote',
+            checkout: 'absent',
+            ref,
+            phase: null,
+            phaseStatus: null,
+            workflowMode: null,
+            lifecycle: null,
+            progress: null,
+            recommendation: {
+                skill: 'oat project pull',
+                reason: 'not adopted on this branch',
+            },
+        });
+    }
+    return rows.sort((left, right) => left.name.localeCompare(right.name) ||
+        left.scope.localeCompare(right.scope));
+}
 async function runProjectList(context, dependencies, options) {
     try {
         const repoRoot = await dependencies.resolveProjectRoot(context.cwd);
         const projectsRoot = await dependencies.resolveProjectsRoot(repoRoot, dependencies.processEnv);
-        const absoluteProjectsRoot = isAbsolute(projectsRoot)
-            ? projectsRoot
-            : join(repoRoot, projectsRoot);
-        const projects = await filterProjectsForList(await dependencies.listProjects(absoluteProjectsRoot), absoluteProjectsRoot, options.includeCoordination ?? false, dependencies);
+        let projects = await collectProjectRows(repoRoot, projectsRoot, options, context, dependencies);
+        if (options.remote && (!options.scope || options.scope === 'synced')) {
+            projects = await appendRemoteRows(projects, repoRoot, context, dependencies);
+        }
         if (context.json) {
             context.logger.json({ status: 'ok', projects });
         }
@@ -106,7 +277,7 @@ async function runProjectList(context, dependencies, options) {
         else {
             context.logger.error(message);
         }
-        process.exitCode = 1;
+        process.exitCode = error instanceof CliError ? error.exitCode : 2;
     }
 }
 export function createProjectListCommand(overrides = {}) {
@@ -117,6 +288,8 @@ export function createProjectListCommand(overrides = {}) {
     return new Command('list')
         .description('List tracked OAT projects')
         .option('--include-coordination', 'Include completed coordination parent projects')
+        .addOption(new Option('--scope <scope>', 'Filter by project scope').choices(PROJECT_SCOPES))
+        .option('--remote', 'Include synced projects discovered on origin')
         .action(async (options, command) => {
         const context = dependencies.buildCommandContext(readGlobalOptions(command));
         await runProjectList(context, dependencies, options);

package/dist/commands/project/migrate/index.d.ts

@@ -0,0 +1,22 @@
+import { type CommandContext, type GlobalOptions } from '../../../app/command-context.js';
+import { type GitRunner } from '../../project/sync/git.js';
+import { assertConfinedMigrationSource, type MigrateResult, type SyncTarget } from '../../project/sync/ref-sync.js';
+import { resolveProjectsRoot } from '../../shared/oat-paths.js';
+import { Command } from 'commander';
+interface ProjectMigrateDependencies {
+    buildCommandContext: (options: GlobalOptions) => CommandContext;
+    resolveProjectRoot: (cwd: string) => Promise<string>;
+    resolveProjectsRoot: typeof resolveProjectsRoot;
+    assertConfinedMigrationSource: typeof assertConfinedMigrationSource;
+    migrateSharedToSynced: (target: SyncTarget, git: GitRunner, options: {
+        sourcePath: string;
+        commit: boolean;
+        now: Date;
+    }) => Promise<MigrateResult>;
+    gitRunner: GitRunner;
+    processEnv: NodeJS.ProcessEnv;
+    now: () => Date;
+}
+export declare function createProjectMigrateCommand(overrides?: Partial<ProjectMigrateDependencies>): Command;
+export {};
+//# sourceMappingURL=index.d.ts.map

package/dist/commands/project/migrate/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/migrate/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAoB,KAAK,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAC9E,OAAO,EACL,6BAA6B,EAG7B,KAAK,aAAa,EAClB,KAAK,UAAU,EAChB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAUjE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAOpC,UAAU,0BAA0B;IAClC,mBAAmB,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,cAAc,CAAC;IAChE,kBAAkB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACrD,mBAAmB,EAAE,OAAO,mBAAmB,CAAC;IAChD,6BAA6B,EAAE,OAAO,6BAA6B,CAAC;IACpE,qBAAqB,EAAE,CACrB,MAAM,EAAE,UAAU,EAClB,GAAG,EAAE,SAAS,EACd,OAAO,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,OAAO,CAAC;QAAC,GAAG,EAAE,IAAI,CAAA;KAAE,KACxD,OAAO,CAAC,aAAa,CAAC,CAAC;IAC5B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC;IAC9B,GAAG,EAAE,MAAM,IAAI,CAAC;CACjB;AA+ED,wBAAgB,2BAA2B,CACzC,SAAS,GAAE,OAAO,CAAC,0BAA0B,CAAM,GAClD,OAAO,CAmBT"}

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

@@ -0,0 +1,79 @@
+import { basename, dirname, isAbsolute, resolve } from 'node:path';
+import { buildCommandContext, } from '../../../app/command-context.js';
+import { defaultGitRunner } from '../../project/sync/git.js';
+import { assertConfinedMigrationSource, buildSyncTarget, migrateSharedToSynced, } from '../../project/sync/ref-sync.js';
+import { resolveProjectsRoot } from '../../shared/oat-paths.js';
+import { assertValidProjectSlug, canonicalizePath, resolveProjectScope, resolveScopeRoot, } from '../../shared/project-scope.js';
+import { readGlobalOptions } from '../../shared/shared.utils.js';
+import { CliError } from '../../../errors/cli-error.js';
+import { resolveProjectRoot } from '../../../fs/paths.js';
+import { Command } from 'commander';
+const DEFAULT_DEPENDENCIES = {
+    buildCommandContext,
+    resolveProjectRoot,
+    resolveProjectsRoot,
+    assertConfinedMigrationSource,
+    migrateSharedToSynced,
+    gitRunner: defaultGitRunner,
+    processEnv: process.env,
+    now: () => new Date(),
+};
+async function runMigrate(context, projectPath, options, dependencies) {
+    try {
+        if (options.to !== 'synced') {
+            throw new CliError(`Migration to ${options.to} is not supported in v1; only --to synced is available.`, 1);
+        }
+        const repoRoot = await dependencies.resolveProjectRoot(context.cwd);
+        const projectsRoot = await dependencies.resolveProjectsRoot(repoRoot, dependencies.processEnv);
+        const sourcePath = isAbsolute(projectPath)
+            ? resolve(projectPath)
+            : resolve(repoRoot, projectPath);
+        const sharedRoot = resolveScopeRoot(repoRoot, projectsRoot, 'shared');
+        if (canonicalizePath(dirname(sourcePath)) !== canonicalizePath(sharedRoot)) {
+            throw new CliError(`Project ${projectPath} must be a direct child in shared scope.`, 1);
+        }
+        const slug = basename(sourcePath);
+        assertValidProjectSlug(slug, 1);
+        const target = buildSyncTarget(repoRoot, projectsRoot, slug);
+        await dependencies.assertConfinedMigrationSource(target, sourcePath);
+        if (resolveProjectScope(sourcePath, sharedRoot, repoRoot) !== 'shared') {
+            throw new CliError(`Project ${projectPath} must be a direct child in shared scope.`, 1);
+        }
+        const result = await dependencies.migrateSharedToSynced(target, dependencies.gitRunner, {
+            sourcePath,
+            commit: options.commit,
+            now: dependencies.now(),
+        });
+        const payload = {
+            ...result,
+            sourcePath,
+            projectPath: target.projectPath,
+            ref: target.ref,
+        };
+        if (context.json)
+            context.logger.json(payload);
+        else
+            context.logger.info(`Migrated ${slug} to synced scope.`);
+        process.exitCode = 0;
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        if (context.json)
+            context.logger.json({ status: 'error', message });
+        else
+            context.logger.error(message);
+        process.exitCode = error instanceof CliError ? error.exitCode : 2;
+    }
+}
+export function createProjectMigrateCommand(overrides = {}) {
+    const dependencies = { ...DEFAULT_DEPENDENCIES, ...overrides };
+    return new Command('migrate')
+        .description('Migrate a shared OAT project to synced scope')
+        .argument('<project-path>', 'Shared project path')
+        .requiredOption('--to <scope>', 'Destination scope')
+        .option('--no-commit', 'Do not commit parent-branch changes')
+        .action(async (projectPath, options, command) => {
+        const context = dependencies.buildCommandContext(readGlobalOptions(command));
+        await runMigrate(context, projectPath, options, dependencies);
+    });
+}

package/dist/commands/project/new/index.d.ts

@@ -1,4 +1,5 @@
 import { type CommandContext, type GlobalOptions } from '../../../app/command-context.js';
+import { type ProjectScope } from '../../shared/project-scope.js';
 import { Command } from 'commander';
 import { type ProjectScaffoldMode, type ScaffoldProjectResult } from './scaffold.js';
 interface ProjectNewDependencies {
@@ -12,6 +13,7 @@ interface ProjectNewDependencies {
         refreshDashboard: boolean;
         commit: boolean;
         projectLog?: boolean;
+        scope?: ProjectScope;
     }) => Promise<ScaffoldProjectResult>;
 }
 export declare function createProjectNewCommand(overrides?: Partial<ProjectNewDependencies>): Command;

package/dist/commands/project/new/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/new/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAE5C,OAAO,EAEL,KAAK,mBAAmB,EACxB,KAAK,qBAAqB,EAC3B,MAAM,YAAY,CAAC;AAkBpB,UAAU,sBAAsB;IAC9B,mBAAmB,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,cAAc,CAAC;IAChE,eAAe,EAAE,CAAC,OAAO,EAAE;QACzB,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,MAAM,CAAC;QACpB,IAAI,EAAE,mBAAmB,CAAC;QAC1B,KAAK,EAAE,OAAO,CAAC;QACf,SAAS,EAAE,OAAO,CAAC;QACnB,gBAAgB,EAAE,OAAO,CAAC;QAC1B,MAAM,EAAE,OAAO,CAAC;QAChB,UAAU,CAAC,EAAE,OAAO,CAAC;KACtB,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAC;CACtC;AA0FD,wBAAgB,uBAAuB,CACrC,SAAS,GAAE,OAAO,CAAC,sBAAsB,CAAM,GAC9C,OAAO,CA0CT"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/new/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEL,KAAK,YAAY,EAClB,MAAM,gCAAgC,CAAC;AAGxC,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAE5C,OAAO,EAEL,KAAK,mBAAmB,EACxB,KAAK,qBAAqB,EAC3B,MAAM,YAAY,CAAC;AAmBpB,UAAU,sBAAsB;IAC9B,mBAAmB,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,cAAc,CAAC;IAChE,eAAe,EAAE,CAAC,OAAO,EAAE;QACzB,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,MAAM,CAAC;QACpB,IAAI,EAAE,mBAAmB,CAAC;QAC1B,KAAK,EAAE,OAAO,CAAC;QACf,SAAS,EAAE,OAAO,CAAC;QACnB,gBAAgB,EAAE,OAAO,CAAC;QAC1B,MAAM,EAAE,OAAO,CAAC;QAChB,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,KAAK,CAAC,EAAE,YAAY,CAAC;KACtB,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAC;CACtC;AAmGD,wBAAgB,uBAAuB,CACrC,SAAS,GAAE,OAAO,CAAC,sBAAsB,CAAM,GAC9C,OAAO,CAgDT"}

package/dist/commands/project/new/index.js

@@ -1,5 +1,7 @@
 import { buildCommandContext, } from '../../../app/command-context.js';
+import { PROJECT_SCOPES, } from '../../shared/project-scope.js';
 import { readGlobalOptions } from '../../shared/shared.utils.js';
+import { CliError } from '../../../errors/cli-error.js';
 import { Command, Option } from 'commander';
 import { scaffoldProject as defaultScaffoldProject, } from './scaffold.js';
 const COMMIT_STATUS_MESSAGES = {
@@ -17,6 +19,9 @@ function reportSuccess(context, projectName, result) {
             status: 'ok',
             projectName,
             mode: result.mode,
+            scope: result.scope,
+            ref: result.ref,
+            sha: result.sha,
             projectPath: result.projectPath,
             projectsRoot: result.projectsRoot,
             createdFiles: result.createdFiles,
@@ -24,6 +29,7 @@ function reportSuccess(context, projectName, result) {
             activePointerUpdated: result.activePointerUpdated,
             dashboardRefreshed: result.dashboardRefreshed,
             committed: result.committed,
+            scaffoldCommit: result.commitSha,
             commitSha: result.commitSha,
             commitStatus: result.commitStatus,
             commitError: result.commitError,
@@ -32,6 +38,10 @@ function reportSuccess(context, projectName, result) {
     }
     context.logger.info(`Created/updated OAT project: ${projectName}`);
     context.logger.info(`Project path: ${result.projectPath}`);
+    context.logger.info(`Scope: ${result.scope}`);
+    if (result.ref) {
+        context.logger.info(`Ref: ${result.ref}`);
+    }
     if (result.activePointerUpdated) {
         context.logger.info('Active project updated in local config: .oat/config.local.json');
     }
@@ -63,6 +73,7 @@ async function runProjectNew(projectName, options, context, dependencies) {
                 : options.projectLog === false
                     ? false
                     : undefined,
+            scope: options.scope,
         });
         reportSuccess(context, projectName, result);
         process.exitCode = 0;
@@ -75,7 +86,7 @@ async function runProjectNew(projectName, options, context, dependencies) {
         else {
             context.logger.error(message);
         }
-        process.exitCode = 1;
+        process.exitCode = error instanceof CliError ? error.exitCode : 2;
     }
 }
 export function createProjectNewCommand(overrides = {}) {
@@ -89,7 +100,8 @@ export function createProjectNewCommand(overrides = {}) {
         .addOption(new Option('--mode <mode>', 'Scaffold mode')
         .choices(['spec-driven', 'quick', 'import'])
         .default('spec-driven'))
-        .option('--force', 'Non-destructive scaffold; create missing files only')
+        .addOption(new Option('--scope <scope>', 'Project scope').choices(PROJECT_SCOPES))
+        .option('--force', 'Allow a duplicate slug in another scope; scaffold remains non-destructive')
         .option('--no-set-active', 'Do not update active project in local config')
         .option('--no-dashboard', 'Do not refresh .oat/state.md after scaffold')
         .option('--no-commit', 'Do not git-commit the scaffolded project directory')

package/dist/commands/project/new/scaffold.d.ts

@@ -1,7 +1,14 @@
+import { ensureScopedRootGitignore } from '../../init/gitignore.js';
+import { type GitRunner } from '../../project/sync/git.js';
+import { writeSyncedRecord } from '../../project/sync/record.js';
+import { commitRecordChange, createSyncedProject, pushSynced, rollbackCreatedSyncedProject } from '../../project/sync/ref-sync.js';
+import { resolveDefaultScope, type ProjectScope } from '../../shared/project-scope.js';
+import { setActiveProject } from '../../../config/oat-config.js';
 export type ProjectScaffoldMode = 'spec-driven' | 'quick' | 'import';
 export interface ScaffoldProjectOptions {
     repoRoot: string;
     projectName: string;
+    scope?: ProjectScope;
     mode?: ProjectScaffoldMode;
     force?: boolean;
     setActive?: boolean;
@@ -28,6 +35,7 @@ export interface ScaffoldProjectOptions {
 export type CommitScaffoldStatus = 'committed' | 'skipped_disabled' | 'skipped_no_worktree' | 'skipped_nothing' | 'failed';
 export interface ScaffoldProjectResult {
     mode: ProjectScaffoldMode;
+    scope: ProjectScope;
     projectsRoot: string;
     projectPath: string;
     createdFiles: string[];
@@ -38,6 +46,19 @@ export interface ScaffoldProjectResult {
     commitSha?: string;
     commitStatus: CommitScaffoldStatus;
     commitError?: string;
+    ref?: string;
+    sha?: string;
 }
-export declare function scaffoldProject(options: ScaffoldProjectOptions): Promise<ScaffoldProjectResult>;
+export interface ScaffoldProjectDependencies {
+    resolveDefaultScope: typeof resolveDefaultScope;
+    gitRunner: GitRunner;
+    createSyncedProject: typeof createSyncedProject;
+    pushSynced: typeof pushSynced;
+    commitRecordChange: typeof commitRecordChange;
+    rollbackCreatedSyncedProject: typeof rollbackCreatedSyncedProject;
+    writeSyncedRecord: typeof writeSyncedRecord;
+    ensureScopedRootGitignore: typeof ensureScopedRootGitignore;
+    setActiveProject: typeof setActiveProject;
+}
+export declare function scaffoldProject(options: ScaffoldProjectOptions, overrides?: Partial<ScaffoldProjectDependencies>): Promise<ScaffoldProjectResult>;
 //# sourceMappingURL=scaffold.d.ts.map

package/dist/commands/project/new/scaffold.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scaffold.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/new/scaffold.ts"],"names":[],"mappings":"AAcA,MAAM,MAAM,mBAAmB,GAAG,aAAa,GAAG,OAAO,GAAG,QAAQ,CAAC;AAErE,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,mBAAmB,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,wBAAwB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACvE;AAED;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,GAC5B,WAAW,GACX,kBAAkB,GAClB,qBAAqB,GACrB,iBAAiB,GACjB,QAAQ,CAAC;AAEb,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,mBAAmB,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,oBAAoB,CAAC;IACnC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAmWD,wBAAsB,eAAe,CACnC,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,qBAAqB,CAAC,CAuGhC"}
+{"version":3,"file":"scaffold.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/new/scaffold.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAErE,OAAO,EAAoB,KAAK,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAC9E,OAAO,EAEL,iBAAiB,EAClB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAEL,kBAAkB,EAClB,mBAAmB,EACnB,UAAU,EACV,4BAA4B,EAC7B,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAGL,mBAAmB,EAGnB,KAAK,YAAY,EAClB,MAAM,gCAAgC,CAAC;AAExC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAOtD,MAAM,MAAM,mBAAmB,GAAG,aAAa,GAAG,OAAO,GAAG,QAAQ,CAAC;AAErE,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,IAAI,CAAC,EAAE,mBAAmB,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,wBAAwB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACvE;AAED;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,GAC5B,WAAW,GACX,kBAAkB,GAClB,qBAAqB,GACrB,iBAAiB,GACjB,QAAQ,CAAC;AAEb,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,mBAAmB,CAAC;IAC1B,KAAK,EAAE,YAAY,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,oBAAoB,CAAC;IACnC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,2BAA2B;IAC1C,mBAAmB,EAAE,OAAO,mBAAmB,CAAC;IAChD,SAAS,EAAE,SAAS,CAAC;IACrB,mBAAmB,EAAE,OAAO,mBAAmB,CAAC;IAChD,UAAU,EAAE,OAAO,UAAU,CAAC;IAC9B,kBAAkB,EAAE,OAAO,kBAAkB,CAAC;IAC9C,4BAA4B,EAAE,OAAO,4BAA4B,CAAC;IAClE,iBAAiB,EAAE,OAAO,iBAAiB,CAAC;IAC5C,yBAAyB,EAAE,OAAO,yBAAyB,CAAC;IAC5D,gBAAgB,EAAE,OAAO,gBAAgB,CAAC;CAC3C;AA6bD,wBAAsB,eAAe,CACnC,OAAO,EAAE,sBAAsB,EAC/B,SAAS,GAAE,OAAO,CAAC,2BAA2B,CAAM,GACnD,OAAO,CAAC,qBAAqB,CAAC,CAsXhC"}