@open-agent-toolkit/cli 0.2.50 → 0.2.51

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

@@ -2,10 +2,65 @@ 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 { assertValidProjectSlug, completedSyncedRefName, 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 remoteTerminalRefShas(target, activeRef, completedRef, git) {
+    const result = await git.run(['ls-remote', '--exit-code', target.remote, activeRef, completedRef], { cwd: target.repoRoot, allowFailure: true });
+    if (classifyRemoteRefLookup(result, target.remote, `${activeRef} and ${completedRef}`) === 'absent') {
+        return { activeSha: null, completedSha: null };
+    }
+    const requestedRefs = new Set([activeRef, completedRef]);
+    const advertised = new Map();
+    const rows = result.stdout.split('\n').filter((row) => row.length > 0);
+    if (rows.length === 0) {
+        throw new CliError(`Unable to verify terminal refs for ${target.slug}: git ls-remote returned a malformed empty advertisement.`, 2);
+    }
+    for (const row of rows) {
+        const fields = row.trim().split(/\s+/);
+        if (fields.length !== 2 ||
+            !/^(?:[0-9a-f]{40}|[0-9a-f]{64})$/i.test(fields[0] ?? '')) {
+            throw new CliError(`Unable to verify terminal refs for ${target.slug}: git ls-remote returned a malformed row.`, 2);
+        }
+        const [sha, ref] = fields;
+        if (!requestedRefs.has(ref)) {
+            throw new CliError(`Unable to verify terminal refs for ${target.slug}: git ls-remote returned unexpected ref ${ref}.`, 2);
+        }
+        if (advertised.has(ref)) {
+            throw new CliError(`Unable to verify terminal refs for ${target.slug}: git ls-remote returned duplicate rows for ${ref}.`, 2);
+        }
+        advertised.set(ref, sha);
+    }
+    return {
+        activeSha: advertised.get(activeRef) ?? null,
+        completedSha: advertised.get(completedRef) ?? null,
+    };
+}
+export async function probeSyncedTerminalRefs(target, expectedSha, git) {
+    const activeRef = target.ref;
+    const completedRef = completedSyncedRefName(target.slug);
+    const { activeSha, completedSha } = await remoteTerminalRefShas(target, activeRef, completedRef, git);
+    const wrongSha = (activeSha !== null && activeSha !== expectedSha) ||
+        (completedSha !== null && completedSha !== expectedSha);
+    const state = wrongSha
+        ? 'wrong-sha'
+        : activeSha !== null && completedSha !== null
+            ? 'both'
+            : activeSha !== null
+                ? 'active-only'
+                : completedSha !== null
+                    ? 'completed-only'
+                    : 'absent';
+    return {
+        state,
+        activeRef,
+        completedRef,
+        expectedSha,
+        activeSha,
+        completedSha,
+    };
+}
 async function pathExists(path) {
     try {
         await stat(path);

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

@@ -1,6 +1,7 @@
 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 COMPLETED_SYNCED_REF_NAMESPACE = "refs/oat/completed";
 export declare const SYNCED_REMOTE = "origin";
 export declare function canonicalizePath(path: string): string;
 interface EffectiveConfigResult {
@@ -16,6 +17,7 @@ export declare function resolveScopeRoot(repoRoot: string, projectsRoot: 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 completedSyncedRefName(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>;

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

@@ -1 +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"}
+{"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,8BAA8B,uBAAuB,CAAC;AACnE,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,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAG3D;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

@@ -10,6 +10,7 @@ export const PROJECT_SCOPES = [
     'synced',
 ];
 export const SYNCED_REF_NAMESPACE = 'refs/oat/projects';
+export const COMPLETED_SYNCED_REF_NAMESPACE = 'refs/oat/completed';
 export const SYNCED_REMOTE = 'origin';
 const PROJECT_SLUG_PATTERN = /^[a-zA-Z0-9_-]+$/;
 export function canonicalizePath(path) {
@@ -69,6 +70,10 @@ export function syncedRefName(slug) {
     assertValidProjectSlug(slug);
     return `${SYNCED_REF_NAMESPACE}/${slug}`;
 }
+export function completedSyncedRefName(slug) {
+    assertValidProjectSlug(slug);
+    return `${COMPLETED_SYNCED_REF_NAMESPACE}/${slug}`;
+}
 export function syncedRecordPath(scopeRoot, slug) {
     assertValidProjectSlug(slug);
     return join(scopeRoot, `${slug}.json`);

package/dist/commands/state/generate.d.ts

@@ -1,3 +1,4 @@
+import { type GitRunner } from '../project/sync/git.js';
 export interface GitOperations {
     isGitRepo(root: string): boolean;
     diffFileCount(root: string, sha: string): number;
@@ -7,6 +8,7 @@ export interface GenerateStateOptions {
     env?: NodeJS.ProcessEnv;
     today?: string;
     git?: GitOperations;
+    gitRunner?: GitRunner;
 }
 export interface GenerateStateResult {
     dashboardPath: string;

package/dist/commands/state/generate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/commands/state/generate.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,aAAa;IAC5B,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IACjC,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CAClD;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,aAAa,CAAC;CACrB;AAED,MAAM,WAAW,mBAAmB;IAClC,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAiHD,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAEvE;AAydD,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,mBAAmB,CAAC,CA2C9B"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/commands/state/generate.ts"],"names":[],"mappings":"AAQA,OAAO,EAAoB,KAAK,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAU9E,MAAM,WAAW,aAAa;IAC5B,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IACjC,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CAClD;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,aAAa,CAAC;IACpB,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB;AAED,MAAM,WAAW,mBAAmB;IAClC,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAiHD,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAEvE;AAsgBD,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,mBAAmB,CAAC,CAkF9B"}

package/dist/commands/state/generate.js

@@ -1,8 +1,14 @@
 import { execSync } from 'node:child_process';
 import { readdir, writeFile } from 'node:fs/promises';
-import { basename, join } from 'node:path';
+import { basename, dirname, join, resolve } from 'node:path';
+import { classifyLegacySyncedRecord, probeAuthoritativeCompletedRef, } from '../project/list.js';
+import { defaultGitRunner } from '../project/sync/git.js';
+import { listSyncedRecords } from '../project/sync/record.js';
+import { buildSyncTarget } 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 { resolveScopeRoot } from '../shared/project-scope.js';
 import { readOatLocalConfig } from '../../config/oat-config.js';
 import { ensureDir, fileExists } from '../../fs/io.js';
 const defaultGit = {
@@ -310,22 +316,41 @@ function isTerminalCoordinationProject(kind, phase, phaseStatus) {
         phase === 'decomposition' &&
         phaseStatus === 'complete');
 }
-async function listAvailableProjects(repoRoot, projectsRoot) {
-    const fullRoot = join(repoRoot, projectsRoot);
-    try {
-        const entries = await readdir(fullRoot, { withFileTypes: true });
-        const dirs = entries.filter((e) => e.isDirectory());
-        if (dirs.length === 0) {
-            return {
-                active: '*(No projects found)*',
-                decompositions: '*(No decompositions found)*',
-            };
+async function listAvailableProjects(repoRoot, projectsRoot, gitRunner) {
+    const lines = [];
+    const decompositions = [];
+    const materializedSynced = new Set();
+    for (const scope of ['shared', 'synced', 'local']) {
+        const scopeRoot = resolveScopeRoot(repoRoot, projectsRoot, scope);
+        let entries;
+        try {
+            entries = await readdir(scopeRoot, { withFileTypes: true });
         }
-        const lines = [];
-        const decompositions = [];
-        for (const dir of dirs) {
-            const stateFile = join(fullRoot, dir.name, 'state.md');
+        catch {
+            continue;
+        }
+        for (const dir of entries.filter((entry) => entry.isDirectory())) {
+            const stateFile = join(scopeRoot, dir.name, 'state.md');
             if (await fileExists(stateFile)) {
+                if (scope === 'synced') {
+                    materializedSynced.add(dir.name);
+                    const target = buildSyncTarget(repoRoot, projectsRoot, dir.name);
+                    const terminal = await probeAuthoritativeCompletedRef(target, gitRunner);
+                    if (terminal) {
+                        const row = classifyLegacySyncedRecord({
+                            schemaVersion: 1,
+                            slug: dir.name,
+                            scope: 'synced',
+                            ref: target.ref,
+                            remote: 'origin',
+                            status: 'active',
+                            createdAt: new Date(0).toISOString(),
+                            completedAt: null,
+                        }, target.projectPath, terminal);
+                        lines.push(`- **${dir.name}** - ${row.recommendation.reason}`);
+                        continue;
+                    }
+                }
                 const phase = (await parseFrontmatterField(stateFile, 'oat_phase')) || 'unknown';
                 const phaseStatus = (await parseFrontmatterField(stateFile, 'oat_phase_status')) ||
                     'in_progress';
@@ -340,19 +365,29 @@ async function listAvailableProjects(repoRoot, projectsRoot) {
                 }
             }
         }
-        return {
-            active: lines.length > 0 ? lines.join('\n') : '*(No projects found)*',
-            decompositions: decompositions.length > 0
-                ? decompositions.join('\n')
-                : '*(No decompositions found)*',
-        };
     }
-    catch {
-        return {
-            active: '*(No projects directory found)*',
-            decompositions: '*(No decompositions found)*',
-        };
+    const syncedRoot = resolveScopeRoot(repoRoot, projectsRoot, 'synced');
+    const records = await listSyncedRecords(syncedRoot);
+    for (const record of records) {
+        if (materializedSynced.has(record.slug))
+            continue;
+        const target = buildSyncTarget(repoRoot, projectsRoot, record.slug);
+        const authoritative = await probeAuthoritativeCompletedRef(target, gitRunner);
+        const probe = authoritative ??
+            (record.archiveSourceRefSha
+                ? await probeSyncedTerminalRefs(target, record.archiveSourceRefSha, gitRunner)
+                : undefined);
+        const row = classifyLegacySyncedRecord(record, target.projectPath, probe);
+        lines.push(row.kind === 'recorded-absent'
+            ? `- **${record.slug}** - checkout absent; oat project pull ${record.slug}`
+            : `- **${record.slug}** - ${row.recommendation.reason}`);
     }
+    return {
+        active: lines.length > 0 ? lines.join('\n') : '*(No projects found)*',
+        decompositions: decompositions.length > 0
+            ? decompositions.join('\n')
+            : '*(No decompositions found)*',
+    };
 }
 function buildDashboardMarkdown(project, state, knowledge, staleness, nextStep, projectsList, generatedDate) {
     const timestamp = `${generatedDate}`;
@@ -453,18 +488,48 @@ export async function generateStateDashboard(options) {
     const env = options.env ?? process.env;
     const today = options.today ?? new Date().toISOString().slice(0, 10);
     const git = options.git ?? defaultGit;
+    const gitRunner = options.gitRunner ?? defaultGitRunner;
     const dashboardPath = join(repoRoot, '.oat', 'state.md');
     const projectsRoot = await resolveProjectsRoot(repoRoot, env);
     const hasProjects = await hasAnyProjects(join(repoRoot, projectsRoot));
     const project = await readActiveProject(repoRoot);
+    let terminalNextStep = null;
+    if (project.status === 'active' && project.path) {
+        const activePath = resolve(repoRoot, project.path);
+        const syncedRoot = resolveScopeRoot(repoRoot, projectsRoot, 'synced');
+        if (dirname(activePath) === syncedRoot) {
+            const target = buildSyncTarget(repoRoot, projectsRoot, project.name);
+            const terminal = await probeAuthoritativeCompletedRef(target, gitRunner);
+            if (terminal) {
+                const row = classifyLegacySyncedRecord({
+                    schemaVersion: 1,
+                    slug: project.name,
+                    scope: 'synced',
+                    ref: target.ref,
+                    remote: 'origin',
+                    status: 'active',
+                    createdAt: new Date(0).toISOString(),
+                    completedAt: null,
+                }, activePath, terminal);
+                project.status =
+                    row.kind === 'terminal-invalid'
+                        ? 'terminal ref mismatch'
+                        : 'terminal cleanup pending';
+                terminalNextStep = {
+                    step: 'oat-project-complete',
+                    reason: row.recommendation.reason,
+                };
+            }
+        }
+    }
     let state = null;
     if (project.status === 'active') {
         state = await readProjectState(repoRoot, project.path);
     }
     const knowledge = await readKnowledgeStatus(repoRoot);
     const staleness = calculateStaleness(knowledge, git, repoRoot, today);
-    const nextStep = computeNextStep(project, hasProjects, state);
-    const projectsList = await listAvailableProjects(repoRoot, projectsRoot);
+    const nextStep = terminalNextStep ?? computeNextStep(project, hasProjects, state);
+    const projectsList = await listAvailableProjects(repoRoot, projectsRoot, gitRunner);
     const markdown = buildDashboardMarkdown(project, state, knowledge, staleness, nextStep, projectsList, today);
     await ensureDir(join(repoRoot, '.oat'));
     await writeFile(dashboardPath, markdown, 'utf8');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-agent-toolkit/cli",
-  "version": "0.2.50",
+  "version": "0.2.51",
   "private": false,
   "description": "Open Agent Toolkit CLI",
   "homepage": "https://github.com/voxmedia/open-agent-toolkit/tree/main/packages/cli",
@@ -34,7 +34,7 @@
     "ora": "^9.0.0",
     "yaml": "2.8.2",
     "zod": "^3.25.76",
-    "@open-agent-toolkit/control-plane": "0.2.50"
+    "@open-agent-toolkit/control-plane": "0.2.51"
   },
   "devDependencies": {
     "@types/node": "^22.10.0",