@generacy-ai/orchestrator 0.6.0 → 0.8.0

package/dist/worker/validate-fix-handler.js

@@ -0,0 +1,320 @@
+import { executeCommand, wrapUntrustedData } from '@generacy-ai/workflow-engine';
+import { buildLaunchCredentials } from './credentials-helper.js';
+import { hashValidationEvidence } from './evidence-hash.js';
+/** Label added when the fix cycle cannot advance (#883-style termination). */
+const BLOCKED_STUCK_VALIDATE_FIX_LABEL = 'blocked:stuck-validate-fix';
+const AGENT_ERROR_LABEL = 'agent:error';
+const AGENT_IN_PROGRESS_LABEL = 'agent:in-progress';
+const FAILED_VALIDATE_LABEL = 'failed:validate';
+const PHASE_VALIDATE_LABEL = 'phase:validate';
+/**
+ * Bounded validate-fix cycle (#892).
+ *
+ * Invoked ONLY from PhaseLoop's validate `catch` block, gated by
+ * `WorkerContext.resumeReason === 'base-advance'` (D7 ordering invariant).
+ * First-time reds still route through `LabelManager.onError('validate')`.
+ *
+ * Contract: exactly one autonomous attempt per distinct evidence hash. Same
+ * hash → escalation via `blocked:stuck-validate-fix`. No-diff after spawn →
+ * escalation. Sibling-owned file overlap post-commit → revert + escalation.
+ *
+ * See specs/892-found-during-cockpit-v1/contracts/validate-fix-handler.md.
+ */
+export class ValidateFixHandler {
+    config;
+    agentLauncher;
+    phaseTracker;
+    logger;
+    emitEvent;
+    constructor(config, agentLauncher, phaseTracker, logger, emitEvent) {
+        this.config = config;
+        this.agentLauncher = agentLauncher;
+        this.phaseTracker = phaseTracker;
+        this.logger = logger;
+        this.emitEvent = emitEvent;
+    }
+    /**
+     * Run one bounded fix attempt against the given failing evidence.
+     * Never throws — all failures land as `emit` + label side effects.
+     */
+    async handle(item, checkoutPath, ctx, evidence, github) {
+        const { owner, repo, issueNumber } = item;
+        const { prNumber, baseBranch } = ctx;
+        // 1. Hash evidence.
+        let hash;
+        let extract;
+        try {
+            const result = hashValidationEvidence(evidence.stdout);
+            hash = result.hash;
+            extract = result.extract;
+        }
+        catch (err) {
+            this.logger.error({ err: String(err), owner, repo, issueNumber, prNumber }, 'ValidateFixHandler: hashValidationEvidence threw — escalating (safe default)');
+            await this.escalate(github, owner, repo, issueNumber, {
+                status: 'escalated', reason: 'hash-error',
+                evidenceHash: 'unknown', prNumber, owner, repo, issueNumber,
+            });
+            return;
+        }
+        const dupKey = `validate-fix:${hash}`;
+        this.logger.info({ owner, repo, issueNumber, prNumber, evidenceHash: hash, failureCount: extract.failures.length }, 'ValidateFixHandler: entering fix cycle');
+        // 2. Dedupe check.
+        if (await this.phaseTracker.isDuplicate(owner, repo, issueNumber, dupKey)) {
+            await this.escalate(github, owner, repo, issueNumber, {
+                status: 'escalated', reason: 'duplicate-evidence-hash',
+                evidenceHash: hash, prNumber, owner, repo, issueNumber,
+            });
+            return;
+        }
+        // 3. Mark processed BEFORE spawn. If the spawn crashes mid-flight, the
+        //    key remaining prevents a duplicate attempt on cluster restart.
+        await this.phaseTracker.markProcessed(owner, repo, issueNumber, dupKey);
+        // 4. Sibling-owned file collection (best-effort).
+        const siblingFiles = await this.collectSiblingOwnedFiles(github, owner, repo, baseBranch, prNumber);
+        // 5. Build prompt.
+        const prompt = this.buildFixPrompt(evidence, extract, siblingFiles, hash, prNumber);
+        // 6. Spawn.
+        const intent = {
+            kind: 'validate-fix',
+            prNumber,
+            prompt,
+            evidenceHash: hash,
+        };
+        let exitCode;
+        try {
+            const handle = await this.agentLauncher.launch({
+                intent,
+                cwd: checkoutPath,
+                env: {},
+                credentials: buildLaunchCredentials(this.config.credentialRole),
+            });
+            // Drain streams so the child doesn't stall on back-pressure.
+            handle.process.stdout?.on('data', () => undefined);
+            handle.process.stderr?.on('data', () => undefined);
+            exitCode = await handle.process.exitPromise;
+        }
+        catch (err) {
+            this.logger.warn({ err: String(err), owner, repo, issueNumber, prNumber, evidenceHash: hash }, 'ValidateFixHandler: launcher.launch threw');
+            await this.applyStuckLabel(github, owner, repo, issueNumber);
+            this.safeEmit('cluster.validate-fix', {
+                status: 'blocked', reason: 'launch-error',
+                evidenceHash: hash, owner, repo, issueNumber, prNumber,
+                timestamp: new Date().toISOString(),
+            });
+            return;
+        }
+        this.logger.info({ owner, repo, issueNumber, prNumber, evidenceHash: hash, exitCode }, 'ValidateFixHandler: agent exit');
+        // 7. commit → sibling-overlap check → push.
+        const commitMessage = `validate-fix: ${hash.slice(0, 12)}`;
+        let committed;
+        try {
+            committed = await this.commitChanges(github, checkoutPath, commitMessage);
+        }
+        catch (err) {
+            this.logger.warn({ err: String(err), owner, repo, issueNumber, prNumber, evidenceHash: hash }, 'ValidateFixHandler: commit failed');
+            await this.applyStuckLabel(github, owner, repo, issueNumber);
+            this.safeEmit('cluster.validate-fix', {
+                status: 'blocked', reason: 'commit-error',
+                evidenceHash: hash, owner, repo, issueNumber, prNumber,
+                timestamp: new Date().toISOString(),
+            });
+            return;
+        }
+        if (!committed.hasChanges) {
+            // #883 termination discipline — no-diff.
+            await this.applyStuckLabel(github, owner, repo, issueNumber);
+            this.safeEmit('cluster.validate-fix', {
+                status: 'blocked', reason: 'no-diff',
+                evidenceHash: hash, owner, repo, issueNumber, prNumber,
+                timestamp: new Date().toISOString(),
+            });
+            return;
+        }
+        // Post-hoc sibling-overlap check on the just-committed change set.
+        if (siblingFiles.length > 0 && committed.committedFiles.length > 0) {
+            const overlap = committed.committedFiles.filter((f) => siblingFiles.includes(f));
+            if (overlap.length > 0) {
+                this.logger.warn({ owner, repo, issueNumber, prNumber, overlap, evidenceHash: hash }, 'ValidateFixHandler: sibling-file overlap — reverting commit and escalating');
+                try {
+                    await this.revertLocalCommit(checkoutPath);
+                }
+                catch (err) {
+                    this.logger.warn({ err: String(err), checkoutPath }, 'ValidateFixHandler: revertLocalCommit failed — continuing');
+                }
+                await this.applyStuckLabel(github, owner, repo, issueNumber);
+                this.safeEmit('cluster.validate-fix', {
+                    status: 'blocked', reason: 'sibling-file-overlap',
+                    evidenceHash: hash, overlappingFiles: overlap,
+                    owner, repo, issueNumber, prNumber,
+                    timestamp: new Date().toISOString(),
+                });
+                return;
+            }
+        }
+        // Push.
+        try {
+            await this.pushChanges(github);
+        }
+        catch (err) {
+            this.logger.warn({ err: String(err), owner, repo, issueNumber, prNumber, evidenceHash: hash }, 'ValidateFixHandler: push failed');
+            await this.applyStuckLabel(github, owner, repo, issueNumber);
+            this.safeEmit('cluster.validate-fix', {
+                status: 'blocked', reason: 'push-error',
+                evidenceHash: hash, owner, repo, issueNumber, prNumber,
+                timestamp: new Date().toISOString(),
+            });
+            return;
+        }
+        this.safeEmit('cluster.validate-fix', {
+            status: 'attempted',
+            evidenceHash: hash,
+            owner, repo, issueNumber, prNumber,
+            timestamp: new Date().toISOString(),
+        });
+    }
+    /**
+     * Escalation gate — same red already spent our one attempt (or hash errored).
+     * Adds `blocked:stuck-validate-fix` + `agent:error`, removes in-progress
+     * labels, emits event. Best-effort throughout.
+     */
+    async escalate(github, owner, repo, issueNumber, payload) {
+        try {
+            await github.addLabels(owner, repo, issueNumber, [
+                BLOCKED_STUCK_VALIDATE_FIX_LABEL,
+                AGENT_ERROR_LABEL,
+            ]);
+        }
+        catch (err) {
+            this.logger.warn({ err: String(err), owner, repo, issueNumber }, 'ValidateFixHandler: addLabels (escalation) failed — non-fatal');
+        }
+        try {
+            await github.removeLabels(owner, repo, issueNumber, [
+                PHASE_VALIDATE_LABEL,
+                AGENT_IN_PROGRESS_LABEL,
+            ]);
+        }
+        catch (err) {
+            this.logger.warn({ err: String(err), owner, repo, issueNumber }, 'ValidateFixHandler: removeLabels (escalation) failed — non-fatal');
+        }
+        this.safeEmit('cluster.validate-fix', {
+            ...payload,
+            timestamp: new Date().toISOString(),
+        });
+    }
+    async applyStuckLabel(github, owner, repo, issueNumber) {
+        try {
+            await github.addLabels(owner, repo, issueNumber, [BLOCKED_STUCK_VALIDATE_FIX_LABEL]);
+        }
+        catch (err) {
+            this.logger.warn({ err: String(err), owner, repo, issueNumber }, 'ValidateFixHandler: addLabels (stuck) failed — non-fatal');
+        }
+        // The failed:validate label re-applies via LabelManager.onError('validate')
+        // on the caller's path — we don't touch it here.
+        void FAILED_VALIDATE_LABEL;
+    }
+    /**
+     * Enumerate open PRs to the same base branch and union their diff file lists.
+     * Best-effort per sibling — one throw does not abort the whole collection.
+     */
+    async collectSiblingOwnedFiles(github, owner, repo, baseBranch, ownPrNumber) {
+        let openPRs;
+        try {
+            openPRs = await github.listOpenPullRequests(owner, repo);
+        }
+        catch (err) {
+            this.logger.warn({ err: String(err), owner, repo, baseBranch }, 'ValidateFixHandler: listOpenPullRequests failed — proceeding with empty sibling list');
+            return [];
+        }
+        const siblings = openPRs.filter((pr) => pr.base?.ref === baseBranch && pr.number !== ownPrNumber);
+        const files = [];
+        for (const pr of siblings) {
+            try {
+                const names = await github.prDiffNames(`${owner}/${repo}`, pr.number);
+                files.push(...names);
+            }
+            catch (err) {
+                this.logger.warn({ err: String(err), owner, repo, siblingPr: pr.number }, 'ValidateFixHandler: sibling prDiffNames failed — partial list');
+            }
+        }
+        return [...new Set(files)];
+    }
+    /**
+     * Build the fix prompt — includes full stdout evidence, structured extract,
+     * do-not-create file list, and the identity hash.
+     */
+    buildFixPrompt(evidence, extract, siblingFiles, hash, prNumber) {
+        const failureLines = extract.failures
+            .map((f, i) => `Failure ${i + 1}: ${f.id} — ${f.firstError}`)
+            .join('\n');
+        const siblingBlock = siblingFiles.length > 0
+            ? `\n\nDo not create these files — they belong to sibling PRs on the same base branch:\n${siblingFiles.map((f) => `  - ${f}`).join('\n')}\n`
+            : '\n\n(No sibling PRs to the same base branch had recorded diffs.)\n';
+        const fencedEvidence = wrapUntrustedData(evidence.stdout, `PR #${prNumber} validate stdout (exit ${evidence.exitCode})`);
+        return `You are running an autonomous fix attempt for a persistently-failing validate check on PR #${prNumber}.
+
+The failing validate command produced the following output:
+
+${fencedEvidence}
+
+Structured failure identity (SHA-256 hash: ${hash}):
+
+${failureLines}
+${siblingBlock}
+**Instructions:**
+1. Read the validate output above and address every failure it reports.
+2. Do NOT create any file that appears in the "Do not create" list — those files belong to sibling PRs and will merge cleanly through their own branches.
+3. Focus on this PR's own scope — do not touch unrelated code.
+4. Your changes will be automatically committed and pushed on this branch. You have exactly one attempt.
+
+Proceed with the fix.`;
+    }
+    /**
+     * Stage all changes, commit if any, and return whether anything was committed.
+     * If committed, also returns the list of files in the new commit for the
+     * sibling-overlap check.
+     */
+    async commitChanges(github, checkoutPath, message) {
+        const status = await github.getStatus();
+        if (!status.has_changes) {
+            return { hasChanges: false, committedFiles: [] };
+        }
+        await github.stageAll();
+        const commit = await github.commit(message);
+        // Prefer the commit result's files list; fall back to git diff HEAD~1..HEAD
+        // for backends that don't populate files_committed.
+        let committedFiles = commit.files_committed;
+        if (!committedFiles || committedFiles.length === 0) {
+            try {
+                const result = await executeCommand('git', ['diff', '--name-only', 'HEAD~1', 'HEAD'], { cwd: checkoutPath });
+                if (result.exitCode === 0) {
+                    committedFiles = result.stdout.split('\n').map((l) => l.trim()).filter(Boolean);
+                }
+            }
+            catch {
+                committedFiles = [];
+            }
+        }
+        return { hasChanges: true, committedFiles: committedFiles ?? [] };
+    }
+    async pushChanges(github) {
+        const branch = await github.getCurrentBranch();
+        await github.push('origin', branch);
+    }
+    async revertLocalCommit(checkoutPath) {
+        const result = await executeCommand('git', ['reset', '--hard', 'HEAD~1'], { cwd: checkoutPath });
+        if (result.exitCode !== 0) {
+            throw new Error(`git reset --hard HEAD~1 failed: ${result.stderr.trim()}`);
+        }
+    }
+    safeEmit(channel, payload) {
+        if (!this.emitEvent)
+            return;
+        try {
+            this.emitEvent(channel, payload);
+        }
+        catch (err) {
+            this.logger.warn({ err: String(err), channel }, 'ValidateFixHandler: emitEvent threw — swallowed');
+        }
+    }
+}
+//# sourceMappingURL=validate-fix-handler.js.map

