ctx-sync 1.0.0

package/dist/commands/note.js

@@ -0,0 +1,411 @@
+/**
+ * `ctx-sync note <project>` command.
+ *
+ * Records and updates mental context for a project — the "23-minute
+ * problem" solution. Prompts the user for current task, blockers,
+ * next steps, related links, and breadcrumbs, then encrypts and
+ * stores them in `mental-context.age`.
+ *
+ * Supports both interactive (prompt-based) and non-interactive
+ * (flag-based) input modes. When updating, existing context is
+ * merged — not overwritten — so incremental notes accumulate.
+ *
+ * @module commands/note
+ */
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import { withErrorHandler } from '../utils/errors.js';
+import { STATE_FILES } from '@ctx-sync/shared';
+import { identityToRecipient } from 'age-encryption';
+import { loadKey } from '../core/key-store.js';
+import { readState, writeState } from '../core/state-manager.js';
+import { commitState } from '../core/git-sync.js';
+import { getConfigDir, getSyncDir } from './init.js';
+/**
+ * Parse a file reference string into structured location data.
+ *
+ * Accepts formats:
+ *   - `file.ts`           → { file: 'file.ts', line: 0 }
+ *   - `file.ts:45`        → { file: 'file.ts', line: 45 }
+ *   - `file.ts:45:12`     → { file: 'file.ts', line: 45, column: 12 }
+ *
+ * @param fileRef - The file reference string.
+ * @returns Parsed location, or null if the string is empty.
+ */
+export function parseFileReference(fileRef) {
+    const trimmed = fileRef.trim();
+    if (!trimmed) {
+        return null;
+    }
+    // Match file:line:col or file:line or just file
+    const match = /^(.+?)(?::(\d+))?(?::(\d+))?$/.exec(trimmed);
+    if (!match?.[1]) {
+        return null;
+    }
+    const file = match[1];
+    const line = match[2] ? parseInt(match[2], 10) : 0;
+    const column = match[3] ? parseInt(match[3], 10) : undefined;
+    return { file, line, column };
+}
+/**
+ * Parse a link string into title and URL.
+ *
+ * Accepts formats:
+ *   - `https://example.com`            → { title: 'https://example.com', url: 'https://example.com' }
+ *   - `Title: https://example.com`     → { title: 'Title', url: 'https://example.com' }
+ *   - `Title - https://example.com`    → { title: 'Title', url: 'https://example.com' }
+ *
+ * @param linkStr - The link string.
+ * @returns Parsed link with title and URL.
+ */
+export function parseLink(linkStr) {
+    const trimmed = linkStr.trim();
+    // Try "Title: URL" or "Title - URL" format
+    const separatorMatch = /^(.+?)\s*[-:]\s*(https?:\/\/.+)$/i.exec(trimmed);
+    if (separatorMatch?.[1] && separatorMatch[2]) {
+        return { title: separatorMatch[1].trim(), url: separatorMatch[2].trim() };
+    }
+    // Just a URL — use it as both title and URL
+    return { title: trimmed, url: trimmed };
+}
+/**
+ * Create a default empty mental context structure.
+ *
+ * @returns A blank ProjectMentalContext.
+ */
+export function createEmptyContext() {
+    return {
+        currentTask: '',
+        blockers: [],
+        nextSteps: [],
+        relatedLinks: [],
+        breadcrumbs: [],
+    };
+}
+/**
+ * Merge new input into an existing mental context.
+ *
+ * Follows merge-not-overwrite semantics:
+ *   - `currentTask` is replaced if new input provides one.
+ *   - `lastWorkingOn` is replaced if new input provides one.
+ *   - Blockers, next steps, links, and breadcrumbs are appended.
+ *   - Duplicate blockers (by description) are skipped.
+ *   - Duplicate links (by URL) are skipped.
+ *
+ * @param existing - The existing mental context (or null for new).
+ * @param input - The new input to merge.
+ * @returns The merged context.
+ */
+export function mergeContext(existing, input) {
+    const base = existing ?? createEmptyContext();
+    const now = new Date().toISOString();
+    const merged = {
+        currentTask: input.currentTask?.trim() || base.currentTask,
+        lastWorkingOn: base.lastWorkingOn,
+        blockers: [...base.blockers],
+        nextSteps: [...base.nextSteps],
+        relatedLinks: [...base.relatedLinks],
+        breadcrumbs: [...base.breadcrumbs],
+    };
+    // Update lastWorkingOn if provided
+    if (input.lastWorkingOn) {
+        merged.lastWorkingOn = {
+            file: input.lastWorkingOn.file,
+            line: input.lastWorkingOn.line,
+            column: input.lastWorkingOn.column,
+            description: input.lastWorkingOn.description || '',
+            timestamp: now,
+        };
+    }
+    // Append new blockers (skip duplicates by description)
+    if (input.blockers) {
+        const existingDescriptions = new Set(merged.blockers.map((b) => b.description.toLowerCase()));
+        for (const desc of input.blockers) {
+            const trimmed = desc.trim();
+            if (trimmed && !existingDescriptions.has(trimmed.toLowerCase())) {
+                merged.blockers.push({
+                    description: trimmed,
+                    addedAt: now,
+                    priority: 'medium',
+                });
+                existingDescriptions.add(trimmed.toLowerCase());
+            }
+        }
+    }
+    // Append new next steps (skip exact duplicates)
+    if (input.nextSteps) {
+        const existingSteps = new Set(merged.nextSteps.map((s) => s.toLowerCase()));
+        for (const step of input.nextSteps) {
+            const trimmed = step.trim();
+            if (trimmed && !existingSteps.has(trimmed.toLowerCase())) {
+                merged.nextSteps.push(trimmed);
+                existingSteps.add(trimmed.toLowerCase());
+            }
+        }
+    }
+    // Append new related links (skip duplicates by URL)
+    if (input.relatedLinks) {
+        const existingUrls = new Set(merged.relatedLinks.map((l) => l.url));
+        for (const link of input.relatedLinks) {
+            if (link.url.trim() && !existingUrls.has(link.url.trim())) {
+                merged.relatedLinks.push({
+                    title: link.title.trim(),
+                    url: link.url.trim(),
+                });
+                existingUrls.add(link.url.trim());
+            }
+        }
+    }
+    // Append breadcrumb if provided
+    if (input.breadcrumb?.trim()) {
+        merged.breadcrumbs.push({
+            note: input.breadcrumb.trim(),
+            timestamp: now,
+        });
+    }
+    return merged;
+}
+/**
+ * Collect note input from interactive prompts.
+ *
+ * Shows the user their existing mental context (if any) and prompts
+ * for updates. Empty responses keep the existing values.
+ *
+ * @param existing - The existing mental context (or null).
+ * @returns The collected input.
+ */
+export async function collectNoteInput(existing) {
+    const Enquirer = (await import('enquirer')).default;
+    const enquirer = new Enquirer();
+    const input = {};
+    // Show existing context summary if available
+    if (existing?.currentTask) {
+        const chalk = (await import('chalk')).default;
+        console.log(chalk.dim(`\nCurrent task: "${existing.currentTask}"`));
+        if (existing.blockers.length > 0) {
+            console.log(chalk.dim(`Blockers: ${existing.blockers.map((b) => b.description).join(', ')}`));
+        }
+        if (existing.nextSteps.length > 0) {
+            console.log(chalk.dim(`Next steps: ${existing.nextSteps.join(', ')}`));
+        }
+        console.log('');
+    }
+    // Current task
+    const taskResponse = await enquirer.prompt({
+        type: 'input',
+        name: 'currentTask',
+        message: 'Current task:',
+        initial: existing?.currentTask ?? '',
+    });
+    if (taskResponse.currentTask?.trim()) {
+        input.currentTask = taskResponse.currentTask;
+    }
+    // Blockers
+    const blockerResponse = await enquirer.prompt({
+        type: 'input',
+        name: 'blockers',
+        message: 'Blockers (comma-separated, or press Enter to skip):',
+    });
+    if (blockerResponse.blockers?.trim()) {
+        input.blockers = blockerResponse.blockers
+            .split(',')
+            .map((b) => b.trim())
+            .filter(Boolean);
+    }
+    // Next steps
+    const stepsResponse = await enquirer.prompt({
+        type: 'input',
+        name: 'nextSteps',
+        message: 'Next steps (comma-separated, or press Enter to skip):',
+    });
+    if (stepsResponse.nextSteps?.trim()) {
+        input.nextSteps = stepsResponse.nextSteps
+            .split(',')
+            .map((s) => s.trim())
+            .filter(Boolean);
+    }
+    // Related links
+    const linksResponse = await enquirer.prompt({
+        type: 'input',
+        name: 'links',
+        message: 'Related links (comma-separated, or press Enter to skip):',
+    });
+    if (linksResponse.links?.trim()) {
+        input.relatedLinks = linksResponse.links
+            .split(',')
+            .map((l) => parseLink(l.trim()))
+            .filter((l) => l.url);
+    }
+    // Breadcrumb
+    const breadcrumbResponse = await enquirer.prompt({
+        type: 'input',
+        name: 'breadcrumb',
+        message: 'Breadcrumb note (or press Enter to skip):',
+    });
+    if (breadcrumbResponse.breadcrumb?.trim()) {
+        input.breadcrumb = breadcrumbResponse.breadcrumb;
+    }
+    return input;
+}
+/**
+ * Build NoteInput from CLI flags (non-interactive mode).
+ *
+ * @param options - The command-line options.
+ * @returns The constructed note input.
+ */
+export function buildInputFromFlags(options) {
+    const input = {};
+    if (options.task) {
+        input.currentTask = options.task;
+    }
+    if (options.blockers && options.blockers.length > 0) {
+        input.blockers = options.blockers;
+    }
+    if (options.nextSteps && options.nextSteps.length > 0) {
+        input.nextSteps = options.nextSteps;
+    }
+    if (options.links && options.links.length > 0) {
+        input.relatedLinks = options.links.map((l) => parseLink(l));
+    }
+    if (options.breadcrumb) {
+        input.breadcrumb = options.breadcrumb;
+    }
+    if (options.file) {
+        const parsed = parseFileReference(options.file);
+        if (parsed) {
+            input.lastWorkingOn = {
+                file: parsed.file,
+                line: parsed.line,
+                column: parsed.column,
+                description: options.fileDescription ?? '',
+            };
+        }
+    }
+    return input;
+}
+/**
+ * Execute the note command logic.
+ *
+ * 1. Load key and decrypt existing state to find the project.
+ * 2. Load existing mental context (if any).
+ * 3. Collect new input (interactive prompts or flags).
+ * 4. Merge new input into existing context.
+ * 5. Encrypt and write `mental-context.age`.
+ * 6. Optionally commit to the sync repo.
+ *
+ * @param projectName - The name of the project.
+ * @param options - Note command options.
+ * @returns The note result.
+ */
+export async function executeNote(projectName, options = {}) {
+    const configDir = getConfigDir();
+    const syncDir = getSyncDir();
+    // Verify sync dir exists
+    if (!fs.existsSync(syncDir) || !fs.existsSync(path.join(syncDir, '.git'))) {
+        throw new Error('No sync repository found. Run `ctx-sync init` first.');
+    }
+    // Load key
+    const privateKey = loadKey(configDir);
+    const publicKey = await identityToRecipient(privateKey);
+    // 1. Verify the project exists in state
+    const state = await readState(syncDir, privateKey, 'state');
+    if (!state) {
+        throw new Error('No state file found. Track a project first with `ctx-sync track`.');
+    }
+    const project = state.projects.find((p) => p.name === projectName || p.id === projectName);
+    if (!project) {
+        const availableNames = state.projects.map((p) => p.name).join(', ');
+        throw new Error(`Project "${projectName}" not found.\n` +
+            (availableNames
+                ? `Available projects: ${availableNames}`
+                : 'No projects tracked yet. Run `ctx-sync track` first.'));
+    }
+    // 2. Load existing mental context
+    const mentalContextData = await readState(syncDir, privateKey, 'mental-context');
+    const existingContext = mentalContextData?.[project.name] ?? null;
+    const isNew = existingContext === null;
+    // 3. Collect input
+    let noteInput;
+    if (options.promptFn) {
+        // Testing override
+        noteInput = await options.promptFn(existingContext);
+    }
+    else if (options.noInteractive) {
+        // Non-interactive: use flags only
+        noteInput = buildInputFromFlags(options);
+    }
+    else {
+        // Interactive: prompt user
+        noteInput = await collectNoteInput(existingContext);
+    }
+    // 4. Merge input into existing context
+    const mergedContext = mergeContext(existingContext, noteInput);
+    // 5. Write encrypted mental-context.age
+    const allMentalContext = mentalContextData ?? {};
+    allMentalContext[project.name] = mergedContext;
+    await writeState(syncDir, allMentalContext, publicKey, 'mental-context');
+    // 6. Optionally commit
+    if (!options.noSync) {
+        await commitState(syncDir, [STATE_FILES.MENTAL_CONTEXT, STATE_FILES.MANIFEST], `feat: update mental context for ${project.name}`);
+    }
+    return {
+        projectName: project.name,
+        isNew,
+        context: mergedContext,
+    };
+}
+/**
+ * Register the `note` command on the given Commander program.
+ */
+export function registerNoteCommand(program) {
+    program
+        .command('note <project>')
+        .description('Record mental context for a project (tasks, blockers, next steps)')
+        .option('-t, --task <task>', 'Current task description')
+        .option('-b, --blocker <blocker...>', 'Add blocker(s)')
+        .option('-s, --next-step <step...>', 'Add next step(s)')
+        .option('-l, --link <link...>', 'Add related link(s)')
+        .option('-c, --breadcrumb <note>', 'Add a breadcrumb note')
+        .option('-f, --file <file>', 'File being worked on (file:line:col)')
+        .option('--file-description <desc>', 'Description of file work')
+        .option('--no-interactive', 'Use flags only, skip prompts')
+        .option('--no-sync', 'Skip syncing to Git')
+        .action(withErrorHandler(async (projectName, opts) => {
+        const options = {
+            task: opts['task'],
+            blockers: opts['blocker'],
+            nextSteps: opts['nextStep'],
+            links: opts['link'],
+            breadcrumb: opts['breadcrumb'],
+            file: opts['file'],
+            fileDescription: opts['fileDescription'],
+            noInteractive: opts['interactive'] === false,
+            noSync: opts['sync'] === false,
+        };
+        const chalk = (await import('chalk')).default;
+        const result = await executeNote(projectName, options);
+        if (result.isNew) {
+            console.log(chalk.green(`✅ Mental context created for: ${result.projectName}`));
+        }
+        else {
+            console.log(chalk.green(`✅ Mental context updated for: ${result.projectName}`));
+        }
+        if (result.context.currentTask) {
+            console.log(`   Task: ${result.context.currentTask}`);
+        }
+        if (result.context.blockers.length > 0) {
+            console.log(`   Blockers: ${result.context.blockers.length}`);
+        }
+        if (result.context.nextSteps.length > 0) {
+            console.log(`   Next steps: ${result.context.nextSteps.length}`);
+        }
+        if (result.context.relatedLinks.length > 0) {
+            console.log(`   Links: ${result.context.relatedLinks.length}`);
+        }
+        if (result.context.breadcrumbs.length > 0) {
+            console.log(`   Breadcrumbs: ${result.context.breadcrumbs.length}`);
+        }
+        console.log(chalk.dim('\n   Context encrypted and saved to mental-context.age'));
+    }));
+}
+//# sourceMappingURL=note.js.map

