night-orch 0.3.2 → 0.4.0

package/dist/ops/project-check.js

@@ -0,0 +1,136 @@
+import { existsSync } from 'node:fs';
+import { isGitRepo, branchExistsLocally, branchExistsRemotely, fetchOrigin } from '../git/repo.js';
+import { logger } from '../utils/logger.js';
+/**
+ * Validate that a target project is properly set up for night-orch.
+ * Returns a list of check results — all must pass for the project to be ready.
+ */
+export async function validateProjectSetup(repoConfig, config, forge) {
+    const results = [];
+    // 1. Repo local path exists and is a git repo
+    if (!existsSync(repoConfig.localPath)) {
+        results.push({
+            name: 'Local path exists',
+            passed: false,
+            message: `Path does not exist: ${repoConfig.localPath}`,
+            category: 'repo',
+        });
+    }
+    else {
+        const isRepo = await isGitRepo(repoConfig.localPath);
+        results.push({
+            name: 'Local path is git repo',
+            passed: isRepo,
+            message: isRepo
+                ? `Valid git repo at ${repoConfig.localPath}`
+                : `Not a git repo: ${repoConfig.localPath}`,
+            category: 'repo',
+        });
+        // 2. Base branch exists
+        if (isRepo) {
+            try {
+                await fetchOrigin(repoConfig.localPath);
+                results.push({
+                    name: 'Fetch origin',
+                    passed: true,
+                    message: 'Successfully fetched from origin',
+                    category: 'repo',
+                });
+            }
+            catch (err) {
+                results.push({
+                    name: 'Fetch origin',
+                    passed: false,
+                    message: `Failed to fetch: ${err instanceof Error ? err.message : String(err)}`,
+                    category: 'repo',
+                });
+            }
+            const localExists = await branchExistsLocally(repoConfig.localPath, repoConfig.baseBranch);
+            const remoteExists = await branchExistsRemotely(repoConfig.localPath, repoConfig.baseBranch);
+            results.push({
+                name: 'Base branch exists',
+                passed: localExists || remoteExists,
+                message: localExists || remoteExists
+                    ? `Base branch '${repoConfig.baseBranch}' found (local: ${localExists}, remote: ${remoteExists})`
+                    : `Base branch '${repoConfig.baseBranch}' not found locally or remotely`,
+                category: 'repo',
+            });
+        }
+    }
+    // 3. Forge auth works
+    try {
+        const authInfo = await forge.validateAuth();
+        results.push({
+            name: 'Forge authentication',
+            passed: true,
+            message: `Authenticated as ${authInfo.user}`,
+            category: 'auth',
+        });
+    }
+    catch (err) {
+        results.push({
+            name: 'Forge authentication',
+            passed: false,
+            message: `Auth failed: ${err instanceof Error ? err.message : String(err)}`,
+            category: 'auth',
+        });
+    }
+    // 4. Repo is accessible
+    try {
+        await forge.getIssue(repoConfig.repo, 1).catch(() => null); // 404 is OK — just checking access
+        results.push({
+            name: 'Repo accessible',
+            passed: true,
+            message: `Can access ${repoConfig.repo}`,
+            category: 'auth',
+        });
+    }
+    catch (err) {
+        results.push({
+            name: 'Repo accessible',
+            passed: false,
+            message: `Cannot access ${repoConfig.repo}: ${err instanceof Error ? err.message : String(err)}`,
+            category: 'auth',
+        });
+    }
+    // 5. Ready labels configured
+    const readyLabels = Array.isArray(repoConfig.labels.ready) ? repoConfig.labels.ready : [repoConfig.labels.ready];
+    results.push({
+        name: 'Ready labels configured',
+        passed: readyLabels.length > 0,
+        message: readyLabels.length > 0
+            ? `Ready labels: ${readyLabels.join(', ')} — run 'night-orch labels-init' to ensure they exist on the repo`
+            : 'No ready labels configured',
+        category: 'labels',
+    });
+    // 6. Worker profiles exist for configured roles
+    for (const role of ['planner', 'coder', 'reviewer']) {
+        const agentName = repoConfig.defaults[role];
+        const mappedProfile = repoConfig.agents[agentName];
+        const profile = mappedProfile
+            ? config.workerProfiles[mappedProfile]
+            : Object.values(config.workerProfiles).find((p) => p.type === agentName);
+        results.push({
+            name: `Worker profile for ${role} (${agentName})`,
+            passed: !!profile,
+            message: profile
+                ? `Found profile: ${mappedProfile ?? agentName} (command: ${profile.command})`
+                : `No worker profile found for agent '${agentName}'`,
+            category: 'environment',
+        });
+    }
+    // 7. Verify commands configured
+    const hasVerify = (repoConfig.verify?.length ?? 0) > 0;
+    results.push({
+        name: 'Verify commands configured',
+        passed: hasVerify,
+        message: hasVerify
+            ? `${repoConfig.verify.length} verify command(s) configured`
+            : 'No verify commands configured — runs will skip verification',
+        category: 'verify',
+        optional: true,
+    });
+    logger.info({ repo: repoConfig.repo, passed: results.filter((r) => r.passed).length, total: results.length }, 'Project validation complete');
+    return results;
+}
+//# sourceMappingURL=project-check.js.map

