orka-cli 1.0.0

package/dist/cli/fix.js

@@ -0,0 +1,72 @@
+import { readFile, writeFile } from 'node:fs/promises';
+import { join, resolve } from 'node:path';
+import { loadConfig } from '../config.js';
+import { applyResolution, parseConflictMarkers, resolveConflictsWithLLM } from '../git/conflict.js';
+import { gitExec } from '../git/utils.js';
+import { createProvider } from '../providers/index.js';
+async function conflictedFiles(projectDir) {
+    const output = await gitExec(projectDir, ['diff', '--name-only', '--diff-filter=U']);
+    return output ? output.split('\n').filter(Boolean) : [];
+}
+export async function resolveConflicts(options = {}) {
+    const projectDir = resolve(options.projectDir ?? process.cwd());
+    const strategy = options.strategy ?? 'llm';
+    const targets = options.file ? [options.file] : await conflictedFiles(projectDir);
+    const resolvedFiles = [];
+    const skippedFiles = [];
+    let llmResolver = null;
+    if (strategy === 'llm') {
+        const config = loadConfig(projectDir);
+        const roleConfig = config.roles.reviewer;
+        const provider = createProvider(roleConfig.provider, {
+            model: roleConfig.model,
+            apiKey: config.providers.claude?.apiKey,
+            baseUrl: config.providers.ollama?.baseUrl,
+        });
+        llmResolver = async (prompt) => {
+            const response = await provider.chat([
+                {
+                    role: 'system',
+                    content: 'Selesaikan merge conflict block. Berikan hanya isi final block tanpa marker.',
+                },
+                { role: 'user', content: prompt },
+            ]);
+            return response.content;
+        };
+    }
+    for (const file of targets) {
+        const abs = join(projectDir, file);
+        const content = await readFile(abs, 'utf-8');
+        const blocks = parseConflictMarkers(content);
+        if (blocks.length === 0) {
+            skippedFiles.push(file);
+            continue;
+        }
+        if (strategy === 'ours' || strategy === 'theirs') {
+            const resolutions = blocks.map((block) => ({
+                ours: block.ours,
+                theirs: block.theirs,
+                resolved: strategy === 'ours' ? block.ours : block.theirs,
+            }));
+            const merged = applyResolution(content, resolutions);
+            await writeFile(abs, merged, 'utf-8');
+            await gitExec(projectDir, ['add', file]);
+            resolvedFiles.push(file);
+            continue;
+        }
+        if (!llmResolver) {
+            skippedFiles.push(file);
+            continue;
+        }
+        const resolutions = await resolveConflictsWithLLM(file, blocks, {
+            ours: 'Session branch changes',
+            theirs: 'Task branch changes',
+        }, llmResolver);
+        const merged = applyResolution(content, resolutions);
+        await writeFile(abs, merged, 'utf-8');
+        await gitExec(projectDir, ['add', file]);
+        resolvedFiles.push(file);
+    }
+    return { resolvedFiles, skippedFiles };
+}
+//# sourceMappingURL=fix.js.map

package/dist/cli/fix.js.map

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

package/dist/cli/git-session.d.ts

@@ -0,0 +1,21 @@
+export interface SessionMeta {
+    sessionId: string;
+    projectDir: string;
+    originalBranch: string;
+    sessionBranch: string;
+    baseCommit: string;
+}
+interface StartGitSessionOptions {
+    projectDir: string;
+    sessionId: string;
+    enabled: boolean;
+}
+export interface StartGitSessionResult {
+    enabled: boolean;
+    branch: string;
+}
+export declare function startGitSession(options: StartGitSessionOptions): Promise<StartGitSessionResult>;
+export declare function rollbackLastSession(projectDirInput: string, deleteSessionBranch?: boolean): Promise<SessionMeta>;
+export declare function readSessionMeta(projectDirInput: string): Promise<SessionMeta | null>;
+export {};
+//# sourceMappingURL=git-session.d.ts.map

package/dist/cli/git-session.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-session.d.ts","sourceRoot":"","sources":["../../src/cli/git-session.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,cAAc,EAAE,MAAM,CAAA;IACtB,aAAa,EAAE,MAAM,CAAA;IACrB,UAAU,EAAE,MAAM,CAAA;CACnB;AAED,UAAU,sBAAsB;IAC9B,UAAU,EAAE,MAAM,CAAA;IAClB,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,OAAO,CAAA;CACjB;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;CACf;AAID,wBAAsB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAgCrG;AAED,wBAAsB,mBAAmB,CAAC,eAAe,EAAE,MAAM,EAAE,mBAAmB,UAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,CAgBpH;AAED,wBAAsB,eAAe,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAS1F"}

package/dist/cli/git-session.js

