@staff0rd/assist 0.347.0 → 0.349.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.347.0",
+  version: "0.349.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -202,7 +202,8 @@ var assistConfigSchema = z2.strictObject({
     expectedBranch: z2.string().optional()
   }).default({ conventional: false, pull: false, push: false }),
   branch: z2.strictObject({
-    prefix: z2.string().optional()
+    prefix: z2.string().optional(),
+    defaultBranch: z2.string().optional()
   }).optional(),
   devlog: z2.strictObject({
     name: z2.string().optional(),
@@ -8719,18 +8720,20 @@ function buildBranchName({
 
 // src/commands/branch/resolveDefaultBranch.ts
 import { execSync as execSync23 } from "child_process";
-function resolveDefaultBranch(cwd) {
-  const ref = execSync23("git symbolic-ref --short refs/remotes/origin/HEAD", {
-    encoding: "utf8",
-    stdio: ["pipe", "pipe", "pipe"],
-    cwd
-  }).trim();
-  const [, ...rest] = ref.split("/");
-  const branch2 = rest.join("/");
-  if (!branch2) {
-    throw new Error(`Could not resolve default branch from "${ref}"`);
+var REMOTE_HEAD_REGEX = /^ref:\s+refs\/heads\/(\S+)\s+HEAD$/m;
+function resolveDefaultBranch(override, cwd) {
+  if (override) return override;
+  try {
+    const output = execSync23("git ls-remote --symref origin HEAD", {
+      encoding: "utf8",
+      stdio: ["pipe", "pipe", "pipe"],
+      cwd
+    });
+    const match = output.match(REMOTE_HEAD_REGEX);
+    if (match) return match[1];
+  } catch {
   }
-  return branch2;
+  return "main";
 }
 
 // src/commands/branch/validateSlug.ts
@@ -8767,7 +8770,7 @@ function branch(slug, options2) {
     slug
   });
   try {
-    const defaultBranch = resolveDefaultBranch();
+    const defaultBranch = resolveDefaultBranch(config.branch?.defaultBranch);
     execSync24("git fetch", { stdio: "inherit" });
     execSync24(
       `git switch -c ${shellQuote(branchName)} ${shellQuote(`origin/${defaultBranch}`)}`,
@@ -8777,7 +8780,10 @@ function branch(slug, options2) {
       `Created and switched to ${branchName} (from origin/${defaultBranch})`
     );
     process.exit(0);
-  } catch {
+  } catch (error) {
+    console.error(
+      `Error: ${error instanceof Error ? error.message : String(error)}`
+    );
     process.exit(1);
   }
 }
@@ -8931,14 +8937,26 @@ var BUILTIN_DENIES = [
     message: `Do not run 'git commit' directly. Use 'assist commit "<message>"' instead.`
   }
 ];
+var BRANCH_CREATION_MESSAGE = "Do not create branches with raw git. Use the /branch command, or 'assist branch <slug> [--jira <KEY>]' \u2014 it branches off the fresh remote default and enforces the team naming convention.";
+var BRANCH_CREATION_REGEXES = [
+  /(?<=^|\s)git\s+(?:checkout|co)\s+-[bB](?=\s|$)/,
+  /(?<=^|\s)git\s+switch\s+(?:-[cC]|--create)(?=\s|$)/,
+  /(?<=^|\s)git\s+branch\s+(?!-)\S/
+];
 function rawDenyRegex(pattern2) {
   const tokens = pattern2.trim().split(/\s+/).map((token) => token.replace(/[.*+?^${}()|[\]\\]/g, String.raw`\$&`)).join(String.raw`\s+`);
   return new RegExp(`(?<=^|\\s)${tokens}(?=\\s|$)`);
 }
-var RAW_BUILTIN_DENIES = BUILTIN_DENIES.map((rule) => ({
-  ...rule,
-  regex: rawDenyRegex(rule.pattern)
-}));
+var RAW_BUILTIN_DENIES = [
+  ...BUILTIN_DENIES.map((rule) => ({
+    message: rule.message,
+    regex: rawDenyRegex(rule.pattern)
+  })),
+  ...BRANCH_CREATION_REGEXES.map((regex) => ({
+    message: BRANCH_CREATION_MESSAGE,
+    regex
+  }))
+];
 function matchBuiltinDeny(text7) {
   return RAW_BUILTIN_DENIES.find((rule) => rule.regex.test(text7));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@staff0rd/assist",
-	"version": "0.347.0",
+	"version": "0.349.0",
 	"type": "module",
 	"main": "dist/index.js",
 	"bin": {