@devflow-one/cli 0.1.6 → 0.1.8

package/README.md

@@ -166,6 +166,17 @@ devflow mr create "Title" feat/x --body "desc" --project ABC
 # pattern is expanded to the newest matching remote branch), or pick one
 devflow mr create "Title" feat/x --base release/2026.4 --project ABC
 
+# PR type: the project's first configured type by default — it supplies the
+# description/title templates and the labels the PR is stamped with. Pass its id
+# or its label to pick another; an unrecognized value falls back to that default.
+devflow mr create "Title" feat/x --type Bugfix --project ABC
+devflow mr types --project ABC                # configured types: id, label, default flag
+
+# issue key: parsed from the head branch by default; --issue sets it explicitly
+# ({parentWithChildIssueKeys}/{issueKey}/{issueTitle} template tokens) for a branch without one.
+# {issueTitle} needs the Jira API token set in Settings, else it renders empty.
+devflow mr create "Title" feat/x --issue ABC-123
+
 # routed by issue key (project key = prefix before the last '-')
 devflow mr find ABC-123
 devflow pipeline status 42 deadbeef --issue ABC-9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devflow-one/cli",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "Terminal CLI wrapping the local DevFlow gateway so shell scripts can trigger repo actions.",
   "keywords": [
     "devflow",

package/src/cli.js

@@ -77,6 +77,15 @@ function printResult(result, json, stdout) {
   }
 }
 
