contextgit 0.0.2 → 0.0.4

package/dist/commands/init.js

@@ -0,0 +1,184 @@
+// init — create .contextgit/config.json + project + branch in LocalStore.
+import { Command, Flags } from '@oclif/core';
+import { writeFileSync, mkdirSync, existsSync, readFileSync } from 'fs';
+import { createInterface } from 'readline';
+import { join, basename } from 'path';
+import { nanoid } from 'nanoid';
+import { simpleGit } from 'simple-git';
+import { LocalStore } from '@contextgit/store';
+import { installGitHooks } from '../git-hooks.js';
+const SYSTEM_PROMPT_FRAGMENT = `\
+You have access to ContextGit memory tools.
+
+## Session Start (do this every time)
+Call context_get with scope=global immediately.
+Do not ask questions first. Read the snapshot, then start working.
+Start the highest priority item from the snapshot.
+
+## What counts as one task (commit after each)
+Match the grain of your plan:
+- Numbered steps in a plan → each numbered step = one commit
+- User stories → each accepted story = one commit
+- No plan → each logical unit of change (one file, one feature, one fix) = one commit
+
+Do NOT batch unrelated changes into one commit.
+When in doubt, commit more often rather than less.
+
+## After EVERY completed task
+Immediately, without being asked:
+\`\`\`
+context_commit "what was built | key decisions | next task"
+\`\`\`
+Do not proceed to the next task until the current one is committed.
+
+## When scope changes mid-session
+1. Write a context_commit with replan: prefix BEFORE building new scope:
+   context_commit "replan: <what changed and why>"
+2. Then build the new scope
+3. Write a normal context_commit when done
+
+## Session End (do this every time)
+Call context_commit with:
+- what was built
+- key decisions and why
+- open threads
+- the first concrete task for the next session
+`;
+export default class Init extends Command {
+    static description = 'Initialize ContextGit in this project';
+    static flags = {
+        name: Flags.string({
+            char: 'n',
+            description: 'Project name (defaults to current directory name)',
+            required: false,
+        }),
+        hooks: Flags.boolean({
+            description: 'Install git hooks to auto-capture context on every git commit',
+            default: false,
+            allowNo: true, // --no-hooks to explicitly skip and suppress prompt
+        }),
+    };
+    async run() {
+        const { flags, argv } = await this.parse(Init);
+        const cwd = process.cwd();
+        const configDir = join(cwd, '.contextgit');
+        const configPath = join(configDir, 'config.json');
+        const promptPath = join(configDir, 'system-prompt.md');
+        // True if the user explicitly passed --hooks or --no-hooks
+        const hooksExplicit = argv.some(a => String(a).startsWith('--hooks') || String(a) === '--no-hooks');
+        // ── Self-heal: config exists but DB may be empty ───────────────────────────
+        if (existsSync(configPath)) {
+            let existing;
+            try {
+                existing = JSON.parse(readFileSync(configPath, 'utf8'));
+            }
+            catch {
+                this.error('Found .contextgit/config.json but could not parse it. Delete it and re-run init.');
+            }
+            const store = new LocalStore(existing.projectId);
+            const gitBranch = await detectGitBranch(cwd);
+            const branch = await store.getBranchByGitName(existing.projectId, gitBranch);
+            if (branch) {
+                // BUG-2 fix: --hooks on already-initialized project always installs
+                if (flags.hooks) {
+                    installGitHooks(cwd);
+                    this.log('Git hooks installed (.git/hooks/post-commit, post-checkout, post-merge)');
+                }
+                this.log('ContextGit already initialized. Config found at .contextgit/config.json');
+                return;
+            }
+            // DB missing or empty — recreate project + branch
+            this.log('Config found but DB is empty — recreating project and branch in DB.');
+            await store.createProject({ id: existing.projectId, name: existing.project });
+            await store.createBranch({
+                projectId: existing.projectId,
+                name: `Context: ${gitBranch}`,
+                gitBranch,
+            });
+            writeSystemPrompt(promptPath);
+            this.log(`Recreated project "${existing.project}" (${existing.projectId}) for branch: ${gitBranch}`);
+            this.log(`System prompt: .contextgit/system-prompt.md`);
+            if (flags.hooks) {
+                installGitHooks(cwd);
+                this.log('Git hooks installed (.git/hooks/post-commit, post-checkout, post-merge)');
+            }
+            return;
+        }
+        // ── Fresh init ─────────────────────────────────────────────────────────────
+        const projectName = flags.name ?? basename(cwd);
+        const projectId = nanoid();
+        const store = new LocalStore(projectId);
+        await store.createProject({ id: projectId, name: projectName });
+        const gitBranch = await detectGitBranch(cwd);
+        await store.createBranch({
+            projectId,
+            name: `Context: ${gitBranch}`,
+            gitBranch,
+        });
+        mkdirSync(configDir, { recursive: true });
+        const config = {
+            project: projectName,
+            projectId,
+            store: 'local',
+            agentRole: 'solo',
+            workflowType: 'interactive',
+            autoSnapshot: false,
+            snapshotInterval: 10,
+            embeddingModel: 'local',
+        };
+        writeFileSync(configPath, JSON.stringify(config, null, 2) + '\n');
+        writeSystemPrompt(promptPath);
+        this.log(`Initialized ContextGit for project: ${projectName}`);
+        this.log(`Project ID:  ${projectId}`);
+        this.log(`Branch:      ${gitBranch}`);
+        this.log(`Config:      .contextgit/config.json`);
+        this.log(`DB:          ~/.contextgit/projects/${projectId}.db`);
+        this.log(``);
+        // BUG-3 fix: prompt for hooks unless user was explicit about it
+        let installHooks = flags.hooks;
+        if (!hooksExplicit) {
+            installHooks = await promptYesNo('Install git hooks to auto-capture context on every git commit? (Y/n) ');
+        }
+        if (installHooks) {
+            installGitHooks(cwd);
+            this.log(`Git hooks installed (.git/hooks/post-commit, post-checkout, post-merge)`);
+        }
+        else {
+            this.log(`Skipped hooks. Run "contextgit init --hooks" anytime to install them.`);
+        }
+        this.log(``);
+        this.log(`System prompt written to .contextgit/system-prompt.md`);
+        this.log(`Add its contents to your Claude Code MCP config to enable ContextGit.`);
+        this.log(``);
+        this.log(SYSTEM_PROMPT_FRAGMENT);
+    }
+}
+// ─── Helpers ──────────────────────────────────────────────────────────────────
+async function detectGitBranch(cwd) {
+    try {
+        const git = simpleGit(cwd);
+        return (await git.revparse(['--abbrev-ref', 'HEAD'])).trim();
+    }
+    catch {
+        return 'main';
+    }
+}
+function writeSystemPrompt(promptPath) {
+    writeFileSync(promptPath, SYSTEM_PROMPT_FRAGMENT);
+}
+/** Prompt the user with a yes/no question. Defaults to yes on empty input. */
+function promptYesNo(question) {
+    return new Promise(resolve => {
+        // Non-interactive environment (CI, piped stdin) — default to yes
+        if (!process.stdin.isTTY) {
+            resolve(true);
+            return;
+        }
+        const rl = createInterface({ input: process.stdin, output: process.stdout });
+        rl.question(question, answer => {
+            rl.close();
+            resolve(answer.trim().toLowerCase() !== 'n');
+        });
+    });
+}
+//# sourceMappingURL=init.js.map

