@mcoda/integrations 0.1.8 → 0.1.10

package/dist/qa/CliQaAdapter.d.ts

@@ -5,6 +5,8 @@ export declare class CliQaAdapter implements QaAdapter {
     private resolveCwd;
     ensureInstalled(profile: QaProfile, ctx: QaContext): Promise<QaEnsureResult>;
     private persistLogs;
+    private formatCommandHeader;
+    private runCommand;
     invoke(profile: QaProfile, ctx: QaContext): Promise<QaRunResult>;
 }
 //# sourceMappingURL=CliQaAdapter.d.ts.map

package/dist/qa/CliQaAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CliQaAdapter.d.ts","sourceRoot":"","sources":["../../src/qa/CliQaAdapter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAKtE,qBAAa,YAAa,YAAW,SAAS;IAC5C,OAAO,CAAC,UAAU;IASZ,eAAe,CAAC,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,GAAG,OAAO,CAAC,cAAc,CAAC;YAapE,WAAW;IAYnB,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;CAiDvE"}
+{"version":3,"file":"CliQaAdapter.d.ts","sourceRoot":"","sources":["../../src/qa/CliQaAdapter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAKtE,qBAAa,YAAa,YAAW,SAAS;IAC5C,OAAO,CAAC,UAAU;IASZ,eAAe,CAAC,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,GAAG,OAAO,CAAC,cAAc,CAAC;YAapE,WAAW;IAkBzB,OAAO,CAAC,mBAAmB;YAWb,UAAU;IAiDlB,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;CAoEvE"}

package/dist/qa/CliQaAdapter.js

@@ -26,33 +26,25 @@ export class CliQaAdapter {
             return { ok: false, message: error?.message ?? 'QA install failed' };
         }
     }