@@ -0,0 +1,62 @@
+import { existsSync } from 'node:fs';
+import { mkdir, readFile, writeFile } from 'node:fs/promises';
+import { join, resolve } from 'node:path';
+import { createSessionBranch, deleteBranch, getCurrentBranch, getHeadCommit, gitExec, isCleanWorkingTree, isGitRepo, switchBranch } from '../git/index.js';
+const SESSION_FILE = '.orka/last-session.json';
+export async function startGitSession(options) {
+    const projectDir = resolve(options.projectDir);
+    if (!options.enabled) {
+        return { enabled: false, branch: `orka/${options.sessionId}` };
+    }
+    const repo = await isGitRepo(projectDir);
+    if (!repo) {
+        return { enabled: false, branch: `orka/${options.sessionId}` };
+    }
+    const clean = await isCleanWorkingTree(projectDir);
+    if (!clean) {
+        throw new Error('Working tree tidak bersih. Commit/stash dulu sebelum menjalankan session git.');
+    }
+    const originalBranch = await getCurrentBranch(projectDir);
+    const baseCommit = await getHeadCommit(projectDir);
+    const sessionBranch = await createSessionBranch(projectDir);
+    await saveSessionMeta({
+        sessionId: options.sessionId,
+        projectDir,
+        originalBranch,
+        sessionBranch,
+        baseCommit,
+    });
+    return {
+        enabled: true,
+        branch: sessionBranch,
+    };
+}
+export async function rollbackLastSession(projectDirInput, deleteSessionBranch = false) {
+    const projectDir = resolve(projectDirInput);
+    const meta = await readSessionMeta(projectDir);
+    if (!meta) {
+        throw new Error('Session metadata tidak ditemukan. Jalankan orka run dulu sebelum rollback.');
+    }
+    await switchBranch(projectDir, meta.sessionBranch);
+    await gitExec(projectDir, ['reset', '--hard', meta.baseCommit]);
+    await switchBranch(projectDir, meta.originalBranch);
+    if (deleteSessionBranch) {
+        await deleteBranch(projectDir, meta.sessionBranch, true);
+    }
+    return meta;
+}
+export async function readSessionMeta(projectDirInput) {
+    const projectDir = resolve(projectDirInput);
+    const filePath = join(projectDir, SESSION_FILE);
+    if (!existsSync(filePath)) {
+        return null;
+    }
+    const raw = await readFile(filePath, 'utf-8');
+    return JSON.parse(raw);
+}
+async function saveSessionMeta(meta) {
+    const filePath = join(meta.projectDir, SESSION_FILE);
+    await mkdir(join(meta.projectDir, '.orka'), { recursive: true });
+    await writeFile(filePath, JSON.stringify(meta, null, 2), 'utf-8');
+}
+//# sourceMappingURL=git-session.js.map

package/dist/cli/git-session.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-session.js","sourceRoot":"","sources":["../../src/cli/git-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AACpC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC7D,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEzC,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,gBAAgB,EAAE,aAAa,EAAE,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAqB1J,MAAM,YAAY,GAAG,yBAAyB,CAAA;AAE9C,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,OAA+B;IACnE,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;IAC9C,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QACrB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,OAAO,CAAC,SAAS,EAAE,EAAE,CAAA;IAChE,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,UAAU,CAAC,CAAA;IACxC,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,OAAO,CAAC,SAAS,EAAE,EAAE,CAAA;IAChE,CAAC;IAED,MAAM,KAAK,GAAG,MAAM,kBAAkB,CAAC,UAAU,CAAC,CAAA;IAClD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,+EAA+E,CAAC,CAAA;IAClG,CAAC;IAED,MAAM,cAAc,GAAG,MAAM,gBAAgB,CAAC,UAAU,CAAC,CAAA;IACzD,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,CAAA;IAClD,MAAM,aAAa,GAAG,MAAM,mBAAmB,CAAC,UAAU,CAAC,CAAA;IAE3D,MAAM,eAAe,CAAC;QACpB,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,UAAU;QACV,cAAc;QACd,aAAa;QACb,UAAU;KACX,CAAC,CAAA;IAEF,OAAO;QACL,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,aAAa;KACtB,CAAA;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,eAAuB,EAAE,mBAAmB,GAAG,KAAK;IAC5F,MAAM,UAAU,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;IAC3C,MAAM,IAAI,GAAG,MAAM,eAAe,CAAC,UAAU,CAAC,CAAA;IAC9C,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,4EAA4E,CAAC,CAAA;IAC/F,CAAC;IAED,MAAM,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC,CAAA;IAClD,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAA;IAC/D,MAAM,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;IAEnD,IAAI,mBAAmB,EAAE,CAAC;QACxB,MAAM,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,CAAA;IAC1D,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,eAAuB;IAC3D,MAAM,UAAU,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;IAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,CAAA;IAC/C,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;IAC7C,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAgB,CAAA;AACvC,CAAC;AAED,KAAK,UAAU,eAAe,CAAC,IAAiB;IAC9C,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,CAAA;IACpD,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAChE,MAAM,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA;AACnE,CAAC"}

package/dist/cli/index.d.ts

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+import { Command } from 'commander';
+export declare function createProgram(): Command;
+//# sourceMappingURL=index.d.ts.map

package/dist/cli/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAiCnC,wBAAgB,aAAa,IAAI,OAAO,CA6hBvC"}