package/dist/commands/init.js.map

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

package/dist/commands/keygen.d.ts

@@ -0,0 +1,10 @@
+import { Command } from '@oclif/core';
+export default class KeygenCmd extends Command {
+    static description: string;
+    static flags: {
+        save: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        length: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<number, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+    };
+    run(): Promise<void>;
+}
+//# sourceMappingURL=keygen.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"keygen.d.ts","sourceRoot":"","sources":["../../src/commands/keygen.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAA;AAwB5C,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,OAAO;IAC5C,MAAM,CAAC,WAAW,SAA+D;IAEjF,MAAM,CAAC,KAAK;;;MASX;IAEK,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAiB3B"}

package/dist/commands/keygen.js

@@ -0,0 +1,57 @@
+// keygen — generate an API key and optionally save its hash to ~/.contextgit/server.json.
+//
+// The plaintext key is shown once and never written to disk. Only the SHA-256
+// hash is persisted so the server can verify Bearer tokens without storing secrets.
+import os from 'os';
+import { join } from 'path';
+import { createHash } from 'crypto';
+import { mkdirSync, readFileSync, writeFileSync } from 'fs';
+import { Command, Flags } from '@oclif/core';
+import { nanoid } from 'nanoid';
+const CONTEXTGIT_DIR = join(os.homedir(), '.contextgit');
+const SERVER_CONFIG_PATH = join(CONTEXTGIT_DIR, 'server.json');
+function sha256hex(input) {
+    return createHash('sha256').update(input, 'utf8').digest('hex');
+}
+function readServerConfig() {
+    try {
+        return JSON.parse(readFileSync(SERVER_CONFIG_PATH, 'utf-8'));
+    }
+    catch {
+        return {};
+    }
+}
+function saveKeyHash(hash) {
+    mkdirSync(CONTEXTGIT_DIR, { recursive: true });
+    const cfg = { ...readServerConfig(), keyHash: hash };
+    writeFileSync(SERVER_CONFIG_PATH, JSON.stringify(cfg, null, 2) + '\n', { mode: 0o600 });
+}
+export default class KeygenCmd extends Command {
+    static description = 'Generate an API key for securing the ContextGit API server';
+    static flags = {
+        save: Flags.boolean({
+            description: 'Save the key hash to ~/.contextgit/server.json (key shown once, never stored)',
+            default: false,
+        }),
+        length: Flags.integer({
+            description: 'Key length (default 32)',
+            default: 32,
+        }),
+    };
+    async run() {
+        const { flags } = await this.parse(KeygenCmd);
+        const key = nanoid(flags.length);
+        this.log(`API Key: ${key}`);
+        this.log(`(Copy this now — it will not be stored anywhere in plaintext)`);
+        if (flags.save) {
+            saveKeyHash(sha256hex(key));
+            this.log(`\nKey hash saved to ~/.contextgit/server.json`);
+            this.log(`Set this key in the Authorization header when calling the API:`);
+            this.log(`  Authorization: Bearer ${key}`);
+        }
+        else {
+            this.log(`\nTo activate this key, re-run with --save`);
+        }
+    }
+}
+//# sourceMappingURL=keygen.js.map

