@open-agent-toolkit/cli 0.2.49 → 0.2.51

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

@@ -1,7 +1,10 @@
 import { isAbsolute, relative, resolve, sep } from 'node:path';
 import { buildCommandContext, } from '../../../app/command-context.js';
 import { defaultGitRunner } from '../../project/sync/git.js';
-import { resolveSyncedTarget } from '../../project/sync/resolve-target.js';
+import { buildSyncTarget, classifyRemoteRefLookup, } from '../../project/sync/ref-sync.js';
+import { probeSyncedTerminalRefs, resolveSyncedTarget, } from '../../project/sync/resolve-target.js';
+import { resolveProjectsRoot } from '../../shared/oat-paths.js';
+import { completedSyncedRefName, 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';
@@ -11,7 +14,9 @@ import { renderLinksBlock } from './render.js';
 const DEFAULT_DEPENDENCIES = {
     buildCommandContext,
     resolveProjectRoot,
+    resolveProjectsRoot,
     resolveSyncedTarget,
+    resolveLinksTarget,
     computeLinksInput,
     gitRunner: defaultGitRunner,
     processEnv: process.env,
@@ -30,13 +35,77 @@ function normalizeDurableSummaryPath(repoRoot, durableSummaryPath) {
     }
     return repositoryRelative.split(sep).join('/');
 }
+function linksSlug(repoRoot, projectsRoot, pathOrSlug) {
+    if (!pathOrSlug.includes('/') && !pathOrSlug.includes('\\')) {
+        return pathOrSlug;
+    }
+    const absolute = isAbsolute(pathOrSlug)
+        ? resolve(pathOrSlug)
+        : resolve(repoRoot, pathOrSlug);
+    const sharedRoot = resolveScopeRoot(repoRoot, projectsRoot, 'shared');
+    if (resolveProjectScope(absolute, sharedRoot, repoRoot) !== 'synced') {
+        return null;
+    }
+    const child = relative(resolveScopeRoot(repoRoot, projectsRoot, 'synced'), absolute);
+    return child && !child.includes(sep) ? child : null;
+}
+export async function resolveLinksTarget(repoRoot, projectsRoot, pathOrSlug, env, git, resolveTarget) {
+    let resolved = null;
+    let resolutionError;
+    try {
+        resolved = await resolveTarget({ repoRoot, env }, pathOrSlug, { gitRunner: git }, { allowMissingCheckout: true });
+    }
+    catch (error) {
+        resolutionError = error;
+        if (!(error instanceof CliError) ||
+            error.exitCode !== 1 ||
+            !error.message.startsWith('No synced project named ')) {
+            throw error;
+        }
+    }
+    const slug = pathOrSlug
+        ? linksSlug(repoRoot, projectsRoot, pathOrSlug)
+        : resolved?.slug;
+    if (!slug) {
+        if (resolutionError)
+            throw resolutionError;
+        throw new CliError('No synced project is available for link rendering.', 1);
+    }
+    const target = resolved ?? buildSyncTarget(repoRoot, projectsRoot, slug);
+    const completedRef = completedSyncedRefName(slug);
+    const lookup = await git.run(['ls-remote', '--exit-code', target.remote, completedRef], { cwd: repoRoot, allowFailure: true });
+    if (classifyRemoteRefLookup(lookup, target.remote, completedRef) === 'absent') {
+        if (resolutionError)
+            throw resolutionError;
+        return { target, ref: target.ref };
+    }
+    const rows = lookup.stdout.split('\n').filter(Boolean);
+    const [sha, ref] = rows[0]?.trim().split(/\s+/) ?? [];
+    if (rows.length !== 1 ||
+        ref !== completedRef ||
+        !/^(?:[0-9a-f]{40}|[0-9a-f]{64})$/i.test(sha ?? '')) {
+        throw new CliError(`Unable to verify terminal links for ${slug}: origin returned a malformed completed-ref advertisement.`, 2);
+    }
+    const probe = await probeSyncedTerminalRefs(target, sha, git);
+    if (probe.state === 'wrong-sha') {
+        throw new CliError(`Cannot refresh links for ${slug}: active ${probe.activeRef} is ${probe.activeSha ?? 'absent'} while completed ${probe.completedRef} is ${probe.completedSha ?? 'absent'}. Repair the terminal ref mismatch first.`, 1);
+    }
+    if (probe.state === 'completed-only' || probe.state === 'both') {
+        return { target, ref: completedRef };
+    }
+    if (resolutionError)
+        throw resolutionError;
+    return { target, ref: target.ref };
+}
 async function runLinks(context, pathOrSlug, options, dependencies) {
     try {
         const repoRoot = await dependencies.resolveProjectRoot(context.cwd);
-        const target = await dependencies.resolveSyncedTarget({ repoRoot, env: dependencies.processEnv }, pathOrSlug, {}, { allowMissingCheckout: true });
+        const projectsRoot = await dependencies.resolveProjectsRoot(repoRoot, dependencies.processEnv);
+        const { target, ref } = await dependencies.resolveLinksTarget(repoRoot, projectsRoot, pathOrSlug, dependencies.processEnv, dependencies.gitRunner, dependencies.resolveSyncedTarget);
         const input = await dependencies.computeLinksInput(target, dependencies.gitRunner, {
             durableSummaryPath: normalizeDurableSummaryPath(repoRoot, options.durableSummary),
             now: dependencies.now(),
+            ref,
         });
         const markdown = renderLinksBlock(input);
         if (context.json || options.format === 'json') {

package/dist/commands/project/list.d.ts

@@ -1,7 +1,9 @@
 import { type CommandContext, type GlobalOptions } from '../../app/command-context.js';
 import { type GitRunner } from '../project/sync/git.js';
-import { listSyncedRecords } from '../project/sync/record.js';
-import { type ProjectSummary } from '@open-agent-toolkit/control-plane';
+import { listSyncedRecords, type SyncedProjectRecord } from '../project/sync/record.js';
+import { buildSyncTarget } from '../project/sync/ref-sync.js';
+import { probeSyncedTerminalRefs, type SyncedTerminalRefProbe } from '../project/sync/resolve-target.js';
+import { type ProjectListRow, type ProjectSummary } from '@open-agent-toolkit/control-plane';
 import { Command } from 'commander';
 interface ProjectListDependencies {
     buildCommandContext: (options: GlobalOptions) => CommandContext;
@@ -9,6 +11,8 @@ interface ProjectListDependencies {
     resolveProjectsRoot: (repoRoot: string, env: NodeJS.ProcessEnv) => Promise<string>;
     listProjects: (projectsRoot: string) => Promise<ProjectSummary[]>;
     listSyncedRecords: typeof listSyncedRecords;
+    probeSyncedTerminalRefs: typeof probeSyncedTerminalRefs;
+    probeAuthoritativeCompletedRef: typeof probeAuthoritativeCompletedRef;
     directoryExists: (path: string) => Promise<boolean>;
     readProjectMetadata: (projectPath: string) => Promise<ProjectListMetadata>;
     processEnv: NodeJS.ProcessEnv;
@@ -19,6 +23,10 @@ interface ProjectListMetadata {
     phase: string;
     phaseStatus: string;
 }
+export declare function classifyLegacySyncedRecord(record: SyncedProjectRecord, path: string, probe?: SyncedTerminalRefProbe): Extract<ProjectListRow, {
+    kind: 'recorded-absent' | 'recorded-terminal' | 'terminal-invalid';
+}>;
+export declare function probeAuthoritativeCompletedRef(target: ReturnType<typeof buildSyncTarget>, git: GitRunner): Promise<SyncedTerminalRefProbe | null>;
 export declare function createProjectListCommand(overrides?: Partial<ProjectListDependencies>): Command;
 export {};
 //# sourceMappingURL=list.d.ts.map

package/dist/commands/project/list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../src/commands/project/list.ts"],"names":[],"mappings":"AAWA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAoB,KAAK,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAC9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAWlE,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAE5C,UAAU,uBAAuB;IAC/B,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,CACnB,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,CAAC,UAAU,KACnB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,YAAY,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;IAClE,iBAAiB,EAAE,OAAO,iBAAiB,CAAC;IAC5C,eAAe,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACpD,mBAAmB,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAC3E,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC;IAC9B,SAAS,EAAE,SAAS,CAAC;CACtB;AAED,UAAU,mBAAmB;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACrB;AAoXD,wBAAgB,wBAAwB,CACtC,SAAS,GAAE,OAAO,CAAC,uBAAuB,CAAM,GAC/C,OAAO,CAwBT"}
+{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../src/commands/project/list.ts"],"names":[],"mappings":"AAWA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAoB,KAAK,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAC9E,OAAO,EACL,iBAAiB,EACjB,KAAK,mBAAmB,EACzB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,eAAe,EAEhB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,uBAAuB,EACvB,KAAK,sBAAsB,EAC5B,MAAM,uCAAuC,CAAC;AAY/C,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,cAAc,EACpB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAE5C,UAAU,uBAAuB;IAC/B,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,CACnB,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,CAAC,UAAU,KACnB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,YAAY,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;IAClE,iBAAiB,EAAE,OAAO,iBAAiB,CAAC;IAC5C,uBAAuB,EAAE,OAAO,uBAAuB,CAAC;IACxD,8BAA8B,EAAE,OAAO,8BAA8B,CAAC;IACtE,eAAe,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACpD,mBAAmB,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAC3E,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC;IAC9B,SAAS,EAAE,SAAS,CAAC;CACtB;AAED,UAAU,mBAAmB;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACrB;AA6KD,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,sBAAsB,GAC7B,OAAO,CACR,cAAc,EACd;IAAE,IAAI,EAAE,iBAAiB,GAAG,mBAAmB,GAAG,kBAAkB,CAAA;CAAE,CACvE,CA0FA;AAED,wBAAsB,8BAA8B,CAClD,MAAM,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,EAC1C,GAAG,EAAE,SAAS,GACb,OAAO,CAAC,sBAAsB,GAAG,IAAI,CAAC,CAwBxC;AA8TD,wBAAgB,wBAAwB,CACtC,SAAS,GAAE,OAAO,CAAC,uBAAuB,CAAM,GAC/C,OAAO,CAwBT"}

package/dist/commands/project/list.js

@@ -2,10 +2,12 @@ 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 { listSyncedRecords, } from '../project/sync/record.js';
+import { buildSyncTarget, classifyRemoteRefLookup, } from '../project/sync/ref-sync.js';
+import { probeSyncedTerminalRefs, } from '../project/sync/resolve-target.js';
 import { parseFrontmatterField } from '../shared/frontmatter.js';
 import { resolveProjectsRoot } from '../shared/oat-paths.js';
-import { PROJECT_SCOPES, resolveScopeRoot, } from '../shared/project-scope.js';
+import { completedSyncedRefName, 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';
@@ -17,6 +19,8 @@ const DEFAULT_DEPENDENCIES = {
     resolveProjectsRoot,
     listProjects,
     listSyncedRecords,
+    probeSyncedTerminalRefs,
+    probeAuthoritativeCompletedRef,
     directoryExists,
     readProjectMetadata,
     processEnv: process.env,
@@ -83,7 +87,13 @@ function formatProjectTable(projects) {
                 : '—'
             : project.kind === 'recorded-invalid'
                 ? 'restore record from Git'
-                : `oat project pull ${project.name}`,
+                : project.kind === 'recorded-terminal'
+                    ? project.archiveSnapshot
+                        ? 'retry completion cleanup'
+                        : 'retry archive completion'
+                    : project.kind === 'terminal-invalid'
+                        ? 'repair terminal ref mismatch'
+                        : `oat project pull ${project.name}`,
     }));
     const widths = {
         name: Math.max('NAME'.length, ...rows.map((row) => row.name.length)),
@@ -119,6 +129,127 @@ function formatProjectTable(projects) {
     ].join('  '));
     return [header, divider, ...lines];
 }
+const ARCHIVE_RETRY_REASON = 'archive snapshot is incomplete; retry oat-project-complete before retiring terminal state';
+const RETIREMENT_RETRY_REASON = 'archive is durable but legacy terminal cleanup remains; retry oat-project-complete';
+const AUTHORITATIVE_COMPLETION_REASON = 'completed ref is authoritative; remove the stale local checkout or active record with oat-project-complete';
+function terminalMismatchReason(activeSha, completedSha, expectedSha) {
+    return `terminal ref SHA mismatch: active ${activeSha ?? 'absent'}, completed ${completedSha ?? 'absent'}${expectedSha ? `, expected archived source ${expectedSha}` : ''}; repair the ref mismatch before retrying completion or prune`;
+}
+export function classifyLegacySyncedRecord(record, path, probe) {
+    if (probe?.state === 'wrong-sha') {
+        return {
+            kind: 'terminal-invalid',
+            name: record.slug,
+            path,
+            scope: 'synced',
+            checkout: 'invalid',
+            terminalState: 'ref-sha-mismatch',
+            activeRef: probe.activeRef,
+            completedRef: probe.completedRef,
+            activeSha: probe.activeSha,
+            completedSha: probe.completedSha,
+            expectedSha: probe.expectedSha,
+            phase: null,
+            phaseStatus: null,
+            workflowMode: null,
+            lifecycle: 'complete',
+            progress: null,
+            recommendation: {
+                skill: 'none',
+                reason: terminalMismatchReason(probe.activeSha, probe.completedSha, probe.expectedSha),
+            },
+        };
+    }
+    if (probe?.state === 'completed-only' || probe?.state === 'both') {
+        return {
+            kind: 'recorded-terminal',
+            name: record.slug,
+            path,
+            scope: 'synced',
+            checkout: 'absent',
+            terminalState: 'authoritative-completion',
+            archiveSnapshot: record.archiveSnapshot ?? null,
+            phase: null,
+            phaseStatus: null,
+            workflowMode: null,
+            lifecycle: 'complete',
+            progress: null,
+            recommendation: {
+                skill: 'none',
+                reason: AUTHORITATIVE_COMPLETION_REASON,
+            },
+        };
+    }
+    if (record.status === 'complete') {
+        return {
+            kind: 'recorded-terminal',
+            name: record.slug,
+            path,
+            scope: 'synced',
+            checkout: 'absent',
+            terminalState: 'legacy-completion',
+            archiveSnapshot: record.archiveSnapshot ?? null,
+            phase: null,
+            phaseStatus: null,
+            workflowMode: null,
+            lifecycle: 'complete',
+            progress: null,
+            recommendation: {
+                skill: 'none',
+                reason: record.archiveSnapshot
+                    ? RETIREMENT_RETRY_REASON
+                    : ARCHIVE_RETRY_REASON,
+            },
+        };
+    }
+    return {
+        kind: 'recorded-absent',
+        name: record.slug,
+        path,
+        scope: 'synced',
+        checkout: 'absent',
+        phase: null,
+        phaseStatus: null,
+        workflowMode: null,
+        lifecycle: null,
+        progress: null,
+        recommendation: {
+            skill: 'oat project pull',
+            reason: 'checkout absent',
+        },
+    };
+}
+export async function probeAuthoritativeCompletedRef(target, git) {
+    const completedRef = completedSyncedRefName(target.slug);
+    const lookup = await git.run(['ls-remote', '--exit-code', target.remote, completedRef], { cwd: target.repoRoot, allowFailure: true });
+    if (classifyRemoteRefLookup(lookup, target.remote, completedRef) === 'absent') {
+        return null;
+    }
+    const rows = lookup.stdout.split('\n').filter(Boolean);
+    const [sha, ref] = rows[0]?.trim().split(/\s+/) ?? [];
+    if (rows.length !== 1 ||
+        ref !== completedRef ||
+        !/^(?:[0-9a-f]{40}|[0-9a-f]{64})$/i.test(sha ?? '')) {
+        throw new CliError(`Unable to reconcile completed authority for ${target.slug}: origin returned a malformed completed-ref advertisement.`, 2);
+    }
+    return probeSyncedTerminalRefs(target, sha, git);
+}
+function classifyMaterializedTerminalRow(row, probe) {
+    const record = {
+        schemaVersion: 1,
+        slug: row.name,
+        scope: 'synced',
+        ref: probe.activeRef,
+        remote: 'origin',
+        status: 'active',
+        createdAt: new Date(0).toISOString(),
+        completedAt: null,
+    };
+    const classified = classifyLegacySyncedRecord(record, row.path, probe);
+    return classified.kind === 'recorded-terminal'
+        ? { ...classified, checkout: 'present' }
+        : classified;
+}
 function displayPath(repoRoot, absolutePath) {
     return relative(repoRoot, absolutePath).split(sep).join('/');
 }
@@ -152,9 +283,6 @@ async function collectProjectRows(repoRoot, projectsRoot, options, context, depe
             })));
         }
         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);
@@ -191,24 +319,24 @@ async function collectProjectRows(repoRoot, projectsRoot, options, context, depe
                     context.logger.warn(`Skipping invalid synced project record ${displayPath(repoRoot, path)}: ${message}`);
                 },
             });
