mintree 0.5.3 → 0.5.4

package/dist/commands/dashboard.js

@@ -14,6 +14,7 @@ import { runCreate, runCreateDetached, } from "../lib/worktreeCreate.js";
 import { runRemove, runRemoveByPath } from "../lib/worktreeRemove.js";
 import { writePromptFile } from "../lib/worktreeCreate.js";
 import { buildCreateMarkers, buildOrchestrateMarkers, emitMarkers } from "../lib/markers.js";
+import { buildOrchestratorRcName } from "../lib/orchestrate.js";
 import { readMetadata } from "../lib/metadata.js";
 import { defaultOrchestratorPrompt, renderOrchestratorTemplate, renderPromptTemplate, } from "../lib/promptTemplate.js";
 import { createProvider } from "../lib/providers/index.js";
@@ -1101,7 +1102,8 @@ export default function Dashboard() {
             : defaultOrchestratorPrompt(idList);
         const promptFile = writePromptFile(prompt);
         const permissionMode = meta.defaultPermissionMode ?? "default";
-        emitMarkers(buildOrchestrateMarkers({ repoRoot: root, promptFile, permissionMode }));
+        const rcName = buildOrchestratorRcName(ids) ?? undefined;
+        emitMarkers(buildOrchestrateMarkers({ repoRoot: root, promptFile, permissionMode, rcName }));
         exit();
     }
     function openCreateOverlay(issue) {

package/dist/commands/orchestrate.d.ts

@@ -8,6 +8,7 @@ export declare const options: z.ZodObject<{
         default: "default";
         auto: "auto";
     }>>;
+    rcName: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>;
 type Props = {
     args: z.infer<typeof args>;

package/dist/commands/orchestrate.js

@@ -10,6 +10,7 @@ import { findMainRepoRoot, getMintreeDir, pathExists } from "../lib/git.js";
 import { readMetadata } from "../lib/metadata.js";
 import { launchClaude, PERMISSION_MODES } from "../lib/claude.js";
 import { defaultOrchestratorPrompt, renderOrchestratorTemplate } from "../lib/promptTemplate.js";
+import { buildOrchestratorRcName } from "../lib/orchestrate.js";
 export const description = "Launch a Claude orchestrator in the repo root to resolve a batch of tickets";
 export const args = z
     .array(z.string())
@@ -38,6 +39,12 @@ export const options = z.object({
         description: `Claude --permission-mode (one of: ${PERMISSION_MODES.join(", ")}). Defaults to metadata.defaultPermissionMode, else "default".`,
         alias: "m",
     })),
+    rcName: z
+        .string()
+        .optional()
+        .describe(option({
+        description: "Remote Control name for the session. Defaults to orchestrator-<ids> derived from the positional ids (used by the dashboard, which has no positional ids), else orchestrator-<session-hash>.",
+    })),
 });
 function resolve(cwd, ids, opts) {
     if (opts.prompt && opts.promptFile) {
@@ -96,9 +103,14 @@ function resolve(cwd, ids, opts) {
         };
     }
     const permissionMode = opts.permissionMode ?? readMetadata(repoRoot).defaultPermissionMode ?? "default";
+    const sessionId = randomUUID();
+    // RC name priority: explicit --rc-name (the dashboard passes the
+    // ids-derived name this way) > derive from positional ids > session hash
+    // fallback for the prompt-only path with no tickets to name after.
+    const remoteControlName = opts.rcName ?? buildOrchestratorRcName(ids) ?? `orchestrator-${sessionId.slice(0, 8)}`;
     return {
         ok: true,
-        data: { repoRoot, sessionId: randomUUID(), permissionMode, prompt },
+        data: { repoRoot, sessionId, permissionMode, prompt, remoteControlName },
     };
 }
 export default function Orchestrate({ args: ids, options }) {
@@ -124,11 +136,12 @@ export default function Orchestrate({ args: ids, options }) {
                 resume: false,
                 prompt: resolved.prompt,
                 cwd: resolved.repoRoot,
-                // Suffix the fresh session id so two orchestrators (or an
-                // orchestrator alongside a stale RC session) never share a name.
-                // A literal "orchestrator" collides and the RC handshake fails to
-                // register the newer session.
-                remoteControlName: `orchestrator-${resolved.sessionId.slice(0, 8)}`,
+                // Name the RC session after the tickets it covers
+                // (orchestrator-VAL-12_BE-16_FE-3) so it's identifiable in the RC
+                // UI. Falls back to a session hash when there are no ids. Note:
+                // re-launching the exact same batch reuses the name, which can
+                // collide with a still-registered prior session.
+                remoteControlName: resolved.remoteControlName,
             });
             child.on("error", (err) => {
                 setState({ phase: "error", message: `Failed to launch claude: ${err.message}` });
@@ -152,7 +165,7 @@ export default function Orchestrate({ args: ids, options }) {
     }
     const { resolved } = state;
     const sessionShort = resolved.sessionId.slice(0, 8);
-    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsxs(Box, { marginBottom: 1, children: [_jsx(Text, { bold: true, color: "cyan", children: "mintree orchestrate" }), _jsxs(Text, { dimColor: true, children: [" \u00B7 ", resolved.repoRoot] })] }), _jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "session: " }), _jsxs(Text, { children: [sessionShort, "\u2026"] }), _jsx(Text, { dimColor: true, children: " (starting)" })] }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "permission-mode: " }), _jsx(Text, { children: resolved.permissionMode })] }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "prompt: " }), _jsxs(Text, { children: ["\"", truncate(resolved.prompt.replace(/\n/g, " "), 60), "\""] })] })] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "green", bold: true, children: "\u2713 Launching Claude orchestrator..." }) })] }));
+    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsxs(Box, { marginBottom: 1, children: [_jsx(Text, { bold: true, color: "cyan", children: "mintree orchestrate" }), _jsxs(Text, { dimColor: true, children: [" \u00B7 ", resolved.repoRoot] })] }), _jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "session: " }), _jsxs(Text, { children: [sessionShort, "\u2026"] }), _jsx(Text, { dimColor: true, children: " (starting)" })] }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "rc: " }), _jsx(Text, { children: resolved.remoteControlName })] }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "permission-mode: " }), _jsx(Text, { children: resolved.permissionMode })] }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "prompt: " }), _jsxs(Text, { children: ["\"", truncate(resolved.prompt.replace(/\n/g, " "), 60), "\""] })] })] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "green", bold: true, children: "\u2713 Launching Claude orchestrator..." }) })] }));
 }
 function truncate(s, max) {
     if (s.length <= max)

package/dist/lib/markers.d.ts

@@ -23,6 +23,7 @@ export type OrchestrateMarkers = {
     repoRoot: string;
     promptFile: string;
     permissionMode?: string;
+    rcName?: string;
 };
 /**
  * Builds the marker block emitted when the dashboard launches the orchestrator

package/dist/lib/markers.js

@@ -55,5 +55,8 @@ export function buildOrchestrateMarkers(input) {
     if (input.permissionMode) {
         lines.push(`MINTREE_PERMISSION_MODE:${input.permissionMode}`);
     }
+    if (input.rcName) {
+        lines.push(`MINTREE_ORCHESTRATE_RC_NAME:${input.rcName}`);
+    }
     return lines;
 }

package/dist/lib/orchestrate.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Derives the Remote Control name for an orchestrator session from the ticket
+ * ids it covers, e.g. ["VAL-12", "BE-16", "FE-3"] -> "orchestrator-VAL-12_BE-16_FE-3".
+ *
+ * The ids are joined with "_" (not spaces) so the result is a single
+ * shell-safe token — it travels through the dashboard markers and the shell
+ * wrapper as one `--rc-name` argument without quoting.
+ *
+ * Returns null when there are no ids, letting the caller fall back to a
+ * session-hash name (the `mintree orchestrate --prompt "..."` path, which has
+ * no tickets to name the session after).
+ */
+export declare function buildOrchestratorRcName(ids: string[]): string | null;

package/dist/lib/orchestrate.js

@@ -0,0 +1,17 @@
+/**
+ * Derives the Remote Control name for an orchestrator session from the ticket
+ * ids it covers, e.g. ["VAL-12", "BE-16", "FE-3"] -> "orchestrator-VAL-12_BE-16_FE-3".
+ *
+ * The ids are joined with "_" (not spaces) so the result is a single
+ * shell-safe token — it travels through the dashboard markers and the shell
+ * wrapper as one `--rc-name` argument without quoting.
+ *
+ * Returns null when there are no ids, letting the caller fall back to a
+ * session-hash name (the `mintree orchestrate --prompt "..."` path, which has
+ * no tickets to name the session after).
+ */
+export function buildOrchestratorRcName(ids) {
+    if (ids.length === 0)
+        return null;
+    return `orchestrator-${ids.join("_")}`;
+}

package/dist/lib/providers/linear.js

@@ -21,7 +21,9 @@ import { readMetadata } from "../metadata.js";
 const DEFAULT_API_URL = "https://api.linear.app/graphql";
 // Linear state types we treat as "done" — work in these states is excluded
 // from the assigned list and protected from transitions back to In Progress.
-const DEFAULT_PROTECTED_STATE_TYPES = ["completed", "canceled"];
+// "duplicate" is its own terminal state type in Linear (separate from
+// "canceled"), so it has to be listed explicitly or those issues leak in.
+const DEFAULT_PROTECTED_STATE_TYPES = ["completed", "canceled", "duplicate"];
 const STATUS_ORDER_UNSET = 999;
 // One query covers viewer + teams + issues; a single 20s budget comfortably
 // fits even the slowest cold-start response without making real failures
@@ -261,7 +263,7 @@ const BOOTSTRAP_QUERY = /* GraphQL */ `
 			first: 100
 			filter: {
 				assignee: { isMe: { eq: true } }
-				state: { type: { nin: ["completed", "canceled"] } }
+				state: { type: { nin: ["completed", "canceled", "duplicate"] } }
 				team: { key: { in: $teamKeys } }
 			}
 		) {
@@ -403,9 +405,11 @@ export class LinearProvider {
         const protectedTypes = new Set(cfg.protectedStateTypes ?? DEFAULT_PROTECTED_STATE_TYPES);
         const out = [];
         for (const wi of data.issues) {
-            // Defensive — the bootstrap query already excludes completed/canceled
-            // via state.type.nin, but a workspace could have custom state types
-            // the user added to the protected list locally.
+            // Defensive — the bootstrap query already excludes
+            // completed/canceled/duplicate via state.type.nin, but a workspace
+            // could have custom state types the user added to the protected list
+            // locally (and a stale snapshot cache predating the query change
+            // still gets filtered here).
             const type = wi.state?.type;
             if (type && protectedTypes.has(type))
                 continue;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mintree",
-	"version": "0.5.3",
+	"version": "0.5.4",
 	"description": "Issue-driven git worktrees + Claude Code sessions for repos with an opinionated SDD+TDD flow.",
 	"license": "MIT",
 	"author": "Martin Mineo <mmineo@canarytechnologies.com>",

package/shell/init.bash

@@ -55,6 +55,9 @@ function mintree() {
             orch_prompt_file=$(echo "$clean_output" | grep "MINTREE_ORCHESTRATE_PROMPT_FILE:" | sed 's/.*MINTREE_ORCHESTRATE_PROMPT_FILE://')
             [[ -n "$orch_prompt_file" ]] && extra+=(--prompt-file "$orch_prompt_file")
             [[ -n "$perm_mode" ]] && extra+=(--permission-mode "$perm_mode")
+            local orch_rc_name
+            orch_rc_name=$(echo "$clean_output" | grep "MINTREE_ORCHESTRATE_RC_NAME:" | sed 's/.*MINTREE_ORCHESTRATE_RC_NAME://')
+            [[ -n "$orch_rc_name" ]] && extra+=(--rc-name "$orch_rc_name")
             command mintree orchestrate "${extra[@]}"
             return $?
         fi

package/shell/init.zsh

@@ -65,6 +65,9 @@ function mintree() {
             orch_prompt_file=$(echo "$clean_output" | grep "MINTREE_ORCHESTRATE_PROMPT_FILE:" | sed 's/.*MINTREE_ORCHESTRATE_PROMPT_FILE://')
             [[ -n "$orch_prompt_file" ]] && extra+=(--prompt-file "$orch_prompt_file")
             [[ -n "$perm_mode" ]] && extra+=(--permission-mode "$perm_mode")
+            local orch_rc_name
+            orch_rc_name=$(echo "$clean_output" | grep "MINTREE_ORCHESTRATE_RC_NAME:" | sed 's/.*MINTREE_ORCHESTRATE_RC_NAME://')
+            [[ -n "$orch_rc_name" ]] && extra+=(--rc-name "$orch_rc_name")
             command mintree orchestrate "${extra[@]}"
             return $?
         fi