package/dist/commands/keygen.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"keygen.js","sourceRoot":"","sources":["../../src/commands/keygen.ts"],"names":[],"mappings":"AAAA,0FAA0F;AAC1F,EAAE;AACF,8EAA8E;AAC9E,oFAAoF;AAEpF,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAC3B,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,IAAI,CAAA;AAC3D,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAE/B,MAAM,cAAc,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,aAAa,CAAC,CAAA;AACxD,MAAM,kBAAkB,GAAG,IAAI,CAAC,cAAc,EAAE,aAAa,CAAC,CAAA;AAE9D,SAAS,SAAS,CAAC,KAAa;IAC9B,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;AACjE,CAAC;AAED,SAAS,gBAAgB;IACvB,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAA4B,CAAA;IACzF,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAA;IACX,CAAC;AACH,CAAC;AAED,SAAS,WAAW,CAAC,IAAY;IAC/B,SAAS,CAAC,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAC9C,MAAM,GAAG,GAAG,EAAE,GAAG,gBAAgB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;IACpD,aAAa,CAAC,kBAAkB,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;AACzF,CAAC;AAED,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,OAAO;IAC5C,MAAM,CAAC,WAAW,GAAG,4DAA4D,CAAA;IAEjF,MAAM,CAAC,KAAK,GAAG;QACb,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC;YAClB,WAAW,EAAE,+EAA+E;YAC5F,OAAO,EAAE,KAAK;SACf,CAAC;QACF,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC;YACpB,WAAW,EAAE,yBAAyB;YACtC,OAAO,EAAE,EAAE;SACZ,CAAC;KACH,CAAA;IAED,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;QAE7C,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QAEhC,IAAI,CAAC,GAAG,CAAC,YAAY,GAAG,EAAE,CAAC,CAAA;QAC3B,IAAI,CAAC,GAAG,CAAC,+DAA+D,CAAC,CAAA;QAEzE,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;YACf,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;YAC3B,IAAI,CAAC,GAAG,CAAC,+CAA+C,CAAC,CAAA;YACzD,IAAI,CAAC,GAAG,CAAC,gEAAgE,CAAC,CAAA;YAC1E,IAAI,CAAC,GAAG,CAAC,2BAA2B,GAAG,EAAE,CAAC,CAAA;QAC5C,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,4CAA4C,CAAC,CAAA;QACxD,CAAC;IACH,CAAC"}

package/dist/commands/log.d.ts