package/dist/commands/note.js.map

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

package/dist/commands/pull.d.ts

@@ -0,0 +1,47 @@
+/**
+ * `ctx-sync pull` command.
+ *
+ * Pulls the latest encrypted state from the remote. Does NOT commit or
+ * push — this is a one-way pull operation.
+ *
+ * Validates remote URL (transport security) before every pull.
+ * Handles merge conflicts on .age files (never auto-merges).
+ *
+ * @module commands/pull
+ */
+import type { Command } from 'commander';
+/** Options for the pull command */
+export interface PullOptions {
+    /** Non-interactive mode — keep local version on conflict */
+    noInteractive?: boolean;
+}
+/** Result of a pull operation */
+export interface PullResult {
+    /** Whether a pull was performed */
+    pulled: boolean;
+    /** Whether there were merge conflicts */
+    hadConflicts: boolean;
+    /** Files that had merge conflicts */
+    conflictFiles: string[];
+    /** Number of state files available after pull */
+    stateFileCount: number;
+    /** Whether the repo has a remote configured */
+    hasRemote: boolean;
+}
+/**
+ * Execute the pull command logic.
+ *
+ * 1. Validate remote URL.
+ * 2. Pull latest from remote (with conflict detection).
+ * 3. Handle merge conflicts (keep local in non-interactive mode).
+ * 4. Report available state files.
+ *
+ * @param options - Pull command options.
+ * @returns Pull result with operation details.
+ */
+export declare function executePull(options?: PullOptions): Promise<PullResult>;
+/**
+ * Register the `pull` command on the given Commander program.
+ */
+export declare function registerPullCommand(program: Command): void;
+//# sourceMappingURL=pull.d.ts.map