package/dist/worker/validate-fix-handler.js.map

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

package/dist/worker/worker-result.d.ts

@@ -0,0 +1,39 @@
+/**
+ * Discriminated result type returned by `WorkerHandler` (`ClaudeCliWorker.handle`).
+ * Consumed by `WorkerDispatcher.runWorker` to decide between `queue.complete()`
+ * (both variants) and `queue.release()` (never — release is the default behavior
+ * on unhandled throws).
+ *
+ * See specs/889-found-during-cockpit-v1/contracts/worker-result.md.
+ */
+import type { QueueItem } from '../types/index.js';
+import type { TerminalLabelOpSite } from './terminal-label-op-error.js';
+export interface FailureMetadata {
+    readonly site: TerminalLabelOpSite;
+    readonly labelOp: string;
+    readonly ghStderr: string;
+}
+/**
+ * Optional post-complete side-effect the dispatcher runs AFTER `queue.complete()`.
+ * Used by `MergeConflictHandler`'s re-arm path (#902) to enqueue a `continue`
+ * item without colliding against the still-claimed source itemKey (self-
+ * deadlock guard per #902 Q1).
+ */
+export type PostCompleteAction = {
+    readonly kind: 'rearm';
+    readonly rearmItem: QueueItem;
+};
+export interface CompletedResult {
+    readonly status: 'completed';
+    /**
+     * NEW in #902.
+     * Fired by `WorkerDispatcher.runWorker` immediately after
+     * `queue.complete(workerId, item)` releases the itemKey.
+     */
+    readonly postComplete?: PostCompleteAction;
+}
+export type WorkerResult = CompletedResult | {
+    readonly status: 'failed-terminal';
+    readonly failureMetadata: FailureMetadata;
+};
+//# sourceMappingURL=worker-result.d.ts.map