@@ -0,0 +1,13 @@
+import { Command } from '@oclif/core';
+export default class LogCmd extends Command {
+    static description: string;
+    static flags: {
+        limit: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<number, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        all: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        branch: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        verbose: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+    };
+    run(): Promise<void>;
+    private printCommits;
+}
+//# sourceMappingURL=log.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../src/commands/log.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAA;AAK5C,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,OAAO;IACzC,MAAM,CAAC,WAAW,SAAgD;IAElE,MAAM,CAAC,KAAK;;;;;MAoBX;IAEK,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAgD1B,OAAO,CAAC,YAAY;CAsBrB"}

package/dist/commands/log.js

@@ -0,0 +1,91 @@
+// log — list context commits with formatting.
+import { Command, Flags } from '@oclif/core';
+import { simpleGit } from 'simple-git';
+import { LocalStore } from '@contextgit/store';
+import { loadConfig } from '../config.js';
+export default class LogCmd extends Command {
+    static description = 'List context commits for the current branch';
+    static flags = {
+        limit: Flags.integer({
+            char: 'n',
+            description: 'Max commits to show',
+            default: 20,
+        }),
+        all: Flags.boolean({
+            char: 'a',
+            description: 'Show commits across all branches',
+            default: false,
+        }),
+        branch: Flags.string({
+            char: 'b',
+            description: 'Show commits for a specific git branch name',
+        }),
+        verbose: Flags.boolean({
+            char: 'v',
+            description: 'Show full commit content',
+            default: false,
+        }),
+    };
+    async run() {
+        const { flags } = await this.parse(LogCmd);
+        const config = loadConfig();
+        const store = new LocalStore(config.projectId);
+        const cwd = process.cwd();
+        let gitBranch = 'main';
+        try {
+            gitBranch = (await simpleGit(cwd).revparse(['--abbrev-ref', 'HEAD'])).trim();
+        }
+        catch {
+            // fallback
+        }
+        if (flags.all) {
+            const branches = await store.listBranches(config.projectId);
+            if (branches.length === 0) {
+                this.log('No branches found. Run `contextgit init` first.');
+                return;
+            }
+            for (const branch of branches) {
+                const commits = await store.listCommits(branch.id, { limit: flags.limit, offset: 0 });
+                if (commits.length === 0)
+                    continue;
+                this.log(`\n── ${branch.name} (${branch.gitBranch}) ──`);
+                this.printCommits(commits, flags.verbose);
+            }
+        }
+        else {
+            const targetGitBranch = flags.branch ?? gitBranch;
+            const branch = await store.getBranchByGitName(config.projectId, targetGitBranch);
+            if (!branch) {
+                this.error(`No context branch for git branch '${targetGitBranch}'. Run 'contextgit init' first.`);
+            }
+            const commits = await store.listCommits(branch.id, { limit: flags.limit, offset: 0 });
+            if (commits.length === 0) {
+                this.log(`No commits on branch '${branch.name}'.`);
+                return;
+            }
+            this.log(`Branch: ${branch.name}  [${branch.gitBranch}]`);
+            this.log(`Showing ${commits.length} commit(s)\n`);
+            this.printCommits(commits, flags.verbose);
+        }
+    }
+    printCommits(commits, verbose) {
+        for (const c of commits) {
+            const ts = new Date(c.createdAt).toLocaleString();
+            const sha = c.gitCommitSha ? `  git:${c.gitCommitSha.slice(0, 7)}` : '';
+            const agent = c.agentId ? `  [${c.agentId}]` : '';
+            this.log(`commit ${c.id}`);
+            this.log(`Date:   ${ts}${sha}${agent}`);
+            this.log(``);
+            this.log(`    ${c.message}`);
+            if (verbose && c.content && c.content !== c.message) {
+                this.log(``);
+                const lines = c.content.split('\n');
+                for (const line of lines) {
+                    this.log(`    ${line}`);
+                }
+            }
+            this.log(``);
+        }
+    }
+}
+//# sourceMappingURL=log.js.map

package/dist/commands/log.js.map

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

package/dist/commands/merge.d.ts

@@ -0,0 +1,12 @@
+import { Command } from '@oclif/core';
+export default class MergeCmd extends Command {
+    static description: string;
+    static args: {
+        sourceBranchId: import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;
+    };
+    static flags: {
+        summary: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+    };
+    run(): Promise<void>;
+}
+//# sourceMappingURL=merge.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../src/commands/merge.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAe,MAAM,aAAa,CAAA;AAGlD,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,OAAO;IAC3C,MAAM,CAAC,WAAW,SAAmD;IAErE,MAAM,CAAC,IAAI;;MAKV;IAED,MAAM,CAAC,KAAK;;MAMX;IAEK,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAY3B"}