package/dist/commands/pull.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../src/commands/pull.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAUzC,mCAAmC;AACnC,MAAM,WAAW,WAAW;IAC1B,4DAA4D;IAC5D,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,iCAAiC;AACjC,MAAM,WAAW,UAAU;IACzB,mCAAmC;IACnC,MAAM,EAAE,OAAO,CAAC;IAChB,yCAAyC;IACzC,YAAY,EAAE,OAAO,CAAC;IACtB,qCAAqC;IACrC,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,iDAAiD;IACjD,cAAc,EAAE,MAAM,CAAC;IACvB,+CAA+C;IAC/C,SAAS,EAAE,OAAO,CAAC;CACpB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,WAAW,CAAC,OAAO,GAAE,WAAgB,GAAG,OAAO,CAAC,UAAU,CAAC,CA+ChF;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAqC1D"}

package/dist/commands/pull.js

@@ -0,0 +1,94 @@
+/**
+ * `ctx-sync pull` command.
+ *
+ * Pulls the latest encrypted state from the remote. Does NOT commit or
+ * push — this is a one-way pull operation.
+ *
+ * Validates remote URL (transport security) before every pull.
+ * Handles merge conflicts on .age files (never auto-merges).
+ *
+ * @module commands/pull
+ */
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import { withErrorHandler } from '../utils/errors.js';
+import { listStateFiles } from '../core/state-manager.js';
+import { validateSyncRemote, pullWithConflictDetection, resolveConflicts, } from './sync.js';
+import { getSyncDir } from './init.js';
+/**
+ * Execute the pull command logic.
+ *
+ * 1. Validate remote URL.
+ * 2. Pull latest from remote (with conflict detection).
+ * 3. Handle merge conflicts (keep local in non-interactive mode).
+ * 4. Report available state files.
+ *
+ * @param options - Pull command options.
+ * @returns Pull result with operation details.
+ */
+export async function executePull(options = {}) {
+    const syncDir = getSyncDir();
+    // Verify sync dir exists
+    if (!fs.existsSync(syncDir) || !fs.existsSync(path.join(syncDir, '.git'))) {
+        throw new Error('No sync repository found. Run `ctx-sync init` first.');
+    }
+    const result = {
+        pulled: false,
+        hadConflicts: false,
+        conflictFiles: [],
+        stateFileCount: 0,
+        hasRemote: false,
+    };
+    // 1. Validate remote
+    const remoteUrl = await validateSyncRemote(syncDir);
+    result.hasRemote = remoteUrl !== null;
+    if (!result.hasRemote) {
+        throw new Error('No remote configured. Nothing to pull.\n' +
+            'Add a remote with: ctx-sync init --remote <url>');
+    }
+    // 2. Pull latest with conflict detection
+    const pullResult = await pullWithConflictDetection(syncDir);
+    result.pulled = pullResult.pulled;
+    // 3. Handle conflicts
+    if (pullResult.conflictFiles.length > 0) {
+        result.hadConflicts = true;
+        result.conflictFiles = pullResult.conflictFiles;
+        // In non-interactive mode, keep local version (safest default)
+        const useLocal = options.noInteractive !== false;
+        await resolveConflicts(syncDir, pullResult.conflictFiles, useLocal);
+    }
+    // 4. Count available state files
+    result.stateFileCount = listStateFiles(syncDir).length;
+    return result;
+}
+/**
+ * Register the `pull` command on the given Commander program.
+ */
+export function registerPullCommand(program) {
+    program
+        .command('pull')
+        .description('Pull latest encrypted state from remote')
+        .option('--no-interactive', 'Non-interactive mode (keep local on conflict)')
+        .action(withErrorHandler(async (opts) => {
+        const options = {
+            noInteractive: opts['interactive'] === false,
+        };
+        const chalk = (await import('chalk')).default;
+        const { default: ora } = await import('ora');
+        const spinner = ora('Pulling from remote...').start();
+        const result = await executePull(options);
+        spinner.stop();
+        if (result.hadConflicts) {
+            console.log(chalk.yellow(`⚠ Merge conflicts resolved on ${result.conflictFiles.length} file(s):`));
+            for (const file of result.conflictFiles) {
+                console.log(chalk.yellow(`   - ${file}`));
+            }
+            console.log(chalk.dim('   Local version kept (encrypted files cannot be merged).'));
+        }
+        if (result.pulled) {
+            console.log(chalk.green('✅ Pulled latest from remote'));
+        }
+        console.log(chalk.dim(`   ${result.stateFileCount} encrypted state file(s) available`));
+    }));
+}
+//# sourceMappingURL=pull.js.map

