@open-agent-toolkit/cli 0.2.40 → 0.2.45

package/dist/commands/project/sync/record.d.ts

@@ -0,0 +1,22 @@
+import { SYNCED_REMOTE } from '../../shared/project-scope.js';
+import { z } from 'zod';
+export interface SyncedProjectRecord {
+    schemaVersion: 1;
+    slug: string;
+    scope: 'synced';
+    ref: string;
+    remote: typeof SYNCED_REMOTE;
+    status: 'active' | 'complete';
+    createdAt: string;
+    completedAt: string | null;
+    archiveSnapshot?: string;
+    archiveSourceRefSha?: string;
+}
+export declare const SyncedProjectRecordSchema: z.ZodType<SyncedProjectRecord>;
+export declare function buildSyncedRecord(slug: string, now: Date): SyncedProjectRecord;
+export declare function readSyncedRecord(path: string): Promise<SyncedProjectRecord | null>;
+export declare function writeSyncedRecord(path: string, record: SyncedProjectRecord): Promise<void>;
+export declare function listSyncedRecords(scopeRoot: string, options?: {
+    onInvalid?: (path: string, error: unknown) => void;
+}): Promise<SyncedProjectRecord[]>;
+//# sourceMappingURL=record.d.ts.map

package/dist/commands/project/sync/record.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"record.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/sync/record.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAiB,MAAM,gCAAgC,CAAC;AAE9E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,WAAW,mBAAmB;IAClC,aAAa,EAAE,CAAC,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,QAAQ,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,OAAO,aAAa,CAAC;IAC7B,MAAM,EAAE,QAAQ,GAAG,UAAU,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAMD,eAAO,MAAM,yBAAyB,EAAE,CAAC,CAAC,OAAO,CAAC,mBAAmB,CAoCjE,CAAC;AAEL,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,IAAI,GACR,mBAAmB,CAWrB;AA8BD,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAuBrC;AAED,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,IAAI,CAAC,CAIf;AAED,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE;IACP,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;CAC/C,GACL,OAAO,CAAC,mBAAmB,EAAE,CAAC,CA4BhC"}

package/dist/commands/project/sync/record.js