package/dist/worker/worker-result.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"worker-result.d.ts","sourceRoot":"","sources":["../../src/worker/worker-result.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAExE,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,IAAI,EAAE,mBAAmB,CAAC;IACnC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC3B;AAED;;;;;GAKG;AACH,MAAM,MAAM,kBAAkB,GAC1B;IAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAA;CAAE,CAAC;AAE9D,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B;;;;OAIG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,kBAAkB,CAAC;CAC5C;AAED,MAAM,MAAM,YAAY,GACpB,eAAe,GACf;IACE,QAAQ,CAAC,MAAM,EAAE,iBAAiB,CAAC;IACnC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;CAC3C,CAAC"}

package/dist/worker/worker-result.js

@@ -0,0 +1,10 @@
+/**
+ * Discriminated result type returned by `WorkerHandler` (`ClaudeCliWorker.handle`).
+ * Consumed by `WorkerDispatcher.runWorker` to decide between `queue.complete()`
+ * (both variants) and `queue.release()` (never — release is the default behavior
+ * on unhandled throws).
+ *
+ * See specs/889-found-during-cockpit-v1/contracts/worker-result.md.
+ */
+export {};
+//# sourceMappingURL=worker-result.js.map

package/dist/worker/worker-result.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worker-result.js","sourceRoot":"","sources":["../../src/worker/worker-result.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@generacy-ai/orchestrator",
-  "version": "0.6.0",
+  "version": "0.8.0",
   "description": "Orchestrator service - main API server for Generacy workflow orchestration",
   "type": "module",
   "main": "./dist/index.js",