+            for (const row of rows.filter((candidate) => candidate.scope === 'synced' && candidate.kind === 'materialized')) {
+                const target = buildSyncTarget(repoRoot, projectsRoot, row.name);
+                const probe = await dependencies.probeAuthoritativeCompletedRef(target, dependencies.gitRunner);
+                if (!probe)
+                    continue;
+                const index = rows.indexOf(row);
+                rows[index] = classifyMaterializedTerminalRow(row, probe);
+            }
+            const represented = new Set(rows.filter((row) => row.scope === 'synced').map((row) => row.name));
             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',
-                        },
-                    });
+                if (!represented.has(record.slug)) {
+                    const target = buildSyncTarget(repoRoot, projectsRoot, record.slug);
+                    const authoritative = await dependencies.probeAuthoritativeCompletedRef(target, dependencies.gitRunner);
+                    const probe = authoritative ??
+                        (record.archiveSourceRefSha
+                            ? await dependencies.probeSyncedTerminalRefs(target, record.archiveSourceRefSha, dependencies.gitRunner)
+                            : undefined);
+                    rows.push(classifyLegacySyncedRecord(record, displayPath(repoRoot, join(root.path, record.slug)), probe));
                 }
             }
         }
@@ -217,26 +345,74 @@ async function collectProjectRows(repoRoot, projectsRoot, options, context, depe
         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 });