@@ -0,0 +1,133 @@
+import { mkdir, readFile, readdir, writeFile } from 'node:fs/promises';
+import { basename, dirname, extname, join } from 'node:path';
+import { SYNCED_REMOTE, syncedRefName } from '../../shared/project-scope.js';
+import { CliError } from '../../../errors/cli-error.js';
+import { z } from 'zod';
+const schemaVersion = z.custom((value) => value === 1, {
+    message: 'Unsupported schemaVersion; upgrade OAT before reading this record',
+});
+export const SyncedProjectRecordSchema = z
+    .object({
+    schemaVersion,
+    slug: z.string().min(1),
+    scope: z.literal('synced'),
+    ref: z.string().min(1),
+    remote: z.literal(SYNCED_REMOTE),
+    status: z.enum(['active', 'complete']),
+    createdAt: z.string().datetime(),
+    completedAt: z.string().datetime().nullable(),
+    archiveSnapshot: z.string().min(1).optional(),
+    archiveSourceRefSha: z
+        .string()
+        .regex(/^[0-9a-f]{40}$/)
+        .optional(),
+})
+    .strict()
+    .superRefine((record, context) => {
+    let expectedRef;
+    try {
+        expectedRef = syncedRefName(record.slug);
+    }
+    catch {
+        context.addIssue({
+            code: z.ZodIssueCode.custom,
+            path: ['slug'],
+            message: 'Record slug is not a valid synced project slug',
+        });
+        return;
+    }
+    if (record.ref !== expectedRef) {
+        context.addIssue({
+            code: z.ZodIssueCode.custom,
+            path: ['ref'],
+            message: `Record ref must match slug (${expectedRef})`,
+        });
+    }
+});
+export function buildSyncedRecord(slug, now) {
+    return SyncedProjectRecordSchema.parse({
+        schemaVersion: 1,
+        slug,
+        scope: 'synced',
+        ref: syncedRefName(slug),
+        remote: SYNCED_REMOTE,
+        status: 'active',
+        createdAt: now.toISOString(),
+        completedAt: null,
+    });
+}
+function recordSlugFromPath(path) {
+    return basename(path, extname(path));
+}
+function recordRecovery() {
+    return `Restore this exact record from a trusted Git revision before retrying. Do not delete or quarantine it to trigger pull adoption: regeneration creates an active record and can discard lifecycle fields such as status, completedAt, and archiveSnapshot. If no trusted Git copy exists, repair those fields losslessly before continuing.`;
+}
+function parseRecord(path, value) {
+    const result = SyncedProjectRecordSchema.safeParse(value);
+    if (!result.success) {
+        throw new CliError(`Invalid synced project record ${path}: ${result.error.issues
+            .map((issue) => issue.message)
+            .join('; ')} ${recordRecovery()}`, 1);
+    }
+    const filenameSlug = recordSlugFromPath(path);
+    if (result.data.slug !== filenameSlug) {
+        throw new CliError(`Synced project record filename slug "${filenameSlug}" does not match record slug "${result.data.slug}". ${recordRecovery()}`, 1);
+    }
+    return result.data;
+}
+export async function readSyncedRecord(path) {
+    let content;
+    try {
+        content = await readFile(path, 'utf8');
+    }
+    catch (error) {
+        if (error instanceof Error && 'code' in error && error.code === 'ENOENT') {
+            return null;
+        }
+        throw error;
+    }
+    try {
+        return parseRecord(path, JSON.parse(content));
+    }
+    catch (error) {
+        if (error instanceof CliError) {
+            throw error;
+        }
+        const message = error instanceof Error ? error.message : String(error);
+        throw new CliError(`Invalid JSON in synced project record ${path}: ${message} ${recordRecovery()}`, 1);
+    }
+}
+export async function writeSyncedRecord(path, record) {
+    const validated = parseRecord(path, record);
+    await mkdir(dirname(path), { recursive: true });
+    await writeFile(path, `${JSON.stringify(validated, null, 2)}\n`, 'utf8');
+}
+export async function listSyncedRecords(scopeRoot, options = {}) {
+    let entries;
+    try {
+        entries = await readdir(scopeRoot, { withFileTypes: true });
+    }
+    catch (error) {
+        if (error instanceof Error && 'code' in error && error.code === 'ENOENT') {
+            return [];
+        }
+        throw error;
+    }
+    const records = await Promise.all(entries
+        .filter((entry) => entry.isFile() && entry.name.endsWith('.json'))
+        .map(async (entry) => {
+        const path = join(scopeRoot, entry.name);
+        try {
+            return await readSyncedRecord(path);
+        }
+        catch (error) {
+            if (!options.onInvalid)
+                throw error;
+            options.onInvalid(path, error);
+            return null;
+        }
+    }));
+    return records
+        .filter((record) => record !== null)
+        .sort((left, right) => left.slug.localeCompare(right.slug));
+}

package/dist/commands/project/sync/ref-sync.d.ts