package/dist/commands/merge.js

@@ -0,0 +1,29 @@
+// merge — merge a context branch into the current branch.
+import { Command, Args, Flags } from '@oclif/core';
+import { bootstrap } from '../bootstrap.js';
+export default class MergeCmd extends Command {
+    static description = 'Merge a context branch into the current branch';
+    static args = {
+        sourceBranchId: Args.string({
+            description: 'ID of the source branch to merge from',
+            required: true,
+        }),
+    };
+    static flags = {
+        summary: Flags.string({
+            char: 's',
+            description: 'Summary of what was merged (defaults to a generic message)',
+            required: false,
+        }),
+    };
+    async run() {
+        const { args, flags } = await this.parse(MergeCmd);
+        const ctx = await bootstrap();
+        const summary = flags.summary ?? `Merged branch ${args.sourceBranchId} into current branch`;
+        const mergeCommit = await ctx.store.mergeBranch(args.sourceBranchId, ctx.branchId, summary);
+        this.log(`Branch merged.`);
+        this.log(`Merge commit ID: ${mergeCommit.id}`);
+        this.log(`Summary: ${mergeCommit.summary}`);
+    }
+}
+//# sourceMappingURL=merge.js.map

package/dist/commands/merge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../src/commands/merge.ts"],"names":[],"mappings":"AAAA,0DAA0D;AAE1D,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE3C,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,OAAO;IAC3C,MAAM,CAAC,WAAW,GAAG,gDAAgD,CAAA;IAErE,MAAM,CAAC,IAAI,GAAG;QACZ,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC;YAC1B,WAAW,EAAE,uCAAuC;YACpD,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAA;IAED,MAAM,CAAC,KAAK,GAAG;QACb,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC;YACpB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,4DAA4D;YACzE,QAAQ,EAAE,KAAK;SAChB,CAAC;KACH,CAAA;IAED,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QAClD,MAAM,GAAG,GAAG,MAAM,SAAS,EAAE,CAAA;QAE7B,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,IAAI,iBAAiB,IAAI,CAAC,cAAc,sBAAsB,CAAA;QAE3F,MAAM,WAAW,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,cAAc,EAAE,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QAE3F,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAA;QAC1B,IAAI,CAAC,GAAG,CAAC,oBAAoB,WAAW,CAAC,EAAE,EAAE,CAAC,CAAA;QAC9C,IAAI,CAAC,GAAG,CAAC,YAAY,WAAW,CAAC,OAAO,EAAE,CAAC,CAAA;IAC7C,CAAC"}

package/dist/commands/pull.d.ts

