@mcoda/core 0.1.37 → 0.1.40

package/dist/services/review/CodeReviewService.js

@@ -14,11 +14,11 @@ import { createTaskKeyGenerator } from "../planning/KeyHelpers.js";
 import { RoutingService } from "../agents/RoutingService.js";
 import { AgentRatingService } from "../agents/AgentRatingService.js";
 import { ensureProjectGuidance, isDocContextExcluded, loadProjectGuidance, normalizeDocType, } from "../shared/ProjectGuidance.js";
+import { resolveWorkspaceBaseBranch } from "../shared/GitBranch.js";
 import { buildDocdexUsageGuidance } from "../shared/DocdexGuidance.js";
 import { createTaskCommentSlug, formatTaskCommentBody } from "../tasks/TaskCommentFormatter.js";
 import { AUTH_ERROR_REASON, isAuthErrorMessage } from "../shared/AuthErrors.js";
 import { normalizeReviewOutput } from "./ReviewNormalizer.js";
-const DEFAULT_BASE_BRANCH = "mcoda-dev";
 const REVIEW_DIR = (mcodaDir, jobId) => path.join(mcodaDir, "jobs", jobId, "review");
 const STATE_PATH = (mcodaDir, jobId) => path.join(REVIEW_DIR(mcodaDir, jobId), "state.json");
 const REVIEW_PROMPT_LIMITS = {
@@ -1530,7 +1530,7 @@ export class CodeReviewService {
     async reviewTasks(request) {
         await this.ensureMcoda();
         const agentStream = request.agentStream !== false;
-        const baseRef = request.baseRef ?? this.workspace.config?.branch ?? DEFAULT_BASE_BRANCH;
+        const baseRef = await resolveWorkspaceBaseBranch(this.workspace, request.baseRef);
         let executionContextPolicy = normalizeExecutionContextPolicy(request.executionContextPolicy);
         let emptyDiffApprovalPolicy = normalizeEmptyDiffApprovalPolicy(request.emptyDiffApprovalPolicy, "complete");
         const ignoreStatusFilter = Boolean(request.taskKeys?.length) || request.ignoreStatusFilter === true;

package/dist/services/shared/GitBranch.d.ts

@@ -0,0 +1,6 @@
+import type { WorkspaceResolution } from "../../workspace/WorkspaceManager.js";
+type WorkspaceBranchContext = Pick<WorkspaceResolution, "workspaceRoot" | "config">;
+export declare const readGitBranch: (workspaceRoot: string) => Promise<string | undefined>;
+export declare const resolveWorkspaceBaseBranch: (workspace: WorkspaceBranchContext, requestedBranch?: string | null, fallbackBranch?: string) => Promise<string>;
+export {};
+//# sourceMappingURL=GitBranch.d.ts.map

package/dist/services/shared/GitBranch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"GitBranch.d.ts","sourceRoot":"","sources":["../../../src/services/shared/GitBranch.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAM/E,KAAK,sBAAsB,GAAG,IAAI,CAAC,mBAAmB,EAAE,eAAe,GAAG,QAAQ,CAAC,CAAC;AA6BpF,eAAO,MAAM,aAAa,GAAU,eAAe,MAAM,KAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAmBrF,CAAC;AAEF,eAAO,MAAM,0BAA0B,GACrC,WAAW,sBAAsB,EACjC,kBAAkB,MAAM,GAAG,IAAI,EAC/B,uBAAwC,KACvC,OAAO,CAAC,MAAM,CAShB,CAAC"}

package/dist/services/shared/GitBranch.js

@@ -0,0 +1,62 @@
+import fs from "node:fs/promises";
+import path from "node:path";
+const GITDIR_PREFIX = "gitdir:";
+const DETACHED_HEAD_REGEX = /^[0-9a-f]{40}$/i;
+const DEFAULT_FALLBACK_BRANCH = "main";
+const trimToUndefined = (value) => {
+    const trimmed = value?.trim();
+    return trimmed ? trimmed : undefined;
+};
+const resolveGitDir = async (workspaceRoot) => {
+    const dotGitPath = path.join(workspaceRoot, ".git");
+    try {
+        const stat = await fs.lstat(dotGitPath);
+        if (stat.isDirectory())
+            return dotGitPath;
+        if (!stat.isFile())
+            return undefined;
+    }
+    catch {
+        return undefined;
+    }
+    try {
+        const content = (await fs.readFile(dotGitPath, "utf8")).trim();
+        if (!content.toLowerCase().startsWith(GITDIR_PREFIX)) {
+            return undefined;
+        }
+        const gitDir = trimToUndefined(content.slice(GITDIR_PREFIX.length));
+        return gitDir ? path.resolve(workspaceRoot, gitDir) : undefined;
+    }
+    catch {
+        return undefined;
+    }
+};
+export const readGitBranch = async (workspaceRoot) => {
+    const gitDir = await resolveGitDir(workspaceRoot);
+    if (!gitDir) {
+        return undefined;
+    }
+    try {
+        const content = (await fs.readFile(path.join(gitDir, "HEAD"), "utf8")).trim();
+        const match = content.match(/^ref:\s+refs\/heads\/(.+)$/);
+        if (match) {
+            return trimToUndefined(match[1]);
+        }
+        if (!content || content === "HEAD" || DETACHED_HEAD_REGEX.test(content)) {
+            return undefined;
+        }
+        return undefined;
+    }
+    catch {
+        return undefined;
+    }
+};
+export const resolveWorkspaceBaseBranch = async (workspace, requestedBranch, fallbackBranch = DEFAULT_FALLBACK_BRANCH) => {
+    const configuredBranch = trimToUndefined(workspace.config?.branch);
+    const effectiveFallback = configuredBranch ?? (await readGitBranch(workspace.workspaceRoot)) ?? fallbackBranch;
+    const explicitBranch = trimToUndefined(requestedBranch);
+    if (explicitBranch === "dev") {
+        return effectiveFallback;
+    }
+    return explicitBranch ?? effectiveFallback;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcoda/core",
-  "version": "0.1.37",
+  "version": "0.1.40",
   "description": "Core services and APIs for the mcoda CLI.",
   "type": "module",
   "main": "dist/index.js",
@@ -32,11 +32,11 @@
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.1.0",
     "yaml": "^2.4.2",
-    "@mcoda/db": "0.1.37",
-    "@mcoda/shared": "0.1.37",
-    "@mcoda/generators": "0.1.37",
-    "@mcoda/agents": "0.1.37",
-    "@mcoda/integrations": "0.1.37"
+    "@mcoda/shared": "0.1.40",
+    "@mcoda/db": "0.1.40",
+    "@mcoda/agents": "0.1.40",
+    "@mcoda/integrations": "0.1.40",
+    "@mcoda/generators": "0.1.40"
   },
   "scripts": {
     "build": "tsc -p tsconfig.json",