@@ -0,0 +1,120 @@
+import { ensureScopedRootGitignore } from '../../init/gitignore.js';
+import { readOatLocalConfig, writeOatLocalConfig } from '../../../config/oat-config.js';
+import { copyDirectory } from '../../../fs/io.js';
+import type { GitRunner } from './git.js';
+export interface SyncTarget {
+    repoRoot: string;
+    sharedRoot: string;
+    syncedRoot: string;
+    slug: string;
+    projectPath: string;
+    ref: string;
+    remote: string;
+}
+export interface SyncTargetIdentityOptions {
+    pathExists?: (path: string) => Promise<boolean>;
+    realpath?: (path: string) => Promise<string>;
+    exitCode?: 1 | 2;
+}
+export interface AllowlistedPathspecOptions {
+    summaryExportPath?: string | null;
+    projectRoots: Pick<SyncTarget, 'sharedRoot' | 'syncedRoot'>;
+    recapExportRoot?: string | null;
+}
+export type PushResult = {
+    status: 'pushed' | 'up-to-date' | 'rejected' | 'conflict';
+    sha: string;
+    conflicts?: string[];
+    remoteBeforePushSha?: string | null;
+};
+export type PullResult = {
+    status: 'created' | 'updated' | 'up-to-date' | 'conflict' | 'dirty';
+    sha: string;
+    conflicts?: string[];
+    adopted?: boolean;
+    adoptionRecordOwnership?: 'created' | 'existing';
+    pendingRecordPaths?: string[];
+};
+export type AdoptionRecordState = 'create' | 'pending' | 'durable';
+export interface PullChildResult {
+    slug: string;
+    status: PullResult['status'] | 'missing' | 'error';
+    sha?: string;
+    conflicts?: string[];
+    adopted?: boolean;
+    pendingRecordPaths?: string[];
+    message?: string;
+    exitCode?: 1 | 2;
+}
+export type CheckoutPreflight = {
+    status: 'clean' | 'dirty' | 'unpushed' | 'absent';
+    sha?: string;
+};
+export type RemoveResult = {
+    status: 'removed' | 'absent' | 'dirty' | 'unpushed';
+};
+export type PruneResult = {
+    status: 'pruned';
+    lifecycleCommit: string | null;
+};
+export type MigrateResult = {
+    status: 'migrated';
+    lifecycleCommit: string | null;
+    sha: string;
+};
+export declare function classifyRemoteRefLookup(result: {
+    code: number;
+    stdout: string;
+    stderr: string;
+}, remote: string, ref: string): 'present' | 'absent';
+export interface MigrateSharedToSyncedOptions {
+    sourcePath: string;
+    commit: boolean;
+    now?: Date;
+    copyDirectory?: typeof copyDirectory;
+    ensureScopedRootGitignore?: typeof ensureScopedRootGitignore;
+    readOatLocalConfig?: typeof readOatLocalConfig;
+    writeOatLocalConfig?: typeof writeOatLocalConfig;
+    afterBranchCommit?: () => Promise<void>;
+}
+export declare function classifyAdoptionRecord(target: SyncTarget, git: GitRunner): Promise<AdoptionRecordState>;
+export declare function assertConfinedMigrationSource(target: SyncTarget, sourcePath: string): Promise<void>;
+export declare function buildSyncTarget(repoRoot: string, projectsRoot: string, slug: string): SyncTarget;
+export declare function assertCanonicalSyncTargetIdentity(target: SyncTarget, options?: SyncTargetIdentityOptions): Promise<boolean>;
+export declare function createSyncedProject(target: SyncTarget, git: GitRunner): Promise<void>;
+export declare function pendingRebaseConflicts(target: SyncTarget, git: GitRunner): Promise<string[] | null>;
+export declare function pushSynced(target: SyncTarget, git: GitRunner, options: {
+    message?: string;
+}): Promise<PushResult>;
+export declare function pullSynced(target: SyncTarget, git: GitRunner, options?: {
+    adopt?: boolean;
+    adoptionRecord?: AdoptionRecordState;
+    now?: Date;
+}): Promise<PullResult>;
+export declare function pullChildren(parentTarget: SyncTarget, git: GitRunner): Promise<PullChildResult[]>;
+export declare function continueSynced(target: SyncTarget, git: GitRunner, options?: {
+    adopt?: boolean;
+    adoptionRecord?: AdoptionRecordState;
+    now?: Date;
+}): Promise<PullResult>;
+export declare function abortSynced(target: SyncTarget, git: GitRunner): Promise<void>;
+export declare function commitRecordChange(repoRoot: string, pathspecs: string[], message: string, git: GitRunner, options: AllowlistedPathspecOptions): Promise<{
+    sha: string;
+} | null>;
+export declare function preflightSyncedCheckout(target: SyncTarget, git: GitRunner): Promise<CheckoutPreflight>;
+export declare function removeSyncedCheckout(target: SyncTarget, git: GitRunner, options?: {
+    force?: boolean;
+}): Promise<RemoveResult>;
+export declare function pruneSynced(target: SyncTarget, git: GitRunner, options: {
+    force: boolean;
+    commit: boolean;
+}): Promise<PruneResult>;
+export declare function migrateSharedToSynced(target: SyncTarget, git: GitRunner, options: MigrateSharedToSyncedOptions): Promise<MigrateResult>;
+/**
+ * Compensate only a synced checkout/ref created by the current invocation.
+ * Callers must establish that ownership before invoking this helper.
+ */
+export declare function rollbackCreatedSyncedProject(target: SyncTarget, git: GitRunner): Promise<void>;
+export declare function assertNestedWorktree(target: SyncTarget, git: GitRunner): Promise<void>;
+export declare function assertAllowlistedPathspecs(repoRoot: string, pathspecs: string[], options: AllowlistedPathspecOptions): void;
+//# sourceMappingURL=ref-sync.d.ts.map

package/dist/commands/project/sync/ref-sync.d.ts.map

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