-    async persistLogs(ctx, stdout, stderr) {
+    async persistLogs(ctx, stdout, stderr, suffix) {
         const artifacts = [];
         if (!ctx.artifactDir)
             return artifacts;
         await fs.mkdir(ctx.artifactDir, { recursive: true });
-        const outPath = path.join(ctx.artifactDir, 'stdout.log');
-        const errPath = path.join(ctx.artifactDir, 'stderr.log');
+        const suffixLabel = suffix ? `-${suffix}` : '';
+        const outPath = path.join(ctx.artifactDir, `stdout${suffixLabel}.log`);
+        const errPath = path.join(ctx.artifactDir, `stderr${suffixLabel}.log`);
         await fs.writeFile(outPath, stdout ?? '', 'utf8');
         await fs.writeFile(errPath, stderr ?? '', 'utf8');
         artifacts.push(path.relative(ctx.workspaceRoot, outPath), path.relative(ctx.workspaceRoot, errPath));
         return artifacts;
     }
-    async invoke(profile, ctx) {
-        const command = ctx.testCommandOverride ?? profile.test_command;
+    formatCommandHeader(command, index, total, outcome, exitCode) {
+        const label = total > 1 ? `command ${index}/${total}` : 'command';
+        return `=== ${label} outcome=${outcome} exit=${exitCode ?? 'null'} cmd=${command} ===`;
+    }
+    async runCommand(command, profile, ctx, index, total) {
         const startedAt = new Date().toISOString();
-        if (!command) {
-            const finishedAt = new Date().toISOString();
-            return {
-                outcome: 'infra_issue',
-                exitCode: null,
-                stdout: '',
-                stderr: 'No test_command configured for QA profile',
-                artifacts: [],
-                startedAt,
-                finishedAt,
-            };
-        }
         const cwd = this.resolveCwd(profile, ctx);
         try {
             const { stdout, stderr } = await exec(command, {
@@ -60,15 +52,18 @@ export class CliQaAdapter {
                 env: { ...process.env, ...profile.env, ...ctx.env },
             });
             const finishedAt = new Date().toISOString();
-            const artifacts = await this.persistLogs(ctx, stdout, stderr);
+            const artifacts = await this.persistLogs(ctx, stdout, stderr, total > 1 ? String(index) : undefined);
             return {
-                outcome: 'pass',
-                exitCode: 0,
-                stdout,
-                stderr,
-                artifacts,
-                startedAt,
-                finishedAt,
+                command,
+                result: {
+                    outcome: 'pass',
+                    exitCode: 0,
+                    stdout,
+                    stderr,
+                    artifacts,
+                    startedAt,
+                    finishedAt,
+                },
             };
         }
         catch (error) {
@@ -76,16 +71,76 @@ export class CliQaAdapter {
             const stderr = error?.stderr ?? String(error);
             const exitCode = typeof error?.code === 'number' ? error.code : null;
             const finishedAt = new Date().toISOString();
-            const artifacts = await this.persistLogs(ctx, stdout, stderr);
+            const artifacts = await this.persistLogs(ctx, stdout, stderr, total > 1 ? String(index) : undefined);
             return {
-                outcome: exitCode === null ? 'infra_issue' : exitCode === 0 ? 'pass' : 'fail',
-                exitCode,
-                stdout,
-                stderr,
-                artifacts,
-                startedAt,
-                finishedAt,
+                command,
+                result: {
+                    outcome: exitCode === null ? 'infra_issue' : exitCode === 0 ? 'pass' : 'fail',
+                    exitCode,
+                    stdout,
+                    stderr,
+                    artifacts,
+                    startedAt,
+                    finishedAt,
+                },
             };
         }
     }
+    async invoke(profile, ctx) {
+        const commandList = (ctx.commands ?? []).map((cmd) => cmd.trim()).filter(Boolean);
+        const fallback = ctx.testCommandOverride ?? profile.test_command;
+        const commands = commandList.length ? commandList : fallback ? [fallback] : [];
+        if (!commands.length) {
+            const now = new Date().toISOString();
+            return {
+                outcome: 'infra_issue',
+                exitCode: null,
+                stdout: '',
+                stderr: 'No test_command configured for QA profile',
+                artifacts: [],
+                startedAt: now,
+                finishedAt: now,
+            };
+        }
+        if (commands.length === 1) {
+            return (await this.runCommand(commands[0], profile, ctx, 1, 1)).result;
+        }
+        const runs = [];
+        for (let index = 0; index < commands.length; index += 1) {
+            runs.push(await this.runCommand(commands[index], profile, ctx, index + 1, commands.length));
+        }
+        const outcome = runs.some((run) => run.result.outcome === 'infra_issue')
+            ? 'infra_issue'
+            : runs.some((run) => run.result.outcome === 'fail')
+                ? 'fail'
+                : 'pass';
+        const exitCode = outcome === 'infra_issue'
+            ? null
+            : outcome === 'pass'
+                ? 0
+                : runs.find((run) => typeof run.result.exitCode === 'number' && run.result.exitCode !== 0)?.result
+                    .exitCode ?? 1;
+        const stdout = runs
+            .map((run, index) => [this.formatCommandHeader(run.command, index + 1, runs.length, run.result.outcome, run.result.exitCode), run.result.stdout]
+            .filter(Boolean)
+            .join('\n'))
+            .join('\n\n');
+        const stderr = runs
+            .map((run, index) => [this.formatCommandHeader(run.command, index + 1, runs.length, run.result.outcome, run.result.exitCode), run.result.stderr]
+            .filter(Boolean)
+            .join('\n'))
+            .join('\n\n');
+        const artifacts = runs.flatMap((run) => run.result.artifacts ?? []);
+        const startedAt = runs.reduce((min, run) => (run.result.startedAt < min ? run.result.startedAt : min), runs[0].result.startedAt);
+        const finishedAt = runs.reduce((max, run) => (run.result.finishedAt > max ? run.result.finishedAt : max), runs[0].result.finishedAt);
+        return {
+            outcome,
+            exitCode,
+            stdout,
+            stderr,
+            artifacts,
+            startedAt,
+            finishedAt,
+        };
+    }
 }

package/dist/qa/QaTypes.d.ts

@@ -1,3 +1,4 @@
+import type { QaBrowserAction } from '@mcoda/shared/qa/QaPlan.js';
 export type QaOutcome = 'pass' | 'fail' | 'infra_issue';
 export interface QaRunResult {
     outcome: QaOutcome;
@@ -19,6 +20,9 @@ export interface QaContext {
     taskKey: string;
     env: NodeJS.ProcessEnv;
     testCommandOverride?: string;
+    commands?: string[];
+    browserActions?: QaBrowserAction[];
+    browserBaseUrl?: string;
     artifactDir?: string;
 }
 //# sourceMappingURL=QaTypes.d.ts.map

package/dist/qa/QaTypes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QaTypes.d.ts","sourceRoot":"","sources":["../../src/qa/QaTypes.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,aAAa,CAAC;AAExD,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,SAAS,CAAC;IACnB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,OAAO,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC;AAED,MAAM,WAAW,SAAS;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB"}
+{"version":3,"file":"QaTypes.d.ts","sourceRoot":"","sources":["../../src/qa/QaTypes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAElE,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,aAAa,CAAC;AAExD,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,SAAS,CAAC;IACnB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,OAAO,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC;AAED,MAAM,WAAW,SAAS;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,cAAc,CAAC,EAAE,eAAe,EAAE,CAAC;IACnC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB"}

package/dist/telemetry/TelemetryClient.d.ts

@@ -11,6 +11,10 @@ export interface TokenUsageSummaryRow {
     tokens_prompt: number;
     tokens_completion: number;
     tokens_total: number;
+    tokens_cached?: number;
+    tokens_cache_read?: number;
+    tokens_cache_write?: number;
+    duration_ms?: number;
     cost_estimate: number | null;
 }
 export interface TokenUsageRow {
@@ -27,11 +31,20 @@ export interface TokenUsageRow {
     tokens_prompt: number | null;
     tokens_completion: number | null;
     tokens_total: number | null;
+    tokens_cached?: number | null;
+    tokens_cache_read?: number | null;
+    tokens_cache_write?: number | null;
     cost_estimate: number | null;
     duration_seconds: number | null;
+    duration_ms?: number | null;
+    started_at?: string | null;
+    finished_at?: string | null;
     timestamp: string;
     command_name?: string | null;
     action?: string | null;
+    invocation_kind?: string | null;
+    provider?: string | null;
+    currency?: string | null;
     error_kind?: string | null;
     metadata?: Record<string, unknown>;
 }

package/dist/telemetry/TelemetryClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TelemetryClient.d.ts","sourceRoot":"","sources":["../../src/telemetry/TelemetryClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TelemetryClient.d.ts","sourceRoot":"","sources":["../../src/telemetry/TelemetryClient.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,oBAAoB;IACnC,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,eAAe;IAC9B,cAAc,EAAE,OAAO,CAAC;IACxB,YAAY,EAAE,OAAO,CAAC;IACtB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,qBAAa,eAAe;IAExB,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE;QACf,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB;YAGW,OAAO;IAYf,UAAU,CAAC,MAAM,EAAE;QACvB,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;KACpB,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAe7B,aAAa,CAAC,MAAM,EAAE;QAC1B,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAgBtB,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAMxD,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC;IAOvE,KAAK,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;CAM3D"}

package/dist/vcs/VcsClient.d.ts

@@ -1,6 +1,7 @@
 export declare class VcsClient {
     private runGit;
     private gitDirExists;
+    isRepo(cwd: string): Promise<boolean>;
     ensureRepo(cwd: string): Promise<void>;
     hasRemote(cwd: string): Promise<boolean>;
     currentBranch(cwd: string): Promise<string | null>;
@@ -10,19 +11,37 @@ export declare class VcsClient {
     ensureBaseBranch(cwd: string, base: string): Promise<void>;
     checkoutBranch(cwd: string, branch: string): Promise<void>;
     createOrCheckoutBranch(cwd: string, branch: string, base: string): Promise<void>;
+    addWorktree(cwd: string, worktreePath: string, branch: string, options?: {
+        detach?: boolean;
+    }): Promise<void>;
+    removeWorktree(cwd: string, worktreePath: string): Promise<void>;
+    cherryPick(cwd: string, commit: string): Promise<void>;
+    abortCherryPick(cwd: string): Promise<void>;
     applyPatch(cwd: string, patch: string): Promise<void>;
+    applyPatchWithReject(cwd: string, patch: string): Promise<{
+        stdout?: string;
+        stderr?: string;
+        error?: string;
+    }>;
     stage(cwd: string, paths: string[]): Promise<void>;
     commit(cwd: string, message: string, options?: {
         noVerify?: boolean;
         noGpgSign?: boolean;
+        env?: NodeJS.ProcessEnv;
     }): Promise<void>;
     merge(cwd: string, source: string, target: string, ensureClean?: boolean): Promise<void>;
+    abortMerge(cwd: string): Promise<void>;
+    resolveMergeConflicts(cwd: string, strategy: "theirs" | "ours", paths?: string[]): Promise<string[]>;
     push(cwd: string, remote: string, branch: string): Promise<void>;
     pull(cwd: string, remote: string, branch: string, ffOnly?: boolean): Promise<void>;
     status(cwd: string): Promise<string>;
     dirtyPaths(cwd: string): Promise<string[]>;
     conflictPaths(cwd: string): Promise<string[]>;
-    ensureClean(cwd: string, ignoreDotMcoda?: boolean): Promise<void>;
+    ensureClean(cwd: string, ignoreDotMcoda?: boolean, ignorePaths?: string[]): Promise<void>;
+    resetHard(cwd: string, options?: {
+        exclude?: string[];
+    }): Promise<void>;
+    restorePaths(cwd: string, paths: string[]): Promise<void>;
     lastCommitSha(cwd: string): Promise<string>;
     diff(cwd: string, base: string, head: string, paths?: string[]): Promise<string>;
 }

package/dist/vcs/VcsClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VcsClient.d.ts","sourceRoot":"","sources":["../../src/vcs/VcsClient.ts"],"names":[],"mappings":"AAQA,qBAAa,SAAS;YACN,MAAM;YAKN,YAAY;IASpB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtC,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IASxC,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IASlD,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;YASnD,UAAU;YASV,gBAAgB;IAaxB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAY1D,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1D,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQhF,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBrD,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAIlD,MAAM,CACV,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,EACf,OAAO,GAAE;QAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAO,GACxD,OAAO,CAAC,IAAI,CAAC;IAOV,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAQtF,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhE,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,UAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAO/E,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAKpC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAsB1C,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAS7C,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,cAAc,UAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ9D,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAK3C,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;CAQvF"}
+{"version":3,"file":"VcsClient.d.ts","sourceRoot":"","sources":["../../src/vcs/VcsClient.ts"],"names":[],"mappings":"AAQA,qBAAa,SAAS;YACN,MAAM;YAYN,YAAY;IASpB,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IASrC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtC,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IASxC,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IASlD,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;YASnD,UAAU;YASV,gBAAgB;IAaxB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAY1D,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1D,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQhF,WAAW,CACf,GAAG,EAAE,MAAM,EACX,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,GAC7B,OAAO,CAAC,IAAI,CAAC;IASV,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQhE,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAItD,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3C,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBrD,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAiB/G,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAIlD,MAAM,CACV,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,EACf,OAAO,GAAE;QAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAA;KAAO,GACjF,OAAO,CAAC,IAAI,CAAC;IAQV,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAQtF,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQtC,qBAAqB,CACzB,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,QAAQ,GAAG,MAAM,EAC3B,KAAK,CAAC,EAAE,MAAM,EAAE,GACf,OAAO,CAAC,MAAM,EAAE,CAAC;IAUd,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhE,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,UAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAO/E,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAKpC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAsB1C,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAS7C,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,cAAc,UAAO,EAAE,WAAW,GAAE,MAAM,EAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAyB1F,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAYvE,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAOzD,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAK3C,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;CAQvF"}

package/dist/vcs/VcsClient.js

@@ -5,9 +5,12 @@ import path from "node:path";
 const exec = promisify(execCb);
 const execFile = promisify(execFileCb);
 export class VcsClient {
-    async runGit(cwd, args) {
-        const { stdout, stderr } = await execFile("git", args, { cwd });
-        return { stdout, stderr };
+    async runGit(cwd, args, options = {}) {
+        const { stdout, stderr } = await execFile("git", args, { cwd, ...options });
+        return {
+            stdout: typeof stdout === "string" ? stdout : stdout?.toString?.() ?? "",
+            stderr: typeof stderr === "string" ? stderr : stderr?.toString?.() ?? "",
+        };
     }
     async gitDirExists(cwd) {
         try {
@@ -18,6 +21,15 @@ export class VcsClient {
             return false;
         }
     }
+    async isRepo(cwd) {
+        try {
+            await this.runGit(cwd, ["rev-parse", "--is-inside-work-tree"]);
+            return true;
+        }
+        catch {
+            return this.gitDirExists(cwd);
+        }
+    }
     async ensureRepo(cwd) {
         if (await this.gitDirExists(cwd))
             return;
@@ -95,6 +107,28 @@ export class VcsClient {
         }
         await this.runGit(cwd, ["checkout", "-b", branch, base]);
     }
+    async addWorktree(cwd, worktreePath, branch, options) {
+        const args = ["worktree", "add", "--force"];
+        if (options?.detach) {
+            args.push("--detach");
+        }
+        args.push(worktreePath, branch);
+        await this.runGit(cwd, args);
+    }
+    async removeWorktree(cwd, worktreePath) {
+        try {
+            await this.runGit(cwd, ["worktree", "remove", "--force", worktreePath]);
+        }
+        catch {
+            // ignore; cleanup caller will remove directory
+        }
+    }
+    async cherryPick(cwd, commit) {
+        await this.runGit(cwd, ["cherry-pick", commit]);
+    }
+    async abortCherryPick(cwd) {
+        await this.runGit(cwd, ["cherry-pick", "--abort"]);
+    }
     async applyPatch(cwd, patch) {
         const opts = { cwd, shell: true };
         const applyCmd = `cat <<'__PATCH__' | git apply --whitespace=nowarn\n${patch}\n__PATCH__`;
@@ -103,17 +137,42 @@ export class VcsClient {
             return;
         }
         catch (error) {
-            // If the patch is already applied, a reverse --check succeeds; treat that as a no-op.
-            const reverseCheckCmd = `cat <<'__PATCH__' | git apply --reverse --check --whitespace=nowarn\n${patch}\n__PATCH__`;
+            // Retry with 3-way merge for drifted files.
+            const apply3wayCmd = `cat <<'__PATCH__' | git apply --3way --whitespace=nowarn\n${patch}\n__PATCH__`;
             try {
-                await exec(reverseCheckCmd, opts);
+                await exec(apply3wayCmd, opts);
                 return;
             }
             catch {
-                throw error;
+                // If the patch is already applied, a reverse --check succeeds; treat that as a no-op.
+                const reverseCheckCmd = `cat <<'__PATCH__' | git apply --reverse --check --whitespace=nowarn\n${patch}\n__PATCH__`;
+                try {
+                    await exec(reverseCheckCmd, opts);
+                    return;
+                }
+                catch {
+                    throw error;
+                }
             }
         }
     }
+    async applyPatchWithReject(cwd, patch) {
+        const opts = { cwd, shell: true };
+        const applyCmd = `cat <<'__PATCH__' | git apply --reject --whitespace=nowarn\n${patch}\n__PATCH__`;
+        try {
+            const { stdout, stderr } = await exec(applyCmd, opts);
+            return {
+                stdout: typeof stdout === "string" ? stdout : stdout?.toString?.() ?? "",
+                stderr: typeof stderr === "string" ? stderr : stderr?.toString?.() ?? "",
+            };
+        }
+        catch (error) {
+            const stdout = typeof error?.stdout === "string" ? error.stdout : error?.stdout?.toString?.() ?? "";
+            const stderr = typeof error?.stderr === "string" ? error.stderr : error?.stderr?.toString?.() ?? "";
+            const message = error instanceof Error ? error.message : String(error);
+            return { stdout, stderr, error: stderr || message };
+        }
+    }
     async stage(cwd, paths) {
         await this.runGit(cwd, ["add", ...paths]);
     }
@@ -123,7 +182,8 @@ export class VcsClient {
             args.push("--no-verify");
         if (options.noGpgSign)
             args.push("--no-gpg-sign");
-        await this.runGit(cwd, args);
+        const execOptions = options.env ? { env: options.env } : {};
+        await this.runGit(cwd, args, execOptions);
     }
     async merge(cwd, source, target, ensureClean = false) {
         await this.checkoutBranch(cwd, target);
@@ -132,6 +192,24 @@ export class VcsClient {
         }
         await this.runGit(cwd, ["merge", "--no-edit", source]);
     }
+    async abortMerge(cwd) {
+        try {
+            await this.runGit(cwd, ["merge", "--abort"]);
+        }
+        catch {
+            // Ignore when no merge is in progress.
+        }
+    }
+    async resolveMergeConflicts(cwd, strategy, paths) {
+        const conflicts = paths?.length ? paths : await this.conflictPaths(cwd);
+        if (!conflicts.length)
+            return [];
+        const flag = strategy === "theirs" ? "--theirs" : "--ours";
+        await this.runGit(cwd, ["checkout", flag, "--", ...conflicts]);
+        await this.runGit(cwd, ["add", "--", ...conflicts]);
+        await this.runGit(cwd, ["commit", "--no-edit"]);
+        return conflicts;
+    }
     async push(cwd, remote, branch) {
         await this.runGit(cwd, ["push", remote, branch]);
     }
@@ -179,13 +257,48 @@ export class VcsClient {
             return [];
         }
     }
-    async ensureClean(cwd, ignoreDotMcoda = true) {
+    async ensureClean(cwd, ignoreDotMcoda = true, ignorePaths = []) {
         const dirty = await this.dirtyPaths(cwd);
-        const filtered = ignoreDotMcoda ? dirty.filter((p) => !p.startsWith(".mcoda")) : dirty;
+        const normalize = (value) => value.replace(/\\/g, "/").replace(/^\.\/+/, "").replace(/^\/+/, "");
+        const normalizedIgnore = ignorePaths
+            .map((entry) => normalize(entry.trim()))
+            .filter(Boolean)
+            .map((entry) => (entry.endsWith("/") ? `${entry.replace(/\/+$/, "")}/` : entry));
+        const isIgnored = (value) => {
+            const normalized = normalize(value);
+            if (ignoreDotMcoda && normalized.startsWith(".mcoda"))
+                return true;
+            return normalizedIgnore.some((entry) => {
+                if (entry.endsWith("/")) {
+                    const dir = entry.slice(0, -1);
+                    return normalized === dir || normalized.startsWith(entry);
+                }
+                return normalized === entry || normalized.startsWith(`${entry}/`);
+            });
+        };
+        const filtered = dirty.filter((p) => !isIgnored(p));
         if (filtered.length) {
             throw new Error(`Working tree dirty: ${filtered.join(", ")}`);
         }
     }
+    async resetHard(cwd, options) {
+        await this.runGit(cwd, ["reset", "--hard"]);
+        const args = ["clean", "-fd"];
+        (options?.exclude ?? [])
+            .map((entry) => entry.trim())
+            .filter(Boolean)
+            .forEach((entry) => {
+            args.push("-e", entry);
+        });
+        await this.runGit(cwd, args);
+    }
+    async restorePaths(cwd, paths) {
+        const cleaned = paths.map((entry) => entry.trim()).filter(Boolean);
+        if (!cleaned.length)
+            return;
+        await this.runGit(cwd, ["checkout", "--", ...cleaned]);
+        await this.runGit(cwd, ["clean", "-fd", "--", ...cleaned]);
+    }
     async lastCommitSha(cwd) {
         const { stdout } = await this.runGit(cwd, ["rev-parse", "HEAD"]);
         return stdout.trim();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcoda/integrations",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "External integrations for mcoda (vcs, QA, telemetry).",
   "type": "module",
   "main": "dist/index.js",
@@ -37,7 +37,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@mcoda/shared": "0.1.8"
+    "docdex": "^0.2.22",
+    "@mcoda/shared": "0.1.10"
   },
   "scripts": {
     "build": "tsc -p tsconfig.json",