+/** Echo a result's `warnings` to stderr so they stay visible next to --json stdout. */
+function printWarnings(result, stderr) {
+  const warnings = Array.isArray(result?.warnings) ? result.warnings : [];
+
+  for (const warning of warnings) {
+    stderr(`warning: ${warning}`);
+  }
+}
+
 /** Print an error, honoring --json, to stderr. */
 function printError(err, json, stderr) {
   const code = err instanceof GatewayError ? err.code : err.name;
@@ -217,6 +226,7 @@ export async function run(argv, io = {}) {
     const result = await request(config, "POST", `/actions/${action}`, body);
 
     printResult(result, Boolean(flags.json), stdout);
+    printWarnings(result, stderr);
 
     return 0;
   } catch (err) {

package/src/commands.js

@@ -66,6 +66,19 @@ function toBranch(flag, raw) {
   return branch;
 }
 
+/** Parse a value-taking flag as a non-blank string, or fail clearly. */
+function toText(flag, raw) {
+  if (raw === undefined) return undefined;
+
+  const text = String(raw).trim();
+
+  if (raw === true || text === "") {
+    throw new UsageError(`"--${flag}" requires a value.`);
+  }
+
+  return text;
+}
+
 /** A bad-invocation error (wrong/missing args) — printed with the command usage. */
 export class UsageError extends Error {
   constructor(message) {
@@ -130,7 +143,10 @@ const COMMANDS = {
     action: "commitByTemplate",
     usage:
       'commit template <worktreePath> [--values \'{"key":"val"}\'] [--no-push] [--issue KEY] [--project KEY]' +
-      " (--values keys must match the {key} tokens of the project's configured commit template)",
+      " (--values keys fill the project's commit template, default" +
+      ' "{summary}\\n\\n{changesList}\\n\\n{issueSlug}": summary, changesList (string array,' +
+      " rendered as bullets), issueSlug, prNumber; missing keys are left empty and reported" +
+      " as warnings on stderr)",
     buildArgs: ([worktreePath], flags) => {
       if (!worktreePath) throw new UsageError("commit template requires <worktreePath>.");
 
@@ -145,20 +161,27 @@ const COMMANDS = {
     method: "POST",
     action: "createPullRequest",
     usage:
-      "mr create <title> <headBranch> [--body <text>] [--base <branch>] [--issue KEY] [--project KEY]" +
-      " (--base defaults to the repo's configured base branch, expanding a {year}/{number} pattern)",
+      "mr create <title> <headBranch> [--body <text>] [--base <branch>] [--type <idOrLabel>]" +
+      " [--issue KEY] [--project KEY]" +
+      " (--base defaults to the repo's configured base branch, expanding a {year}/{number} pattern;" +
+      " --type defaults to the project's first configured PR type)",
     buildArgs: ([title, headBranch], flags) => {
       if (!title || !headBranch) {
         throw new UsageError("mr create requires <title> and <headBranch>.");
       }
 
       const baseBranch = toBranch("base", flags.base);
+      const prType = toText("type", flags.type);
+      // Only an explicit --issue is forwarded; the gateway otherwise parses the head branch.
+      const issueKey = toText("issue", flags.issue);
+
+      // Trailing undefined is trimmed so the gateway resolves the repo's own
+      // configured base branch (and expands a pattern) instead of seeing null.
+      const args = [title, flags.body ?? "", headBranch, baseBranch, prType, issueKey];
 
-      // Omitted rather than trailing-undefined so the gateway resolves the repo's
-      // own configured base branch (and expands a pattern) instead of seeing null.
-      return baseBranch
-        ? [title, flags.body ?? "", headBranch, baseBranch]
-        : [title, flags.body ?? "", headBranch];
+      while (args.length > 3 && args[args.length - 1] === undefined) args.pop();
+
+      return args;
     },
   },
   "mr ready": {
@@ -247,6 +270,12 @@ const COMMANDS = {
       return [key];
     },
   },
+  "mr types": {
+    method: "POST",
+    action: "listPrTypes",
+    usage: "mr types [--issue KEY] [--project KEY]",
+    buildArgs: () => [],
+  },
   "mr fix-prompt": {
     method: "POST",
     action: "getFixCommentsPrompt",

package/src/context.js

@@ -5,7 +5,7 @@
 // The resolver itself (contextResolver.js) is generated from shared/ and must not
 // be edited here; everything CLI-specific lives in this file.
 
-import { resolveContext } from "./contextResolver.js";
+import { issueKeyToProjectKey, resolveContext } from "./contextResolver.js";
 import { createGitRunner } from "./gitFacts.js";
 import { GatewayError } from "./client.js";
 import { UsageError } from "./commands.js";
@@ -84,13 +84,7 @@ export function resolveCliContext(
 export function projectKeyFrom(context) {
   if (context.projectKey) return context.projectKey.toUpperCase();
 
-  if (context.issueKey) {
-    const lastDash = context.issueKey.lastIndexOf("-");
-
-    return (lastDash === -1 ? context.issueKey : context.issueKey.slice(0, lastDash)).toUpperCase();
-  }
-
-  return undefined;
+  return issueKeyToProjectKey(context.issueKey);
 }
 
 /** Describe one ambiguity candidate as `PROJECT/repo (profile)`. */
@@ -203,10 +197,16 @@ export function offlineProfileError(context) {
 
 /**
  * How the resolved profile looks to the daemon. Shown inline on the profile row
- * so `devflow where` answers "would a call work?" without a second lookup.
+ * so `devflow where` answers "would a call work?" without a second lookup. A
+ * connected profile also names the extension bundle it is running, so a stale
+ * `dist/` can be spotted without guessing.
  */
 function describeLiveness(context) {
-  if (context.profileAlive === true) return "connected";
+  if (context.profileAlive === true) {
+    return context.buildStamp
+      ? `connected; extension build ${context.buildStamp}`
+      : "connected; extension build unknown (this build predates the stamp)";
+  }
 
   if (context.profileAlive === false) {
     return "NOT connected; open this Chrome profile before running actions";

package/src/contextResolver.js

@@ -56,11 +56,11 @@ function clean(value) {
 
 /**
  * The project a key or issue key belongs to: split on the LAST `-` and uppercase
- * (`abc-123` → `ABC`). Mirrors `issueKeyToProjectKey` in the daemon's routing.js.
- * @param {string | undefined} value
- * @returns {string | undefined}
+ * (`abc-123` → `ABC`). A value with no `-` is already a project key.
+ * @param {unknown} value
+ * @returns {string | undefined} `undefined` for a non-string or blank value
  */
-function projectOf(value) {
+export function issueKeyToProjectKey(value) {
   const trimmed = clean(value);
 
   if (!trimmed) return undefined;
@@ -163,7 +163,8 @@ function fill(resolved, source, origin) {
  * @param {(q: { cwd?: string, remote?: string, branch?: string }) => Promise<object | null>} [options.queryContext]
  * @returns {Promise<{
  *   projectKey?: string, issueKey?: string, repo?: string, baseBranch?: string,
- *   profile?: string, profileAlive?: boolean | null, matchedBy: Record<string, string>,
+ *   profile?: string, profileAlive?: boolean | null, buildStamp?: string | null,
+ *   matchedBy: Record<string, string>,
  *   candidates?: object[], ambiguous?: boolean, warnings: string[]
  * }>}
  */
@@ -226,16 +227,10 @@ export async function resolveContext({
     // so the reported precedence step reflects the real reason, not a guess.
     const origin = context.matchedBy === "remote" ? "gitRemote" : "localPath";
 
-    // The daemon answered "this CHECKOUT belongs to project P". Its repo, profile,
-    // liveness and issue key all describe P — they are only meaningful together.
-    // If the caller already pinned a different project, adopting them field-by-field
-    // would aim the action at P's repository under the caller's key: silent
-    // mis-targeting, and worse than a failure because nothing looks wrong. So the
-    // whole group is discarded on disagreement. Note this compares the KEYS, not
-    // merely where they came from — a caller who names the project the checkout
-    // already matches is agreeing, and must still get its repo/profile.
-    const pinned = projectOf(resolved.projectKey) ?? projectOf(resolved.issueKey);
-    const matched = projectOf(context.projectKey);
+    // A pinned project that disagrees with the match discards its repo/profile/issue together.
+    const pinned =
+      issueKeyToProjectKey(resolved.projectKey) ?? issueKeyToProjectKey(resolved.issueKey);
+    const matched = issueKeyToProjectKey(context.projectKey);
     const conflict = Boolean(pinned && matched && pinned !== matched);
 
     if (conflict) {
@@ -272,8 +267,12 @@ export async function resolveContext({
 
     // Liveness is only meaningful for the profile we actually resolved to; it lets
     // consumers name an offline profile instead of printing a bare NO_PROFILE.
+    // The build stamp describes that same profile's running extension bundle, so
+    // it is gated identically — reporting one profile's bundle beside another's id
+    // is exactly the confusion the stamp exists to end.
     if (!conflict && resolved.profile && resolved.profile === clean(context.profileId)) {
       resolved.profileAlive = context.profileAlive ?? null;
+      resolved.buildStamp = context.buildStamp ?? null;
     }
 
     // The daemon's issue key describes its matched project too, so it is dropped on

package/src/gatewayDataDir.js

@@ -20,7 +20,7 @@ export const APP_DIR_NAME = "devflow";
 /** Filename the daemon writes the gateway token to, under the data dir. */
 export const TOKEN_FILE = "gateway-token";
 
-/** Default gateway port — must match desktop/src/gateway/server.js. */
+/** Default gateway port, shared by the daemon and every client. */
 export const DEFAULT_PORT = 8787;
 
 /** Loopback host; the gateway only ever binds 127.0.0.1. */