package/dist/commands/pull.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pull.js","sourceRoot":"","sources":["../../src/commands/pull.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EACL,kBAAkB,EAClB,yBAAyB,EACzB,gBAAgB,GACjB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAsBvC;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,UAAuB,EAAE;IACzD,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;IAE7B,yBAAyB;IACzB,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC;QAC1E,MAAM,IAAI,KAAK,CACb,sDAAsD,CACvD,CAAC;IACJ,CAAC;IAED,MAAM,MAAM,GAAe;QACzB,MAAM,EAAE,KAAK;QACb,YAAY,EAAE,KAAK;QACnB,aAAa,EAAE,EAAE;QACjB,cAAc,EAAE,CAAC;QACjB,SAAS,EAAE,KAAK;KACjB,CAAC;IAEF,qBAAqB;IACrB,MAAM,SAAS,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAAC,CAAC;IACpD,MAAM,CAAC,SAAS,GAAG,SAAS,KAAK,IAAI,CAAC;IAEtC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CACb,0CAA0C;YACxC,iDAAiD,CACpD,CAAC;IACJ,CAAC;IAED,yCAAyC;IACzC,MAAM,UAAU,GAAG,MAAM,yBAAyB,CAAC,OAAO,CAAC,CAAC;IAC5D,MAAM,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAElC,sBAAsB;IACtB,IAAI,UAAU,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxC,MAAM,CAAC,YAAY,GAAG,IAAI,CAAC;QAC3B,MAAM,CAAC,aAAa,GAAG,UAAU,CAAC,aAAa,CAAC;QAEhD,+DAA+D;QAC/D,MAAM,QAAQ,GAAG,OAAO,CAAC,aAAa,KAAK,KAAK,CAAC;QACjD,MAAM,gBAAgB,CAAC,OAAO,EAAE,UAAU,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;IACtE,CAAC;IAED,iCAAiC;IACjC,MAAM,CAAC,cAAc,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC;IAEvD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,mBAAmB,CAAC,OAAgB;IAClD,OAAO;SACJ,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,yCAAyC,CAAC;SACtD,MAAM,CAAC,kBAAkB,EAAE,+CAA+C,CAAC;SAC3E,MAAM,CAAC,gBAAgB,CAAC,KAAK,EAAE,IAA6B,EAAE,EAAE;QAC/D,MAAM,OAAO,GAAgB;YAC3B,aAAa,EAAE,IAAI,CAAC,aAAa,CAAC,KAAK,KAAK;SAC7C,CAAC;QAEF,MAAM,KAAK,GAAG,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;QAC9C,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,CAAC;QAE7C,MAAM,OAAO,GAAG,GAAG,CAAC,wBAAwB,CAAC,CAAC,KAAK,EAAE,CAAC;QAEtD,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,CAAC;QAE1C,OAAO,CAAC,IAAI,EAAE,CAAC;QAEf,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;YACxB,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,MAAM,CAAC,iCAAiC,MAAM,CAAC,aAAa,CAAC,MAAM,WAAW,CAAC,CACtF,CAAC;YACF,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;gBACxC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC;YAC5C,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,2DAA2D,CAAC,CAAC,CAAC;QACtF,CAAC;QAED,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC,CAAC;QAC1D,CAAC;QAED,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,GAAG,CAAC,MAAM,MAAM,CAAC,cAAc,oCAAoC,CAAC,CAC3E,CAAC;IACJ,CAAC,CAAC,CAAC,CAAC;AACR,CAAC"}