@@ -13,6 +13,10 @@
     "./test-utils": {
       "import": "./dist/test-utils/index.js",
       "types": "./dist/test-utils/index.d.ts"
+    },
+    "./launcher/types": {
+      "import": "./dist/launcher/types.js",
+      "types": "./dist/launcher/types.d.ts"
     }
   },
   "dependencies": {
@@ -27,14 +31,14 @@
     "prom-client": "^15.0.0",
     "yaml": "^2.4.0",
     "zod": "^3.23.0",
-    "@generacy-ai/activation-client": "^0.3.0",
     "@generacy-ai/cluster-relay": "^0.3.0",
-    "@generacy-ai/control-plane": "^0.7.0",
-    "@generacy-ai/config": "^0.2.0",
-    "@generacy-ai/orchestrator-types": "^0.1.0",
+    "@generacy-ai/config": "^0.4.0",
+    "@generacy-ai/control-plane": "^0.7.2",
+    "@generacy-ai/orchestrator-types": "^0.2.0",
     "@generacy-ai/credhelper": "^0.1.1",
-    "@generacy-ai/workflow-engine": "^0.2.1",
-    "@generacy-ai/generacy-plugin-claude-code": "^0.1.1"
+    "@generacy-ai/generacy-plugin-claude-code": "^0.3.0",
+    "@generacy-ai/workflow-engine": "^0.3.0",
+    "@generacy-ai/activation-client": "^0.3.0"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",
@@ -69,6 +73,7 @@
     "start": "node dist/server.js",
     "test": "vitest run",
     "test:watch": "vitest",
+    "test:integration": "vitest --config ../../vitest.integration.config.ts run",
     "lint": "eslint src tests --ext .ts",
     "typecheck": "tsc --noEmit"
   }