package/dist/ops/project-check.js.map

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

package/dist/ops/rebase-and-check.d.ts

@@ -1,6 +1,7 @@
 import type Database from 'better-sqlite3';
 import type { ForgeAdapter } from '../forge/types.js';
 import type { RepoConfig } from '../config/schema.js';
+import type { UpdateStrategy } from '../git/worktree.js';
 /**
  * Queue an issue for rebase-and-re-evaluate.
  *
@@ -26,7 +27,7 @@ export declare function queueRebase(db: Database.Database, forge: ForgeAdapter,
  * Returns false if verify fails — the caller should continue with
  * a code→verify→review cycle to fix the issues.
  */
-export declare function executeRebase(repoLocalPath: string, worktreePath: string, branchName: string, baseBranch: string, repo: string, issueNumber: number, verifyCommands: Array<string | string[]>): Promise<{
+export declare function executeRebase(repoLocalPath: string, worktreePath: string, branchName: string, baseBranch: string, repo: string, issueNumber: number, verifyCommands: Array<string | string[]>, strategy?: UpdateStrategy): Promise<{
     rebased: boolean;
     verifyPassed: boolean;
     conflict: boolean;

package/dist/ops/rebase-and-check.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rebase-and-check.d.ts","sourceRoot":"","sources":["../../src/ops/rebase-and-check.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAA;AAC1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAarD;;;;;;;;;;;;GAYG;AACH,wBAAsB,WAAW,CAC/B,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,KAAK,EAAE,YAAY,EACnB,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAgD9C;AAED;;;;;;;GAOG;AACH,wBAAsB,aAAa,CACjC,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,GACvC,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,YAAY,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAA;CAAE,CAAC,CA+BzE"}
+{"version":3,"file":"rebase-and-check.d.ts","sourceRoot":"","sources":["../../src/ops/rebase-and-check.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAA;AAC1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAErD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAYxD;;;;;;;;;;;;GAYG;AACH,wBAAsB,WAAW,CAC/B,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,KAAK,EAAE,YAAY,EACnB,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAgD9C;AAED;;;;;;;GAOG;AACH,wBAAsB,aAAa,CACjC,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,EACxC,QAAQ,GAAE,cAAwB,GACjC,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,YAAY,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAA;CAAE,CAAC,CA+BzE"}

package/dist/ops/rebase-and-check.js

@@ -68,7 +68,7 @@ export async function queueRebase(db, forge, repoConfig, issueNumber, botUser) {
  * Returns false if verify fails — the caller should continue with
  * a code→verify→review cycle to fix the issues.
  */
-export async function executeRebase(repoLocalPath, worktreePath, branchName, baseBranch, repo, issueNumber, verifyCommands) {
+export async function executeRebase(repoLocalPath, worktreePath, branchName, baseBranch, repo, issueNumber, verifyCommands, strategy = 'merge') {
     const target = {
         repo,
         issueNumber,
@@ -77,7 +77,7 @@ export async function executeRebase(repoLocalPath, worktreePath, branchName, bas
         baseBranch,
         worktreePath,
     };
-    const rebaseResult = await autoRebase(target, repoLocalPath);
+    const rebaseResult = await autoRebase(target, repoLocalPath, strategy);
     if (rebaseResult === 'up_to_date') {
         return { rebased: false, verifyPassed: true, conflict: false };
     }

package/dist/ops/rebase-and-check.js.map

@@ -1 +1 @@
-{"version":3,"file":"rebase-and-check.js","sourceRoot":"","sources":["../../src/ops/rebase-and-check.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAqB,MAAM,aAAa,CAAA;AAC3D,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAE3C,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAA;AAEzC;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,EAAqB,EACrB,KAAmB,EACnB,UAAsB,EACtB,WAAmB,EACnB,OAAe;IAEf,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,CAAA;IAErC,mDAAmD;IACnD,MAAM,GAAG,GAAG,UAAU,CAAC,iBAAiB,CAAC,UAAU,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;IACtE,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;QAC5B,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,yCAAyC,EAAE,CAAA;IAC7E,CAAC;IAED,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,IAAI,GAAG,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QACxD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,kBAAkB,GAAG,CAAC,MAAM,EAAE,EAAE,CAAA;IAClE,CAAC;IAED,MAAM,SAAS,GAAG,gBAAgB,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,IAAI,CAAC,CAAA;IAElE,gDAAgD;IAChD,MAAM,iBAAiB,GAAG,GAAG,CAAC,SAAS,IAAI,EAAE,CAAA;IAC7C,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE;QACxB,MAAM,EAAE,QAAQ;QAChB,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,IAAI;QACb,SAAS,EAAE;YACT,GAAG,iBAAiB;YACpB,SAAS;YACT,eAAe,EAAE,kHAAkH;YACnI,YAAY,EAAE,QAAQ;YACtB,eAAe,EAAE,wBAAwB;SAC1C;KACF,CAAC,CAAA;IAEF,oBAAoB;IACpB,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,SAAS,EAAE,WAAW,CAAC,CAAA;QAC1D,MAAM,SAAS,GAAG,GAAG,CAAC,MAAM,KAAK,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAA;QACjH,MAAM,gBAAgB,CACpB,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,KAAK,CAAC,MAAM,EAC3C,SAAS,EAAE,QAAQ,EAAE,gBAAgB,CAAC,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,CAChE,CAAA;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,EAAE,EAAE,8CAA8C,CAAC,CAAA;IACpG,CAAC;IAED,sBAAsB;IACtB,MAAM,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO,EACxD,+IAA+I,CAAC,CAAA;IAElJ,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,yCAAyC,CAAC,CAAA;IACvG,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,wDAAwD,EAAE,CAAA;AAC3F,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,aAAqB,EACrB,YAAoB,EACpB,UAAkB,EAClB,UAAkB,EAClB,IAAY,EACZ,WAAmB,EACnB,cAAwC;IAExC,MAAM,MAAM,GAAiB;QAC3B,IAAI;QACJ,WAAW;QACX,QAAQ,EAAE,CAAC;QACX,UAAU;QACV,UAAU;QACV,YAAY;KACb,CAAA;IAED,MAAM,YAAY,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAE5D,IAAI,YAAY,KAAK,YAAY,EAAE,CAAC;QAClC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAA;IAChE,CAAC;IAED,IAAI,YAAY,KAAK,UAAU,EAAE,CAAC;QAChC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAA;IAChE,CAAC;IAED,IAAI,YAAY,KAAK,OAAO,EAAE,CAAC;QAC7B,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAA;IACjE,CAAC;IAED,oCAAoC;IACpC,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAChC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAA;IAC/D,CAAC;IAED,MAAM,aAAa,GAAG,MAAM,iBAAiB,CAAC,YAAY,EAAE,cAAc,EAAE,gBAAgB,EAAE,CAAC,CAAA;IAC/F,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,eAAe,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAA;AACzF,CAAC;AAED,KAAK,UAAU,aAAa,CAC1B,KAAmB,EACnB,IAAY,EACZ,WAAmB,EACnB,OAAe,EACf,OAAe;IAEf,IAAI,CAAC;QACH,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,gBAAgB,CAAC,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,aAAa,EAAE,mBAAmB,OAAO,EAAE,EAAE,OAAO,CAAC,CAAA;QACxG,CAAC;aAAM,CAAC;YACN,MAAM,KAAK,CAAC,cAAc,CAAC,IAAI,EAAE,WAAW,EAAE,mBAAmB,OAAO,EAAE,CAAC,CAAA;QAC7E,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,EAAE,sCAAsC,CAAC,CAAA;IACjF,CAAC;AACH,CAAC"}
+{"version":3,"file":"rebase-and-check.js","sourceRoot":"","sources":["../../src/ops/rebase-and-check.ts"],"names":[],"mappings":"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"}

package/dist/ops/rebase.d.ts

@@ -1,3 +1,4 @@
+import type { UpdateStrategy } from '../git/worktree.js';
 export interface RebaseTarget {
     repo: string;
     issueNumber: number;
@@ -8,11 +9,13 @@ export interface RebaseTarget {
 }
 export type RebaseResult = 'up_to_date' | 'rebased' | 'conflict' | 'error';
 /**
- * Check if a branch needs rebase and perform it automatically.
- * Uses --force-with-lease for push to protect against overwriting others' work.
+ * Update a branch to incorporate latest base branch changes and push.
+ * Supports both merge and rebase strategies. Uses --force-with-lease for
+ * push to protect against overwriting others' work.
  *
- * @returns 'up_to_date' if no rebase needed, 'rebased' on success,
- *          'conflict' if rebase had conflicts (aborted), 'error' on other failures.
+ * @param strategy - 'merge' creates a merge commit (reliable), 'rebase' replays commits (linear history)
+ * @returns 'up_to_date' if no update needed, 'rebased' on success,
+ *          'conflict' if update had conflicts (aborted), 'error' on other failures.
  */
-export declare function autoRebase(target: RebaseTarget, repoLocalPath: string): Promise<RebaseResult>;
+export declare function autoRebase(target: RebaseTarget, repoLocalPath: string, strategy?: UpdateStrategy): Promise<RebaseResult>;
 //# sourceMappingURL=rebase.d.ts.map

package/dist/ops/rebase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rebase.d.ts","sourceRoot":"","sources":["../../src/ops/rebase.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;CACrB;AAED,MAAM,MAAM,YAAY,GAAG,YAAY,GAAG,SAAS,GAAG,UAAU,GAAG,OAAO,CAAA;AAE1E;;;;;;GAMG;AACH,wBAAsB,UAAU,CAC9B,MAAM,EAAE,YAAY,EACpB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,YAAY,CAAC,CA0DvB"}
+{"version":3,"file":"rebase.d.ts","sourceRoot":"","sources":["../../src/ops/rebase.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAExD,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;CACrB;AAED,MAAM,MAAM,YAAY,GAAG,YAAY,GAAG,SAAS,GAAG,UAAU,GAAG,OAAO,CAAA;AAE1E;;;;;;;;GAQG;AACH,wBAAsB,UAAU,CAC9B,MAAM,EAAE,YAAY,EACpB,aAAa,EAAE,MAAM,EACrB,QAAQ,GAAE,cAAwB,GACjC,OAAO,CAAC,YAAY,CAAC,CAoEvB"}

package/dist/ops/rebase.js

@@ -1,13 +1,16 @@
 import { runGit } from '../git/process.js';
+import { mergeFromBranch } from '../git/repo.js';
 import { logger } from '../utils/logger.js';
 /**
- * Check if a branch needs rebase and perform it automatically.
- * Uses --force-with-lease for push to protect against overwriting others' work.
+ * Update a branch to incorporate latest base branch changes and push.
+ * Supports both merge and rebase strategies. Uses --force-with-lease for
+ * push to protect against overwriting others' work.
  *
- * @returns 'up_to_date' if no rebase needed, 'rebased' on success,
- *          'conflict' if rebase had conflicts (aborted), 'error' on other failures.
+ * @param strategy - 'merge' creates a merge commit (reliable), 'rebase' replays commits (linear history)
+ * @returns 'up_to_date' if no update needed, 'rebased' on success,
+ *          'conflict' if update had conflicts (aborted), 'error' on other failures.
  */
-export async function autoRebase(target, repoLocalPath) {
+export async function autoRebase(target, repoLocalPath, strategy = 'merge') {
     const { branchName, baseBranch, worktreePath } = target;
     const log = logger.child({ repo: target.repo, issue: target.issueNumber, branch: branchName });
     try {
@@ -16,51 +19,62 @@ export async function autoRebase(target, repoLocalPath) {
             cwd: repoLocalPath,
             timeout: 60_000,
         });
-        // Check if base branch is already an ancestor of HEAD (i.e., no rebase needed)
+        // Check if base branch is already an ancestor of HEAD (i.e., no update needed)
         try {
             await runGit(['merge-base', '--is-ancestor', `origin/${baseBranch}`, 'HEAD'], {
                 cwd: worktreePath,
                 timeout: 30_000,
             });
-            // Exit code 0 means base is ancestor → already up to date
             return 'up_to_date';
         }
         catch {
-            // Non-zero exit = base is NOT an ancestor → rebase needed
+            // Non-zero exit = base is NOT an ancestor → update needed
         }
-        log.info({ baseBranch }, 'Base branch has moved ahead — rebasing');
-        // Attempt rebase
-        try {
-            await runGit(['rebase', `origin/${baseBranch}`], {
-                cwd: worktreePath,
-                timeout: 120_000,
-            });
-        }
-        catch (rebaseErr) {
-            const stderr = rebaseErr.stderr ?? '';
-            if (stderr.includes('CONFLICT') || stderr.includes('could not apply')) {
-                log.warn({ baseBranch }, 'Rebase conflict — aborting');
-                try {
-                    await runGit(['rebase', '--abort'], { cwd: worktreePath, timeout: 30_000 });
+        const remoteRef = `origin/${baseBranch}`;
+        log.info({ baseBranch, strategy }, 'Base branch has moved ahead — updating');
+        if (strategy === 'merge') {
+            const result = await mergeFromBranch(worktreePath, remoteRef);
+            if (!result.success) {
+                if (result.conflict) {
+                    log.warn({ baseBranch }, 'Merge conflict with base branch — aborting');
+                    return 'conflict';
                 }
-                catch {
-                    // Abort itself failed — worktree may be in bad state
-                    log.error('Failed to abort rebase');
+                return 'error';
+            }
+        }
+        else {
+            // Rebase strategy
+            try {
+                await runGit(['rebase', remoteRef], {
+                    cwd: worktreePath,
+                    timeout: 120_000,
+                });
+            }
+            catch (rebaseErr) {
+                const stderr = rebaseErr.stderr ?? '';
+                if (stderr.includes('CONFLICT') || stderr.includes('could not apply')) {
+                    log.warn({ baseBranch }, 'Rebase conflict — aborting');
+                    try {
+                        await runGit(['rebase', '--abort'], { cwd: worktreePath, timeout: 30_000 });
+                    }
+                    catch {
+                        log.error('Failed to abort rebase');
+                    }
+                    return 'conflict';
                 }
-                return 'conflict';
+                throw rebaseErr;
             }
-            throw rebaseErr;
         }
         // Push with --force-with-lease
         await runGit(['push', '--force-with-lease', 'origin', branchName], {
             cwd: worktreePath,
             timeout: 60_000,
         });
-        log.info({ baseBranch }, 'Rebased and pushed successfully');
+        log.info({ baseBranch, strategy }, 'Updated and pushed successfully');
         return 'rebased';
     }
     catch (err) {
-        log.error({ err }, 'Auto-rebase failed');
+        log.error({ err }, 'Auto-update failed');
         return 'error';
     }
 }

package/dist/ops/rebase.js.map

@@ -1 +1 @@
-{"version":3,"file":"rebase.js","sourceRoot":"","sources":["../../src/ops/rebase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAa3C;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,MAAoB,EACpB,aAAqB;IAErB,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,MAAM,CAAA;IACvD,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAA;IAE9F,IAAI,CAAC;QACH,4BAA4B;QAC5B,MAAM,MAAM,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE;YAChC,GAAG,EAAE,aAAa;YAClB,OAAO,EAAE,MAAM;SAChB,CAAC,CAAA;QAEF,+EAA+E;QAC/E,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,CAAC,YAAY,EAAE,eAAe,EAAE,UAAU,UAAU,EAAE,EAAE,MAAM,CAAC,EAAE;gBAC5E,GAAG,EAAE,YAAY;gBACjB,OAAO,EAAE,MAAM;aAChB,CAAC,CAAA;YACF,0DAA0D;YAC1D,OAAO,YAAY,CAAA;QACrB,CAAC;QAAC,MAAM,CAAC;YACP,0DAA0D;QAC5D,CAAC;QAED,GAAG,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,EAAE,wCAAwC,CAAC,CAAA;QAElE,iBAAiB;QACjB,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,CAAC,QAAQ,EAAE,UAAU,UAAU,EAAE,CAAC,EAAE;gBAC/C,GAAG,EAAE,YAAY;gBACjB,OAAO,EAAE,OAAO;aACjB,CAAC,CAAA;QACJ,CAAC;QAAC,OAAO,SAAS,EAAE,CAAC;YACnB,MAAM,MAAM,GAAI,SAAiC,CAAC,MAAM,IAAI,EAAE,CAAA;YAC9D,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC;gBACtE,GAAG,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,EAAE,4BAA4B,CAAC,CAAA;gBACtD,IAAI,CAAC;oBACH,MAAM,MAAM,CAAC,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAA;gBAC7E,CAAC;gBAAC,MAAM,CAAC;oBACP,qDAAqD;oBACrD,GAAG,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAA;gBACrC,CAAC;gBACD,OAAO,UAAU,CAAA;YACnB,CAAC;YACD,MAAM,SAAS,CAAA;QACjB,CAAC;QAED,+BAA+B;QAC/B,MAAM,MAAM,CAAC,CAAC,MAAM,EAAE,oBAAoB,EAAE,QAAQ,EAAE,UAAU,CAAC,EAAE;YACjE,GAAG,EAAE,YAAY;YACjB,OAAO,EAAE,MAAM;SAChB,CAAC,CAAA;QAEF,GAAG,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,EAAE,iCAAiC,CAAC,CAAA;QAC3D,OAAO,SAAS,CAAA;IAClB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,GAAG,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,oBAAoB,CAAC,CAAA;QACxC,OAAO,OAAO,CAAA;IAChB,CAAC;AACH,CAAC"}
+{"version":3,"file":"rebase.js","sourceRoot":"","sources":["../../src/ops/rebase.ts"],"names":[],"mappings":"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"}

package/dist/runner/comment-commands.d.ts

@@ -0,0 +1,20 @@
+import type { Config } from '../config/schema.js';
+import type Database from 'better-sqlite3';
+import type { RunManager } from '../state/runs.js';
+import type { LeaseManager } from '../state/leases.js';
+import type { ForgeAdapter } from '../forge/types.js';
+/** Issues that returned 404 during comment scan in this process lifecycle.
+ *  Bounded: entries are evicted when the key's run reaches a terminal state
+ *  via cleanupRunCaches. */
+export declare const missingCommentCommandIssues: Set<string>;
+export interface ProcessCommentCommandsParams {
+    config: Config;
+    db: Database.Database;
+    forge: ForgeAdapter;
+    runManager: RunManager;
+    leaseManager: LeaseManager;
+    repoConfig: Config['repos'][0];
+    botUser: string;
+}
+export declare function processCommentCommands(params: ProcessCommentCommandsParams): Promise<void>;
+//# sourceMappingURL=comment-commands.d.ts.map

package/dist/runner/comment-commands.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"comment-commands.d.ts","sourceRoot":"","sources":["../../src/runner/comment-commands.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AACjD,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAA;AAC1C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAerD;;4BAE4B;AAC5B,eAAO,MAAM,2BAA2B,aAAoB,CAAA;AAE5D,MAAM,WAAW,4BAA4B;IAC3C,MAAM,EAAE,MAAM,CAAA;IACd,EAAE,EAAE,QAAQ,CAAC,QAAQ,CAAA;IACrB,KAAK,EAAE,YAAY,CAAA;IACnB,UAAU,EAAE,UAAU,CAAA;IACtB,YAAY,EAAE,YAAY,CAAA;IAC1B,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;IAC9B,OAAO,EAAE,MAAM,CAAA;CAChB;AAUD,wBAAsB,sBAAsB,CAAC,MAAM,EAAE,4BAA4B,GAAG,OAAO,CAAC,IAAI,CAAC,CA4HhG"}

package/dist/runner/comment-commands.js

@@ -0,0 +1,221 @@
+import { transitionLabels } from '../labels/manager.js';
+import { buildLabelConfig } from '../labels/config.js';
+import { queueRebase } from '../ops/rebase-and-check.js';
+import { queueContinue } from '../ops/continue.js';
+import { isCommandProcessed, markCommandProcessed, parseOrchCommands, } from '../discovery/commands.js';
+import { resolveIssueRepo } from '../utils/issue-repo.js';
+import { nowUtcIso } from '../utils/time.js';
+import { logger } from '../utils/logger.js';
+/** Issues that returned 404 during comment scan in this process lifecycle.
+ *  Bounded: entries are evicted when the key's run reaches a terminal state
+ *  via cleanupRunCaches. */
+export const missingCommentCommandIssues = new Set();
+function getHttpStatus(err) {
+    if (typeof err !== 'object' || err === null)
+        return null;
+    const e = err;
+    if (typeof e.status === 'number')
+        return e.status;
+    if (typeof e.response?.status === 'number')
+        return e.response.status;
+    return null;
+}
+export async function processCommentCommands(params) {
+    const { config, db, forge, runManager, leaseManager, repoConfig, botUser, } = params;
+    const commandSettings = config.commentCommands ?? { enabled: true, requireCollaborator: false };
+    if (!commandSettings.enabled)
+        return;
+    if (!commandSettings.requireCollaborator) {
+        logger.warn({ repo: repoConfig.repo }, 'commentCommands.requireCollaborator=false — /orch commands accept any commenter. Enable on public repos.');
+    }
+    const activeRuns = runManager
+        .getActive()
+        .filter((run) => run.repo === repoConfig.repo);
+    const issueRows = [...new Map(activeRuns.map((run) => {
+            const issueRepo = resolveIssueRepo(run.phaseData, repoConfig.repo);
+            return [`${issueRepo}#${run.issueNumber}`, { issue_number: run.issueNumber, issue_repo: issueRepo }];
+        })).values()]
+        .sort((a, b) => a.issue_repo.localeCompare(b.issue_repo) || a.issue_number - b.issue_number);
+    if (issueRows.length === 0)
+        return;
+    const collaboratorCache = new Map();
+    for (const row of issueRows) {
+        const issueKey = `${row.issue_repo}#${row.issue_number}`;
+        if (missingCommentCommandIssues.has(issueKey)) {
+            continue;
+        }
+        let comments;
+        try {
+            comments = await forge.listIssueComments(row.issue_repo, row.issue_number);
+        }
+        catch (err) {
+            if (getHttpStatus(err) === 404) {
+                missingCommentCommandIssues.add(issueKey);
+                logger.debug({ repo: row.issue_repo, issueNumber: row.issue_number }, 'Skipping comment command scan for missing or inaccessible issue');
+                continue;
+            }
+            throw err;
+        }
+        const parsed = parseOrchCommands(comments, '1970-01-01T00:00:00Z');
+        for (const item of parsed) {
+            if (isCommandProcessed(db, row.issue_repo, row.issue_number, item.commentId))
+                continue;
+            let commandStatus = null;
+            try {
+                const allowed = await canExecuteCommentCommand({
+                    forge,
+                    repo: row.issue_repo,
+                    user: item.user,
+                    requireCollaborator: commandSettings.requireCollaborator,
+                    cache: collaboratorCache,
+                });
+                if (!allowed) {
+                    commandStatus = 'denied';
+                    logger.info({ repo: repoConfig.repo, issueNumber: row.issue_number, user: item.user, commentId: item.commentId }, 'Ignoring comment command from non-collaborator');
+                    continue;
+                }
+                const result = await executeCommentCommand({
+                    command: item.command,
+                    db,
+                    forge,
+                    runManager,
+                    leaseManager,
+                    repoConfig,
+                    issueRepo: row.issue_repo,
+                    issueNumber: row.issue_number,
+                    botUser,
+                    user: item.user,
+                });
+                if (!result.ok) {
+                    commandStatus = 'rejected';
+                    logger.info({ repo: repoConfig.repo, issueNumber: row.issue_number, command: item.command.type, reason: result.reason }, 'Comment command rejected');
+                }
+                else {
+                    commandStatus = 'applied';
+                    logger.info({ repo: repoConfig.repo, issueNumber: row.issue_number, command: item.command.type, user: item.user }, 'Comment command applied');
+                }
+            }
+            catch (err) {
+                logger.warn({ repo: repoConfig.repo, issueNumber: row.issue_number, commentId: item.commentId, command: item.command.type, err }, 'Comment command failed (transient — will retry)');
+            }
+            finally {
+                if (commandStatus !== null) {
+                    markCommandProcessed(db, row.issue_repo, row.issue_number, item.commentId, `${item.command.type}:${commandStatus}`);
+                }
+            }
+        }
+    }
+}
+async function canExecuteCommentCommand(params) {
+    const { forge, repo, user, requireCollaborator, cache } = params;
+    if (!requireCollaborator)
+        return true;
+    if (!user)
+        return false;
+    const cacheKey = `${repo}\n${user}`;
+    const cached = cache.get(cacheKey);
+    if (cached !== undefined)
+        return cached;
+    if (!forge.isCollaborator) {
+        logger.warn({ repo, user }, 'requireCollaborator=true but forge adapter has no isCollaborator() implementation');
+        cache.set(cacheKey, false);
+        return false;
+    }
+    try {
+        const allowed = await forge.isCollaborator(repo, user);
+        cache.set(cacheKey, allowed);
+        return allowed;
+    }
+    catch (err) {
+        logger.warn({ repo, user, err }, 'Failed collaborator check for comment command user');
+        cache.set(cacheKey, false);
+        return false;
+    }
+}
+async function executeCommentCommand(params) {
+    const { command, db, forge, runManager, leaseManager, repoConfig, issueRepo, issueNumber, botUser, user, } = params;
+    switch (command.type) {
+        case 'retry':
+            return queueRetryFromComment({
+                runManager,
+                leaseManager,
+                forge,
+                repoConfig,
+                issueRepo,
+                issueNumber,
+                resetPlan: command.resetPlan,
+            });
+        case 'continue':
+            {
+                const result = await queueContinue(db, forge, repoConfig, issueNumber, botUser, { issueRepo });
+                return result.queued ? { ok: true } : { ok: false, reason: result.reason };
+            }
+        case 'rebase': {
+            const result = await queueRebase(db, forge, repoConfig, issueNumber, botUser);
+            return result.queued ? { ok: true } : { ok: false, reason: result.reason };
+        }
+        case 'cancel':
+            return cancelRunFromComment({
+                runManager,
+                leaseManager,
+                forge,
+                repoConfig,
+                issueRepo,
+                issueNumber,
+                user,
+            });
+        default: {
+            const exhaustive = command;
+            return { ok: false, reason: `Unsupported command: ${String(exhaustive)}` };
+        }
+    }
+}
+async function queueRetryFromComment(params) {
+    const { runManager, leaseManager, forge, repoConfig, issueRepo, issueNumber, resetPlan } = params;
+    const run = runManager.getByRepoAndIssue(repoConfig.repo, issueNumber);
+    if (!run)
+        return { ok: false, reason: 'No run found for issue' };
+    if (run.status === 'running')
+        return { ok: false, reason: 'Run is currently running' };
+    if (!['blocked', 'error', 'review_ready'].includes(run.status)) {
+        return { ok: false, reason: `Retry not allowed from status ${run.status}` };
+    }
+    runManager.update(run.id, {
+        status: 'queued',
+        currentPhase: null,
+        endedAt: null,
+        lastError: null,
+        phaseData: resetPlan ? null : run.phaseData,
+        blockReason: null,
+    });
+    leaseManager.release(issueRepo, issueNumber);
+    if (issueRepo !== repoConfig.repo) {
+        leaseManager.release(repoConfig.repo, issueNumber);
+    }
+    const issue = await forge.getIssue(issueRepo, issueNumber);
+    await transitionLabels(forge, issueRepo, issueNumber, issue.labels, run.status, 'queued', buildLabelConfig(repoConfig, issue.labels));
+    return { ok: true };
+}
+async function cancelRunFromComment(params) {
+    const { runManager, leaseManager, forge, repoConfig, issueRepo, issueNumber, user } = params;
+    const run = runManager.getByRepoAndIssue(repoConfig.repo, issueNumber);
+    if (!run)
+        return { ok: false, reason: 'No run found for issue' };
+    if (run.status !== 'running' && run.status !== 'queued') {
+        return { ok: false, reason: `Cancel only supports running/queued runs (current: ${run.status})` };
+    }
+    runManager.update(run.id, {
+        status: 'blocked',
+        endedAt: nowUtcIso(),
+        lastError: `Cancelled by @${user} via comment command`,
+        blockReason: null,
+    });
+    leaseManager.release(issueRepo, issueNumber);
+    if (issueRepo !== repoConfig.repo) {
+        leaseManager.release(repoConfig.repo, issueNumber);
+    }
+    const issue = await forge.getIssue(issueRepo, issueNumber);
+    await transitionLabels(forge, issueRepo, issueNumber, issue.labels, run.status, 'blocked', buildLabelConfig(repoConfig, issue.labels));
+    return { ok: true };
+}
+//# sourceMappingURL=comment-commands.js.map

package/dist/runner/comment-commands.js.map

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