package/dist/commands/push.d.ts

@@ -0,0 +1,40 @@
+/**
+ * `ctx-sync push` command.
+ *
+ * Commits all encrypted state files (.age + manifest.json) and pushes to
+ * the remote. Does NOT pull first — this is a one-way push operation.
+ *
+ * Validates remote URL (transport security) before every push.
+ *
+ * @module commands/push
+ */
+import type { Command } from 'commander';
+/** Result of a push operation */
+export interface PushResult {
+    /** Whether a commit was created */
+    committed: boolean;
+    /** Whether a push was performed */
+    pushed: boolean;
+    /** Commit hash, if a commit was created */
+    commitHash: string | null;
+    /** Number of files committed */
+    fileCount: number;
+    /** Whether the repo has a remote configured */
+    hasRemote: boolean;
+}
+/**
+ * Execute the push command logic.
+ *
+ * 1. Validate remote URL.
+ * 2. Update manifest timestamp.
+ * 3. Commit all .age files + manifest.json.
+ * 4. Push to remote.
+ *
+ * @returns Push result with operation details.
+ */
+export declare function executePush(): Promise<PushResult>;
+/**
+ * Register the `push` command on the given Commander program.
+ */
+export declare function registerPushCommand(program: Command): void;
+//# sourceMappingURL=push.d.ts.map

package/dist/commands/push.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../src/commands/push.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAOzC,iCAAiC;AACjC,MAAM,WAAW,UAAU;IACzB,mCAAmC;IACnC,SAAS,EAAE,OAAO,CAAC;IACnB,mCAAmC;IACnC,MAAM,EAAE,OAAO,CAAC;IAChB,2CAA2C;IAC3C,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,gCAAgC;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,+CAA+C;IAC/C,SAAS,EAAE,OAAO,CAAC;CACpB;AAED;;;;;;;;;GASG;AACH,wBAAsB,WAAW,IAAI,OAAO,CAAC,UAAU,CAAC,CAgDvD;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA4B1D"}