+    const remote = await dependencies.gitRunner.run(['ls-remote', 'origin', 'refs/oat/projects/*', 'refs/oat/completed/*'], { 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));
+    const refs = new Map();
     for (const line of remote.stdout.split('\n')) {
-        const [, ref] = line.trim().split(/\s+/);
-        if (!ref?.startsWith('refs/oat/projects/'))
+        const [sha, ref] = line.trim().split(/\s+/);
+        const activePrefix = 'refs/oat/projects/';
+        const completedPrefix = 'refs/oat/completed/';
+        const prefix = ref?.startsWith(activePrefix)
+            ? activePrefix
+            : ref?.startsWith(completedPrefix)
+                ? completedPrefix
+                : null;
+        if (!sha || !ref || !prefix)
+            continue;
+        const name = ref.slice(prefix.length);
+        if (!name)
+            continue;
+        const entry = refs.get(name) ?? {};
+        if (prefix === activePrefix) {
+            entry.activeRef = ref;
+            entry.activeSha = sha;
+        }
+        else {
+            entry.completedRef = ref;
+            entry.completedSha = sha;
+        }
+        refs.set(name, entry);
+    }
+    for (const [name, refState] of refs) {
+        if (localSlugs.has(name) || !refState.activeRef)
+            continue;
+        if (refState.completedRef && refState.completedSha === refState.activeSha) {
             continue;
-        const name = ref.slice('refs/oat/projects/'.length);
-        if (!name || localSlugs.has(name))
+        }
+        if (refState.completedRef && refState.completedSha && refState.activeSha) {
+            rows.push({
+                kind: 'terminal-invalid',
+                name,
+                scope: 'synced',
+                checkout: 'invalid',
+                terminalState: 'ref-sha-mismatch',
+                activeRef: refState.activeRef,
+                completedRef: refState.completedRef,
+                activeSha: refState.activeSha,
+                completedSha: refState.completedSha,
+                phase: null,
+                phaseStatus: null,
+                workflowMode: null,
+                lifecycle: 'complete',
+                progress: null,
+                recommendation: {
+                    skill: 'none',
+                    reason: terminalMismatchReason(refState.activeSha, refState.completedSha),
+                },
+            });
             continue;
+        }
         rows.push({
             kind: 'remote',
             name,
             scope: 'synced',
             origin: 'remote',
             checkout: 'absent',
-            ref,
+            ref: refState.activeRef,
             phase: null,
             phaseStatus: null,
             workflowMode: null,

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

@@ -1,5 +1,6 @@
 import { readFile as defaultReadFile, writeFile as defaultWriteFile } from 'node:fs/promises';
 import { buildCommandContext, type CommandContext } from '../../../app/command-context.js';
+import { guardSyncedTerminalTarget } from '../../project/pull/index.js';
 import { type GitRunner } from '../../project/sync/git.js';
 import { readSyncedRecord } from '../../project/sync/record.js';
 import { commitRecordChange as defaultCommitRecordChange, type PullResult, type PushResult, type AdoptionRecordState, type SyncTarget } from '../../project/sync/ref-sync.js';
@@ -12,6 +13,7 @@ interface ProjectOpenDependencies {
     buildCommandContext: (options: Parameters<typeof buildCommandContext>[0]) => CommandContext;
     resolveProjectRoot: (cwd: string) => Promise<string>;
     resolveProjectsRoot: (repoRoot: string, env: NodeJS.ProcessEnv) => Promise<string>;
+    guardSyncedTerminalTarget: typeof guardSyncedTerminalTarget;
     readOatLocalConfig: (repoRoot: string) => Promise<OatLocalConfig>;
     writeOatLocalConfig: (repoRoot: string, config: OatLocalConfig) => Promise<void>;
     setActiveProject: (repoRoot: string, path: string) => Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/open/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,IAAI,eAAe,EAC3B,SAAS,IAAI,gBAAgB,EAC9B,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,mBAAmB,EAAE,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAChF,OAAO,EAAoB,KAAK,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EACL,kBAAkB,IAAI,yBAAyB,EAG/C,KAAK,UAAU,EACf,KAAK,UAAU,EACf,KAAK,mBAAmB,EACxB,KAAK,UAAU,EAChB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,mBAAmB,EAEpB,MAAM,uCAAuC,CAAC;AAmB/C,OAAO,EAEL,KAAK,mBAAmB,EACzB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,KAAK,cAAc,EAIpB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAG/C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMpC,UAAU,uBAAuB;IAC/B,mBAAmB,EAAE,CACnB,OAAO,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC,CAAC,CAAC,KAC/C,cAAc,CAAC;IACpB,kBAAkB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACrD,mBAAmB,EAAE,CACnB,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,CAAC,UAAU,KACnB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,kBAAkB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;IAClE,mBAAmB,EAAE,CACnB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,KACnB,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,gBAAgB,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpE,sBAAsB,EAAE,CAAC,OAAO,EAAE;QAChC,QAAQ,EAAE,MAAM,CAAC;KAClB,KAAK,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACnC,QAAQ,EAAE,OAAO,eAAe,CAAC;IACjC,SAAS,EAAE,OAAO,gBAAgB,CAAC;IACnC,SAAS,EAAE,OAAO,SAAS,CAAC;IAC5B,UAAU,EAAE,OAAO,UAAU,CAAC;IAC9B,gBAAgB,EAAE,OAAO,gBAAgB,CAAC;IAC1C,mBAAmB,EAAE,OAAO,mBAAmB,CAAC;IAChD,UAAU,EAAE,CACV,MAAM,EAAE,UAAU,EAClB,GAAG,EAAE,SAAS,EACd,OAAO,CAAC,EAAE;QACR,KAAK,CAAC,EAAE,OAAO,CAAC;QAChB,cAAc,CAAC,EAAE,mBAAmB,CAAC;QACrC,GAAG,CAAC,EAAE,IAAI,CAAC;KACZ,KACE,OAAO,CAAC,UAAU,CAAC,CAAC;IACzB,UAAU,EAAE,CACV,MAAM,EAAE,UAAU,EAClB,GAAG,EAAE,SAAS,EACd,OAAO,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,KAC1B,OAAO,CAAC,UAAU,CAAC,CAAC;IACzB,kBAAkB,EAAE,OAAO,yBAAyB,CAAC;IACrD,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC;IAC9B,GAAG,EAAE,MAAM,IAAI,CAAC;CACjB;AAgXD,wBAAgB,wBAAwB,CACtC,SAAS,GAAE,OAAO,CAAC,uBAAuB,CAAM,GAC/C,OAAO,CAkBT"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/open/index.ts"],"names":[],"mappings":"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"}

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

@@ -1,6 +1,7 @@
 import { readFile as defaultReadFile, writeFile as defaultWriteFile, } from 'node:fs/promises';
 import { basename, isAbsolute, join, relative, resolve, sep } from 'node:path';
 import { buildCommandContext } from '../../../app/command-context.js';
+import { guardSyncedTerminalTarget } from '../../project/pull/index.js';
 import { defaultGitRunner } from '../../project/sync/git.js';
 import { readSyncedRecord } from '../../project/sync/record.js';
 import { commitRecordChange as defaultCommitRecordChange, pullSynced as defaultPullSynced, pushSynced as defaultPushSynced, } from '../../project/sync/ref-sync.js';
@@ -21,6 +22,7 @@ const DEFAULT_DEPENDENCIES = {
     buildCommandContext,
     resolveProjectRoot,
     resolveProjectsRoot,
+    guardSyncedTerminalTarget,
     readOatLocalConfig,
     writeOatLocalConfig,
     setActiveProject,
@@ -77,7 +79,18 @@ async function resolveProject(repoRoot, projectsRoot, input, dependencies) {
         const projectName = basename(fullProjectPath);
         let syncTarget;
         if (scope === 'synced') {
-            syncTarget = await dependencies.resolveSyncedTarget({ repoRoot, env: dependencies.processEnv }, fullProjectPath, {}, { allowMissingCheckout: true });
+            try {
+                syncTarget = await dependencies.resolveSyncedTarget({ repoRoot, env: dependencies.processEnv }, fullProjectPath, {}, { allowMissingCheckout: true });
+            }
+            catch (error) {
+                if (error instanceof CliError &&
+                    error.exitCode === 1 &&
+                    error.message.startsWith('No synced project named ')) {
+                    await dependencies.guardSyncedTerminalTarget(repoRoot, projectsRoot, input, 'open', dependencies.gitRunner);
+                }
+                throw error;
+            }
+            await dependencies.guardSyncedTerminalTarget(repoRoot, projectsRoot, input, 'open', dependencies.gitRunner);
             if (!(await dependencies.dirExists(fullProjectPath)) ||
                 syncTarget.adopt) {
                 await materializeSyncedProject(repoRoot, syncTarget, dependencies);
@@ -124,12 +137,14 @@ async function resolveProject(repoRoot, projectsRoot, input, dependencies) {
         }
         catch (error) {
             if (error instanceof CliError && error.exitCode === 1) {
+                await dependencies.guardSyncedTerminalTarget(repoRoot, projectsRoot, input, 'open', dependencies.gitRunner);
                 throw new CliError(`Project not found: ${input}`, 1);
             }
             throw error;
         }
     }
     if (candidate.scope === 'synced') {
+        await dependencies.guardSyncedTerminalTarget(repoRoot, projectsRoot, input, 'open', dependencies.gitRunner);
         syncTarget ??= await dependencies.resolveSyncedTarget({ repoRoot, env: dependencies.processEnv }, candidate.fullProjectPath, {}, { allowMissingCheckout: true });
         if (!candidate.present || syncTarget.adopt) {
             await materializeSyncedProject(repoRoot, syncTarget, dependencies);

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

@@ -1,21 +1,27 @@
 import { type CommandContext, type GlobalOptions } from '../../../app/command-context.js';
 import { type GitRunner } from '../../project/sync/git.js';
-import { type PruneResult, type SyncTarget } from '../../project/sync/ref-sync.js';
-import { resolveSyncedTarget } from '../../project/sync/resolve-target.js';
+import { deleteCompletedSyncedRefForPrune, type PruneResult, type SyncTarget } from '../../project/sync/ref-sync.js';
+import { resolveSyncedTarget, type SyncedTerminalRefProbe } from '../../project/sync/resolve-target.js';
+import { resolveProjectsRoot } from '../../shared/oat-paths.js';
 import { Command } from 'commander';
 interface ProjectPruneDependencies {
     buildCommandContext: (options: GlobalOptions) => CommandContext;
     resolveProjectRoot: (cwd: string) => Promise<string>;
+    resolveProjectsRoot: typeof resolveProjectsRoot;
     resolveSyncedTarget: typeof resolveSyncedTarget;
+    inspectTerminalRefs: typeof inspectTerminalRefs;
+    deleteCompletedSyncedRefForPrune: typeof deleteCompletedSyncedRefForPrune;
     pruneSynced: (target: SyncTarget, git: GitRunner, options: {
         force: boolean;
         commit: boolean;
+        expectedActiveAliasSha?: string;
     }) => Promise<PruneResult>;
-    readProjectState: (target: SyncTarget, git: GitRunner) => Promise<string | null>;
+    readProjectState: (target: SyncTarget, git: GitRunner, ref?: string) => Promise<string | null>;
     gitRunner: GitRunner;
     processEnv: NodeJS.ProcessEnv;
 }
-export declare function readPruneProjectState(target: SyncTarget, git: GitRunner): Promise<string | null>;
+export declare function readPruneProjectState(target: SyncTarget, git: GitRunner, ref?: string): Promise<string | null>;
+export declare function inspectTerminalRefs(target: SyncTarget, git: GitRunner): Promise<SyncedTerminalRefProbe | null>;
 export declare function createProjectPruneCommand(overrides?: Partial<ProjectPruneDependencies>): Command;
 export {};
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/prune/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAoB,KAAK,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAE9E,OAAO,EAEL,KAAK,WAAW,EAChB,KAAK,UAAU,EAChB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAS5E,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAOpC,UAAU,wBAAwB;IAChC,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,WAAW,EAAE,CACX,MAAM,EAAE,UAAU,EAClB,GAAG,EAAE,SAAS,EACd,OAAO,EAAE;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE,KACzC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC1B,gBAAgB,EAAE,CAChB,MAAM,EAAE,UAAU,EAClB,GAAG,EAAE,SAAS,KACX,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC5B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC;CAC/B;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,UAAU,EAClB,GAAG,EAAE,SAAS,GACb,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA+BxB;AAmED,wBAAgB,yBAAyB,CACvC,SAAS,GAAE,OAAO,CAAC,wBAAwB,CAAM,GAChD,OAAO,CAmBT"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/prune/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAoB,KAAK,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAE9E,OAAO,EAGL,gCAAgC,EAEhC,KAAK,WAAW,EAChB,KAAK,UAAU,EAChB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAEL,mBAAmB,EACnB,KAAK,sBAAsB,EAC5B,MAAM,uCAAuC,CAAC;AAK/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAUjE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAOpC,UAAU,wBAAwB;IAChC,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,mBAAmB,EAAE,OAAO,mBAAmB,CAAC;IAChD,mBAAmB,EAAE,OAAO,mBAAmB,CAAC;IAChD,gCAAgC,EAAE,OAAO,gCAAgC,CAAC;IAC1E,WAAW,EAAE,CACX,MAAM,EAAE,UAAU,EAClB,GAAG,EAAE,SAAS,EACd,OAAO,EAAE;QACP,KAAK,EAAE,OAAO,CAAC;QACf,MAAM,EAAE,OAAO,CAAC;QAChB,sBAAsB,CAAC,EAAE,MAAM,CAAC;KACjC,KACE,OAAO,CAAC,WAAW,CAAC,CAAC;IAC1B,gBAAgB,EAAE,CAChB,MAAM,EAAE,UAAU,EAClB,GAAG,EAAE,SAAS,EACd,GAAG,CAAC,EAAE,MAAM,KACT,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC5B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC;CAC/B;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,UAAU,EAClB,GAAG,EAAE,SAAS,EACd,GAAG,SAAa,GACf,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA+BxB;AAyCD,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,UAAU,EAClB,GAAG,EAAE,SAAS,GACb,OAAO,CAAC,sBAAsB,GAAG,IAAI,CAAC,CA+BxC;AAgGD,wBAAgB,yBAAyB,CACvC,SAAS,GAAE,OAAO,CAAC,wBAAwB,CAAM,GAChD,OAAO,CAmBT"}