@brainervirus/workit-core 0.8.2 → 0.8.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brainervirus/workit-core",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "private": false,
   "description": "Workit — workflow rails for agentic coding: specs, plans, YouTrack, CI-gated commits (shared core)",
   "keywords": [

package/src/core/pr-create.ts

@@ -147,9 +147,15 @@ export function prCreate(env: NodeJS.ProcessEnv, cwd: string): Record<string, an
   // target is validated against the resolved branch policy so a PR can never
   // be aimed at a protected or disallowed branch.
   const targetOverride = env.WF_PR_TARGET;
-  const target =
-    targetOverride || String(cfg.defaultTargetBranch ?? policy.defaultTargetBranch ?? "develop");
-  if (targetOverride) {
+  const resolvedDefault = String(
+    cfg.defaultTargetBranch ?? policy.defaultTargetBranch ?? "develop",
+  );
+  const target = targetOverride || resolvedDefault;
+  // CA-06: an explicit override equal to the resolved default (e.g. WF_PR_TARGET
+  // "main" under github-flow) is authoritative — the same value flows
+  // unvalidated from config, so it must not be rejected as a protected
+  // override. Genuine differing overrides keep the strict validation.
+  if (targetOverride && targetOverride !== resolvedDefault) {
     const { allowed, protected: protectedTargets } = policy;
     if (protectedTargets.has(targetOverride.toLowerCase()))
       return {
@@ -283,6 +289,31 @@ export function prCreate(env: NodeJS.ProcessEnv, cwd: string): Record<string, an
     // uv_spawn fails with ENOENT even though the CLI is on PATH.
     cmdEnv = { ...process.env, PATH: process.env.PATH ?? "", GITLAB_TOKEN: token };
   } else {
+    // T2: GitHub has no --push flag — push the branch first so `gh pr create`
+    // never runs against an unpushed branch when pushBranch is enabled.
+    if (push) {
+      if (!branch) {
+        return {
+          error: "push failed",
+          provider,
+          mode: "push",
+          targetBranch: target,
+          stderr: "empty current branch (detached HEAD or unborn HEAD)",
+        };
+      }
+      const pushRes = spawnSync("git", ["push", "-u", "origin", branch], {
+        cwd: root,
+        encoding: "utf8",
+      });
+      if (pushRes.status !== 0) {
+        return {
+          error: "push failed",
+          provider,
+          targetBranch: target,
+          stderr: (pushRes.stderr ?? "").slice(0, 800),
+        };
+      }
+    }
     cmd = ["gh", "pr", "create", "--title", title, "--base", target];
     if (finalBody) cmd.push("--body", finalBody);
     if (draft) cmd.push("--draft");

package/src/core/vcs-config.ts

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import { spawnSync } from "node:child_process";
-import { configDir } from "./config";
+import { configDir, PRESETS } from "./config";
 import { resolveWorkspace } from "./workspaces";
 import { resolveBranchPolicyFor } from "./branch";
 // Ports of scripts/vcs/config.sh + verify-token.sh + token-create-urls.sh + merged-style.sh.
@@ -90,10 +90,17 @@ export function vcsConfig(mode: "load" | "summary" | "resolve", cwd?: string): R
   // and resolve so both surfaces stay consistent.
   // CA-09: the one resolver wrapper — same policy resolution every consumer
   // uses, so the tightened gate in branch-policy-resolver.test.ts stays green.
+  // CA-02: a matched workspace's OWN branchPolicy default beats any global
+  // vcs.json default (PR #43: global develop shadowed the personal github-flow
+  // main). Explicit workspace vcs.defaultTargetBranch stays authoritative; a
+  // workspace without a branchPolicy still falls back to the global vcs.json
+  // default, and unmatched repos keep it too.
+  const wp = (ws?.branchPolicy ?? {}) as Record<string, any>;
+  const hasWorkspacePolicy = typeof wp.preset === "string" && Object.hasOwn(PRESETS, wp.preset);
+  const policyDefault = resolveBranchPolicyFor(root).defaultTargetBranch;
   const defaultTarget = String(
     wsVcs.defaultTargetBranch ??
-      cfg.defaultTargetBranch ??
-      resolveBranchPolicyFor(root).defaultTargetBranch ??
+      (hasWorkspacePolicy ? policyDefault : (cfg.defaultTargetBranch ?? policyDefault)) ??
       "develop",
   );
   const linkIssues = typeof wsYt.link_issues === "boolean" ? wsYt.link_issues : null;