@@ -0,0 +1,10 @@
+import { Command } from '@oclif/core';
+export default class PullCmd extends Command {
+    static description: string;
+    static flags: {
+        remote: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        'dry-run': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+    };
+    run(): Promise<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":"AAQA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAA;AAwB5C,MAAM,CAAC,OAAO,OAAO,OAAQ,SAAQ,OAAO;IAC1C,MAAM,CAAC,WAAW,SAAsD;IAExE,MAAM,CAAC,KAAK;;;MAUX;IAEK,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAiG3B"}

package/dist/commands/pull.js

@@ -0,0 +1,123 @@
+// pull — pull context commits from a remote ContextGit API server into local store.
+//
+// Requires `remote` in .contextgit/config.json.
+// Algorithm:
+//   1. Ensure project exists locally (by ID — already initialized)
+//   2. For each remote branch: ensure branch exists locally
+//   3. For each branch: collect remote commits not present locally, write them
+import { Command, Flags } from '@oclif/core';
+import { LocalStore, RemoteStore } from '@contextgit/store';
+import { loadConfig } from '../config.js';
+const PAGE = 100;
+async function allCommits(store, branchId) {
+    const acc = [];
+    let offset = 0;
+    const pg = { limit: PAGE, offset };
+    while (true) {
+        pg.offset = offset;
+        const page = await store.listCommits(branchId, pg);
+        acc.push(...page);
+        if (page.length < PAGE)
+            break;
+        offset += PAGE;
+    }
+    return acc;
+}
+export default class PullCmd extends Command {
+    static description = 'Pull context commits from a remote ContextGit API';
+    static flags = {
+        remote: Flags.string({
+            char: 'r',
+            description: 'Remote API URL (overrides config.remote)',
+            required: false,
+        }),
+        'dry-run': Flags.boolean({
+            description: 'Show what would be pulled without writing locally',
+            default: false,
+        }),
+    };
+    async run() {
+        const { flags } = await this.parse(PullCmd);
+        const config = loadConfig();
+        const remoteUrl = flags.remote ?? config.remote;
+        if (!remoteUrl) {
+            this.error('No remote configured. Add "remote": "<url>" to .contextgit/config.json or pass --remote.');
+        }
+        const local = new LocalStore(config.projectId);
+        const remote = new RemoteStore(remoteUrl);
+        const dryRun = flags['dry-run'];
+        // Verify project exists on remote
+        const remoteProject = await remote.getProject(config.projectId).catch(() => null);
+        if (!remoteProject) {
+            this.error(`Project ${config.projectId} not found on remote ${remoteUrl}. Push first.`);
+        }
+        // List all remote branches
+        const remoteBranches = await remote.listBranches(config.projectId);
+        let totalPulled = 0;
+        for (const branch of remoteBranches) {
+            // Ensure branch exists locally
+            const localBranch = await local.getBranch(branch.id).catch(() => null);
+            if (!localBranch) {
+                if (!dryRun) {
+                    await local.createBranch({
+                        id: branch.id,
+                        projectId: branch.projectId,
+                        name: branch.name,
+                        gitBranch: branch.gitBranch,
+                        parentBranchId: branch.parentBranchId,
+                    });
+                }
+                this.log(`[branch] ${dryRun ? 'would create' : 'created'}: ${branch.name}`);
+            }
+            // Collect local commit IDs for this branch
+            const localCommits = await allCommits(local, branch.id);
+            const localCommitIds = new Set(localCommits.map(c => c.id));
+            // Pull missing commits from remote
+            const remoteCommits = await allCommits(remote, branch.id);
+            const missing = remoteCommits.filter(c => !localCommitIds.has(c.id));
+            if (missing.length === 0) {
+                this.log(`[branch] ${branch.name}: up to date (${remoteCommits.length} commits)`);
+                continue;
+            }
+            this.log(`[branch] ${branch.name}: pulling ${missing.length} commit(s)…`);
+            for (const commit of missing) {
+                if (!dryRun) {
+                    await local.createCommit({
+                        id: commit.id,
+                        branchId: commit.branchId,
+                        parentId: commit.parentId,
+                        agentId: commit.agentId,
+                        agentRole: commit.agentRole,
+                        tool: commit.tool,
+                        workflowType: commit.workflowType,
+                        loopIteration: commit.loopIteration,
+                        ciRunId: commit.ciRunId,
+                        pipelineName: commit.pipelineName,
+                        message: commit.message,
+                        content: commit.content,
+                        summary: commit.summary,
+                        commitType: commit.commitType,
+                        gitCommitSha: commit.gitCommitSha,
+                    });
+                }
+                totalPulled++;
+            }
+        }
+        // Thread sync: pull open threads that are missing locally
+        const remoteThreads = await remote.listOpenThreads(config.projectId);
+        const localThreads = await local.listOpenThreads(config.projectId);
+        const localThreadIds = new Set(localThreads.map(t => t.id));
+        const missingThreads = remoteThreads.filter(t => !localThreadIds.has(t.id));
+        if (missingThreads.length > 0) {
+            this.log(`\n[threads] pulling ${missingThreads.length} open thread(s)…`);
+            for (const thread of missingThreads) {
+                if (!dryRun) {
+                    await local.syncThread(thread);
+                }
+                this.log(`  ${dryRun ? 'would pull' : 'pulled'}: ${thread.description}`);
+            }
+        }
+        this.log(`\nDone. ${dryRun ? '(dry run) ' : ''}${totalPulled} commit(s), ${missingThreads.length} thread(s) pulled from ${remoteUrl}`);
+    }
+}
+//# 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":"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"}

package/dist/commands/push.d.ts

@@ -0,0 +1,10 @@
+import { Command } from '@oclif/core';
+export default class PushCmd extends Command {
+    static description: string;
+    static flags: {
+        remote: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        'dry-run': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+    };
+    run(): Promise<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":"AAQA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAA;AAwB5C,MAAM,CAAC,OAAO,OAAO,OAAQ,SAAQ,OAAO;IAC1C,MAAM,CAAC,WAAW,SAA0D;IAE5E,MAAM,CAAC,KAAK;;;MAUX;IAEK,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA8G3B"}