@ricsam/r5dctl 0.0.5 → 0.0.7

package/README.md

@@ -29,7 +29,7 @@ Credentials are stored in:
 - `--config <path>`
 - `--token <token>`
 - `--api-key <key>`
-- `-p, --project <slug|id>`
+- `-p, --project <namespace/name|id>`
 - `-b, --branch <branch>`
 - `-s, --session <sessionId>`
 
@@ -43,10 +43,9 @@ r5dctl auth api-key list
 r5dctl auth api-key revoke <key-id>
 
 r5dctl get projects
-r5dctl create project --name "Demo Project"
-r5dctl describe project <project-ref>
-r5dctl update project <project-ref> --name "Renamed Project" --mode prod
-r5dctl delete project <project-ref>
+r5dctl describe project <namespace/name|id>
+r5dctl update project <namespace/name|id> --mode prod
+r5dctl delete project <namespace/name|id>
 
 r5dctl -p <project> get branches
 r5dctl -p <project> describe branch <branch>

package/dist/cjs/cli.cjs

@@ -35,7 +35,7 @@ __export(cli_exports, {
   parseGlobalArgs: () => parseGlobalArgs,
   parsePromptArgs: () => parsePromptArgs,
   resolveCommandExecution: () => resolveCommandExecution,
-  runBinctlCli: () => runBinctlCli
+  runR5dctlCli: () => runR5dctlCli
 });
 module.exports = __toCommonJS(cli_exports);
 var import_node_fs = __toESM(require("node:fs"), 1);
@@ -44,15 +44,27 @@ var import_node_path = __toESM(require("node:path"), 1);
 var import_node_child_process = require("node:child_process");
 var import_promises = require("node:timers/promises");
 var import_r5d_api = require("@ricsam/r5d-api");
-const CHAT_MODES = /* @__PURE__ */ new Set(["ask", "plan", "build", "agent", "explore", "review", "test", "research"]);
+const CHAT_MODES = /* @__PURE__ */ new Set([
+  "ask",
+  "plan",
+  "build",
+  "agent",
+  "explore",
+  "review",
+  "test",
+  "research",
+  "security_review",
+  "large_diff_remediation"
+]);
 const MODEL_TIERS = /* @__PURE__ */ new Set(["low", "medium", "high", "max"]);
+const AGENT_TYPES = /* @__PURE__ */ new Set(["research", "debug", "test"]);
 const CLI_GLOBAL_OPTION_HELP = [
   "--base-url <url>",
   "--json",
   "--config <path>",
   "--token <token>",
   "--api-key <key>",
-  "-p, --project <slug|id>",
+  "-p, --project <namespace/name|id>",
   "-b, --branch <branch>",
   "-s, --session <sessionId>",
   "-h, --help"
@@ -77,10 +89,9 @@ const SHARED_HELP_ENTRIES = [
   { section: "auth", usage: "auth api-key list", description: "List API keys for the current account." },
   { section: "auth", usage: "auth api-key revoke <key-id>", description: "Revoke an API key." },
   { section: "projects", usage: "get projects", description: "List projects you can access." },
-  { section: "projects", usage: "create project [--name <name>] [--org <org-id>]", description: "Create a new project." },
-  { section: "projects", usage: "describe project <project-ref>", description: "Show details for a project." },
-  { section: "projects", usage: "update project <project-ref> [--name <name>] [--mode <greenfield|prod>]", description: "Update project settings." },
-  { section: "projects", usage: "delete project <project-ref>", description: "Delete a project." },
+  { section: "projects", usage: "describe project <namespace/name|id>", description: "Show details for a project." },
+  { section: "projects", usage: "update project <namespace/name|id> --mode <greenfield|prod>", description: "Update project settings." },
+  { section: "projects", usage: "delete project <namespace/name|id>", description: "Delete a project." },
   { section: "branches", usage: "-p <project> get branches", description: "List branches for a project." },
   { section: "branches", usage: "-p <project> describe branch <branch>", description: "Show branch URLs and sessions." },
   { section: "sessions", usage: "-p <project> get sessions [--branch <branch>]", description: "List sessions for a project, optionally filtered by branch." },
@@ -91,14 +102,22 @@ const SHARED_HELP_ENTRIES = [
   { section: "sessions", usage: "-s <session-id> conversation [--full] [--compact] [--tail <nodes>]", description: "Read a conversation transcript, pending questions, and required envs." },
   { section: "sessions", usage: '-s <session-id> prompt --mode <mode> --model <tier> "<message>"', description: "Send a prompt to a session." },
   { section: "sessions", usage: '-s <session-id> answer-questions -a1 "<answer>" -a2 "<answer>" ...', description: "Answer pending questions in order." },
-  { section: "sessions", usage: "-s <session-id> apply-required-envs -e backend/KEY=value -e frontend/KEY=value", description: "Apply required backend or frontend env values." }
+  { section: "sessions", usage: "-s <session-id> apply-required-envs -e backend/KEY=value -e frontend/KEY=value", description: "Apply required backend or frontend env values." },
+  { section: "agents", usage: '-p <project> start-agent <src-branch> <agent-type> "<prompt>"', description: "Start a detached branch agent." },
+  { section: "agents", usage: "agent-status <session-id>", description: "Show detached branch agent status." },
+  { section: "agents", usage: 'send-prompt <session-id> "<prompt>"', description: "Queue or resume a detached branch agent." },
+  { section: "merges", usage: "-p <project> merge-changes <target-branch> <sub-agent-branch>", description: "Squash merge an agent branch into a target branch." },
+  { section: "merges", usage: "-p <project> continue-merge <target-branch>", description: "Commit a resolved merge." },
+  { section: "merges", usage: "-p <project> abort-merge <target-branch>", description: "Abort an in-progress merge." }
 ];
-const HELP_SECTION_ORDER = ["auth", "projects", "branches", "sessions"];
+const HELP_SECTION_ORDER = ["auth", "projects", "branches", "sessions", "agents", "merges"];
 const HELP_SECTION_TITLES = {
   auth: "Auth",
   projects: "Projects",
   branches: "Branches",
-  sessions: "Sessions"
+  sessions: "Sessions",
+  agents: "Agents",
+  merges: "Merges"
 };
 function getCliHelpText() {
   const entries = [...CLI_ONLY_HELP_ENTRIES, ...SHARED_HELP_ENTRIES];
@@ -323,9 +342,9 @@ function writeConfig(configPath, config) {
 }
 function resolveClientOptions(options, config) {
   return {
-    baseUrl: options.baseUrl ?? process.env.R5D_BASE_URL ?? process.env.BINCTL_BASE_URL ?? config.baseUrl,
-    token: options.token ?? process.env.R5D_TOKEN ?? process.env.BINCTL_TOKEN ?? config.token,
-    apiKey: options.apiKey ?? process.env.R5D_API_KEY ?? process.env.BINCTL_API_KEY ?? config.apiKey
+    baseUrl: options.baseUrl ?? process.env.R5D_BASE_URL ?? process.env.R5DCTL_BASE_URL ?? config.baseUrl,
+    token: options.token ?? process.env.R5D_TOKEN ?? process.env.R5DCTL_TOKEN ?? config.token,
+    apiKey: options.apiKey ?? process.env.R5D_API_KEY ?? process.env.R5DCTL_API_KEY ?? config.apiKey
   };
 }
 function parseAnswerFlags(args) {
@@ -460,7 +479,7 @@ function parsePromptArgs(args) {
     throw new Error("--mode is required for `prompt`");
   }
   if (!CHAT_MODES.has(modeRaw)) {
-    throw new Error(`Invalid --mode '${modeRaw}'. Expected one of: ask, plan, build, agent, explore, review, test, research`);
+    throw new Error(`Invalid --mode '${modeRaw}'. Expected one of: ${Array.from(CHAT_MODES).join(", ")}`);
   }
   if (!modelRaw) {
     throw new Error("--model is required for `prompt`");
@@ -593,14 +612,15 @@ function clearAuthFromConfig(config, options) {
   };
 }
 function renderProjectDescription(project) {
-  return [`Project: ${project.name ?? project.id}`, `Ref: ${project.slug ?? project.id}`, `Mode: ${project.mode}`].join("\n") + "\n";
+  return [`Project: ${project.path}`, `Ref: ${project.path}`, `ID: ${project.id}`, `Mode: ${project.mode}`].join("\n") + "\n";
 }
 function renderProjectList(projects) {
   if (projects.length === 0) {
     return "No projects found.\n";
   }
-  return `${projects.map((project) => `${project.name ?? "(unnamed project)"}
-  Ref: ${project.slug ?? project.id}
+  return `${projects.map((project) => `${project.path}
+  Ref: ${project.path}
+  ID: ${project.id}
   Mode: ${project.mode}`).join("\n\n")}
 `;
 }
@@ -612,50 +632,55 @@ function renderSessionList(sessions) {
 `;
 }
 function renderSessionDescription(session) {
-  return [`Session: ${session.id}`, `Project: ${session.projectName ?? session.projectId}`, `Branch: ${session.branchName}`].join("\n") + "\n";
+  return [`Session: ${session.id}`, `Project: ${session.projectPath}`, `Branch: ${session.branchName}`].join("\n") + "\n";
 }
-function parseProjectCreateArgs(args) {
-  const input = {};
-  for (let index = 0; index < args.length; index += 1) {
-    const arg = args[index];
-    if (arg === "--name") {
-      input.name = requireValue(args[index + 1], "Missing value for --name");
-      index += 1;
-      continue;
-    }
-    const inlineName = arg ? parseLongOptionWithEquals(arg, "--name") : void 0;
-    if (inlineName !== void 0) {
-      input.name = inlineName;
-      continue;
-    }
-    if (arg === "--org" || arg === "--org-id") {
-      input.orgId = requireValue(args[index + 1], `Missing value for ${arg}`);
-      index += 1;
-      continue;
-    }
-    const inlineOrg = arg ? parseLongOptionWithEquals(arg, "--org") ?? parseLongOptionWithEquals(arg, "--org-id") : void 0;
-    if (inlineOrg !== void 0) {
-      input.orgId = inlineOrg;
-      continue;
-    }
-    throw new Error(`Unknown project create argument: ${arg}`);
+function renderAgentStart(agent) {
+  return [
+    `Agent: ${agent.sessionId}`,
+    `Status: ${agent.status}`,
+    `Branch: ${agent.branchName}`,
+    `Base: ${agent.baseBranch} @ ${agent.baseCommit}`
+  ].join("\n") + "\n";
+}
+function renderAgentStatus(agent) {
+  const lines = [
+    `Agent: ${agent.sessionId}`,
+    `Status: ${agent.status}`,
+    `Branch: ${agent.branchName}`,
+    `Head: ${agent.headCommit}`
+  ];
+  if (agent.baseBranch && agent.baseCommit) {
+    lines.push(`Base: ${agent.baseBranch} @ ${agent.baseCommit}`);
   }
-  return input;
+  if (agent.error) {
+    lines.push(`Error: ${agent.error}`);
+  }
+  if (agent.diffSummary) {
+    lines.push("", agent.diffSummary);
+  }
+  if (agent.summary) {
+    lines.push("", agent.summary);
+  }
+  return `${lines.join("\n")}
+`;
+}
+function renderMergeResult(result) {
+  if (result.status === "merged") {
+    return `Merged ${result.sourceBranch} into ${result.targetBranch}: ${result.commitHash}
+${result.message}
+`;
+  }
+  const files = result.conflictedFiles.length > 0 ? `
+Conflicts:
+${result.conflictedFiles.map((file) => `- ${file}`).join("\n")}
+` : "\n";
+  return `Merge has conflicts from ${result.sourceBranch} into ${result.targetBranch}.${files}${result.message}
+`;
 }
 function parseProjectUpdateArgs(args) {
   const input = {};
   for (let index = 0; index < args.length; index += 1) {
     const arg = args[index];
-    if (arg === "--name") {
-      input.name = requireValue(args[index + 1], "Missing value for --name");
-      index += 1;
-      continue;
-    }
-    const inlineName = arg ? parseLongOptionWithEquals(arg, "--name") : void 0;
-    if (inlineName !== void 0) {
-      input.name = inlineName;
-      continue;
-    }
     if (arg === "--mode") {
       const mode = requireValue(args[index + 1], "Missing value for --mode");
       if (mode !== "greenfield" && mode !== "prod") throw new Error("Invalid value for --mode: expected greenfield or prod");
@@ -760,7 +785,7 @@ function parseConversationRenderArgs(args) {
 function renderConversationResponse(read, options = { full: false, compact: false }) {
   const thread = Array.isArray(read.thread) ? read.thread : [];
   const visibleThread = options.tail ? thread.slice(-options.tail) : thread;
-  const lines = [`Session: ${read.session.id}`, `Project: ${read.session.projectName ?? read.session.projectId}`, `Branch: ${read.session.branchName}`, ""];
+  const lines = [`Session: ${read.session.id}`, `Project: ${read.session.projectPath}`, `Branch: ${read.session.branchName}`, ""];
   lines.push(`Conversation nodes: ${visibleThread.length}${options.tail ? ` of ${thread.length}` : ""}`);
   if (!options.compact) {
     lines.push(JSON.stringify(visibleThread, null, options.full ? 2 : 0));
@@ -776,7 +801,7 @@ function renderConversationResponse(read, options = { full: false, compact: fals
   return `${lines.join("\n")}
 `;
 }
-async function executeBinctlCommand(client, json, args) {
+async function executeR5dctlCommand(client, json, args) {
   const write = (data, human) => writeDataOutput(json, data, human);
   const [first, second, third] = args;
   if (first === "auth" && second === "status") {
@@ -806,11 +831,6 @@ async function executeBinctlCommand(client, json, args) {
     write(projects, renderProjectList(projects));
     return;
   }
-  if (first === "projects" && second === "create" || first === "create" && second === "project") {
-    const project = await client.projects.create(parseProjectCreateArgs(args.slice(2)));
-    write(project, renderProjectDescription(project));
-    return;
-  }
   if (first === "projects" && second === "describe" || first === "describe" && second === "project") {
     const project = await client.projects.describe(requireValue(args[2], "Missing project reference"));
     write(project, renderProjectDescription(project));
@@ -837,7 +857,7 @@ async function executeBinctlCommand(client, json, args) {
   if (first === "projects" && second === "branches" && third === "describe" || first === "describe" && second === "branch") {
     const offset = first === "describe" ? 2 : 3;
     const result = await client.projects.branches.describe(requireValue(args[offset], "Missing project reference"), requireValue(args[offset + 1], "Missing branch name"));
-    write(result, `Project: ${result.project.name ?? result.project.id}
+    write(result, `Project: ${result.project.path}
 Branch: ${result.branchName}
 Sessions: ${result.sessions.length}
 `);
@@ -857,6 +877,65 @@ Sessions: ${result.sessions.length}
     write(session, renderSessionDescription(session));
     return;
   }
+  if (first === "start-agent") {
+    const projectRef = requireValue(args[1], "Missing project reference");
+    const sourceBranch = requireValue(args[2], "Missing source branch");
+    const agentType = requireValue(args[3], "Missing agent type");
+    if (!AGENT_TYPES.has(agentType)) {
+      throw new Error("Invalid agent type. Expected one of: research, debug, test");
+    }
+    const prompt = args.slice(4).join(" ").trim();
+    if (!prompt) {
+      throw new Error("Agent prompt is required");
+    }
+    const agent = await client.projects.agents.start(projectRef, {
+      sourceBranch,
+      agentType,
+      prompt
+    });
+    write(agent, renderAgentStart(agent));
+    return;
+  }
+  if (first === "agent-status") {
+    const agent = await client.agents.status(requireValue(args[1], "Missing session id"));
+    write(agent, renderAgentStatus(agent));
+    return;
+  }
+  if (first === "send-prompt") {
+    const sessionId = requireValue(args[1], "Missing session id");
+    const prompt = args.slice(2).join(" ").trim();
+    if (!prompt) {
+      throw new Error("Prompt is required");
+    }
+    const agent = await client.agents.sendPrompt(sessionId, { prompt });
+    write(agent, renderAgentStatus(agent));
+    return;
+  }
+  if (first === "merge-changes") {
+    const result = await client.projects.mergeChanges(requireValue(args[1], "Missing project reference"), {
+      targetBranch: requireValue(args[2], "Missing target branch"),
+      sourceBranch: requireValue(args[3], "Missing source branch")
+    });
+    write(result, renderMergeResult(result));
+    return;
+  }
+  if (first === "continue-merge") {
+    const result = await client.projects.continueMerge(requireValue(args[1], "Missing project reference"), {
+      targetBranch: requireValue(args[2], "Missing target branch")
+    });
+    write(result, `Merge committed: ${result.commitHash}
+${result.message}
+`);
+    return;
+  }
+  if (first === "abort-merge") {
+    const result = await client.projects.abortMerge(requireValue(args[1], "Missing project reference"), {
+      targetBranch: requireValue(args[2], "Missing target branch")
+    });
+    write(result, `${result.message}
+`);
+    return;
+  }
   if (first === "sessions" && second === "describe" || first === "describe" && second === "session") {
     const session = await client.sessions.describe(requireValue(args[2], "Missing session id"));
     write(session, renderSessionDescription(session));
@@ -1058,12 +1137,6 @@ function resolveCommandExecution(options, rest) {
   }
   if (command === "create") {
     const target = commandArgs[0];
-    if (target === "project") {
-      return {
-        kind: "plugin",
-        pluginArgs: ["create", "project", ...commandArgs.slice(1)]
-      };
-    }
     if (target === "session") {
       const rawArgs = commandArgs.slice(1);
       const firstFlagIndex = rawArgs.findIndex((arg) => arg.startsWith("-"));
@@ -1155,6 +1228,92 @@ function resolveCommandExecution(options, rest) {
       pluginArgs: ["prompt", sessionId, parsed.mode, parsed.model, parsed.message]
     };
   }
+  if (command === "start-agent") {
+    if (!options.project) {
+      throw new Error("--project/-p is required for `start-agent`");
+    }
+    const sourceBranch = commandArgs[0] ?? options.branch;
+    if (!sourceBranch) {
+      throw new Error("Source branch is required for `start-agent`");
+    }
+    const agentType = requireValue(commandArgs[1], "Agent type is required for `start-agent`");
+    if (!AGENT_TYPES.has(agentType)) {
+      throw new Error("Invalid agent type. Expected one of: research, debug, test");
+    }
+    const prompt = commandArgs.slice(2).join(" ").trim();
+    if (!prompt) {
+      throw new Error("Agent prompt is required");
+    }
+    return {
+      kind: "plugin",
+      pluginArgs: ["start-agent", options.project, sourceBranch, agentType, prompt]
+    };
+  }
+  if (command === "agent-status") {
+    const sessionId = commandArgs[0] ?? options.session;
+    if (!sessionId) {
+      throw new Error("Session id is required for `agent-status`");
+    }
+    return {
+      kind: "plugin",
+      pluginArgs: ["agent-status", sessionId]
+    };
+  }
+  if (command === "send-prompt") {
+    const sessionId = options.session ?? commandArgs[0];
+    if (!sessionId) {
+      throw new Error("Session id is required for `send-prompt`");
+    }
+    const promptArgs = options.session ? commandArgs : commandArgs.slice(1);
+    const prompt = promptArgs.join(" ").trim();
+    if (!prompt) {
+      throw new Error("Prompt is required for `send-prompt`");
+    }
+    return {
+      kind: "plugin",
+      pluginArgs: ["send-prompt", sessionId, prompt]
+    };
+  }
+  if (command === "merge-changes") {
+    if (!options.project) {
+      throw new Error("--project/-p is required for `merge-changes`");
+    }
+    const targetBranch = commandArgs[0] ?? options.branch;
+    if (!targetBranch) {
+      throw new Error("Target branch is required for `merge-changes`");
+    }
+    const sourceBranch = requireValue(commandArgs[1], "Sub-agent branch is required for `merge-changes`");
+    return {
+      kind: "plugin",
+      pluginArgs: ["merge-changes", options.project, targetBranch, sourceBranch]
+    };
+  }
+  if (command === "continue-merge") {
+    if (!options.project) {
+      throw new Error("--project/-p is required for `continue-merge`");
+    }
+    const targetBranch = commandArgs[0] ?? options.branch;
+    if (!targetBranch) {
+      throw new Error("Target branch is required for `continue-merge`");
+    }
+    return {
+      kind: "plugin",
+      pluginArgs: ["continue-merge", options.project, targetBranch]
+    };
+  }
+  if (command === "abort-merge") {
+    if (!options.project) {
+      throw new Error("--project/-p is required for `abort-merge`");
+    }
+    const targetBranch = commandArgs[0] ?? options.branch;
+    if (!targetBranch) {
+      throw new Error("Target branch is required for `abort-merge`");
+    }
+    return {
+      kind: "plugin",
+      pluginArgs: ["abort-merge", options.project, targetBranch]
+    };
+  }
   if (command === "answer-questions") {
     const sessionId = options.session;
     if (!sessionId) {
@@ -1184,7 +1343,7 @@ async function runCommand(argv) {
     return;
   }
   const config = parseConfig(options.configPath);
-  const client = new import_r5d_api.BinctlClient(resolveClientOptions(options, config));
+  const client = new import_r5d_api.R5dctlClient(resolveClientOptions(options, config));
   const execution = resolveCommandExecution(options, rest);
   if (execution.kind === "auth-login") {
     await handleAuthLogin(client, options, execution.commandArgs, config);
@@ -1198,7 +1357,7 @@ async function runCommand(argv) {
     process.stdout.write(execution.text);
     return;
   }
-  await executeBinctlCommand(client, options.json, execution.pluginArgs);
+  await executeR5dctlCommand(client, options.json, execution.pluginArgs);
   if (execution.clearAuthOnSuccess) {
     writeConfig(options.configPath, clearAuthFromConfig(config, options));
   }
@@ -1212,12 +1371,12 @@ function extractApiErrorMessage(error) {
   }
   return error.message;
 }
-async function runBinctlCli(argv) {
+async function runR5dctlCli(argv) {
   try {
     await runCommand(argv);
     return 0;
   } catch (error) {
-    if (error instanceof import_r5d_api.BinctlApiError) {
+    if (error instanceof import_r5d_api.R5dctlApiError) {
       process.stderr.write(`${extractApiErrorMessage(error)}
 `);
       return 1;
@@ -1228,7 +1387,7 @@ async function runBinctlCli(argv) {
   }
 }
 async function main(argv = process.argv.slice(2)) {
-  const exitCode = await runBinctlCli(argv);
+  const exitCode = await runR5dctlCli(argv);
   if (exitCode !== 0) {
     process.exit(exitCode);
   }
@@ -1242,5 +1401,5 @@ async function main(argv = process.argv.slice(2)) {
   parseGlobalArgs,
   parsePromptArgs,
   resolveCommandExecution,
-  runBinctlCli
+  runR5dctlCli
 });

package/dist/cjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5dctl",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "type": "commonjs"
 }

package/dist/mjs/cli.mjs

@@ -4,18 +4,30 @@ import path from "node:path";
 import { spawn } from "node:child_process";
 import { setTimeout as sleep } from "node:timers/promises";
 import {
-  BinctlApiError,
-  BinctlClient
+  R5dctlApiError,
+  R5dctlClient
 } from "@ricsam/r5d-api";
-const CHAT_MODES = /* @__PURE__ */ new Set(["ask", "plan", "build", "agent", "explore", "review", "test", "research"]);
+const CHAT_MODES = /* @__PURE__ */ new Set([
+  "ask",
+  "plan",
+  "build",
+  "agent",
+  "explore",
+  "review",
+  "test",
+  "research",
+  "security_review",
+  "large_diff_remediation"
+]);
 const MODEL_TIERS = /* @__PURE__ */ new Set(["low", "medium", "high", "max"]);
+const AGENT_TYPES = /* @__PURE__ */ new Set(["research", "debug", "test"]);
 const CLI_GLOBAL_OPTION_HELP = [
   "--base-url <url>",
   "--json",
   "--config <path>",
   "--token <token>",
   "--api-key <key>",
-  "-p, --project <slug|id>",
+  "-p, --project <namespace/name|id>",
   "-b, --branch <branch>",
   "-s, --session <sessionId>",
   "-h, --help"
@@ -40,10 +52,9 @@ const SHARED_HELP_ENTRIES = [
   { section: "auth", usage: "auth api-key list", description: "List API keys for the current account." },
   { section: "auth", usage: "auth api-key revoke <key-id>", description: "Revoke an API key." },
   { section: "projects", usage: "get projects", description: "List projects you can access." },
-  { section: "projects", usage: "create project [--name <name>] [--org <org-id>]", description: "Create a new project." },
-  { section: "projects", usage: "describe project <project-ref>", description: "Show details for a project." },
-  { section: "projects", usage: "update project <project-ref> [--name <name>] [--mode <greenfield|prod>]", description: "Update project settings." },
-  { section: "projects", usage: "delete project <project-ref>", description: "Delete a project." },
+  { section: "projects", usage: "describe project <namespace/name|id>", description: "Show details for a project." },
+  { section: "projects", usage: "update project <namespace/name|id> --mode <greenfield|prod>", description: "Update project settings." },
+  { section: "projects", usage: "delete project <namespace/name|id>", description: "Delete a project." },
   { section: "branches", usage: "-p <project> get branches", description: "List branches for a project." },
   { section: "branches", usage: "-p <project> describe branch <branch>", description: "Show branch URLs and sessions." },
   { section: "sessions", usage: "-p <project> get sessions [--branch <branch>]", description: "List sessions for a project, optionally filtered by branch." },
@@ -54,14 +65,22 @@ const SHARED_HELP_ENTRIES = [
   { section: "sessions", usage: "-s <session-id> conversation [--full] [--compact] [--tail <nodes>]", description: "Read a conversation transcript, pending questions, and required envs." },
   { section: "sessions", usage: '-s <session-id> prompt --mode <mode> --model <tier> "<message>"', description: "Send a prompt to a session." },
   { section: "sessions", usage: '-s <session-id> answer-questions -a1 "<answer>" -a2 "<answer>" ...', description: "Answer pending questions in order." },
-  { section: "sessions", usage: "-s <session-id> apply-required-envs -e backend/KEY=value -e frontend/KEY=value", description: "Apply required backend or frontend env values." }
+  { section: "sessions", usage: "-s <session-id> apply-required-envs -e backend/KEY=value -e frontend/KEY=value", description: "Apply required backend or frontend env values." },
+  { section: "agents", usage: '-p <project> start-agent <src-branch> <agent-type> "<prompt>"', description: "Start a detached branch agent." },
+  { section: "agents", usage: "agent-status <session-id>", description: "Show detached branch agent status." },
+  { section: "agents", usage: 'send-prompt <session-id> "<prompt>"', description: "Queue or resume a detached branch agent." },
+  { section: "merges", usage: "-p <project> merge-changes <target-branch> <sub-agent-branch>", description: "Squash merge an agent branch into a target branch." },
+  { section: "merges", usage: "-p <project> continue-merge <target-branch>", description: "Commit a resolved merge." },
+  { section: "merges", usage: "-p <project> abort-merge <target-branch>", description: "Abort an in-progress merge." }
 ];
-const HELP_SECTION_ORDER = ["auth", "projects", "branches", "sessions"];
+const HELP_SECTION_ORDER = ["auth", "projects", "branches", "sessions", "agents", "merges"];
 const HELP_SECTION_TITLES = {
   auth: "Auth",
   projects: "Projects",
   branches: "Branches",
-  sessions: "Sessions"
+  sessions: "Sessions",
+  agents: "Agents",
+  merges: "Merges"
 };
 function getCliHelpText() {
   const entries = [...CLI_ONLY_HELP_ENTRIES, ...SHARED_HELP_ENTRIES];
@@ -286,9 +305,9 @@ function writeConfig(configPath, config) {
 }
 function resolveClientOptions(options, config) {
   return {
-    baseUrl: options.baseUrl ?? process.env.R5D_BASE_URL ?? process.env.BINCTL_BASE_URL ?? config.baseUrl,
-    token: options.token ?? process.env.R5D_TOKEN ?? process.env.BINCTL_TOKEN ?? config.token,
-    apiKey: options.apiKey ?? process.env.R5D_API_KEY ?? process.env.BINCTL_API_KEY ?? config.apiKey
+    baseUrl: options.baseUrl ?? process.env.R5D_BASE_URL ?? process.env.R5DCTL_BASE_URL ?? config.baseUrl,
+    token: options.token ?? process.env.R5D_TOKEN ?? process.env.R5DCTL_TOKEN ?? config.token,
+    apiKey: options.apiKey ?? process.env.R5D_API_KEY ?? process.env.R5DCTL_API_KEY ?? config.apiKey
   };
 }
 function parseAnswerFlags(args) {
@@ -423,7 +442,7 @@ function parsePromptArgs(args) {
     throw new Error("--mode is required for `prompt`");
   }
   if (!CHAT_MODES.has(modeRaw)) {
-    throw new Error(`Invalid --mode '${modeRaw}'. Expected one of: ask, plan, build, agent, explore, review, test, research`);
+    throw new Error(`Invalid --mode '${modeRaw}'. Expected one of: ${Array.from(CHAT_MODES).join(", ")}`);
   }
   if (!modelRaw) {
     throw new Error("--model is required for `prompt`");
@@ -556,14 +575,15 @@ function clearAuthFromConfig(config, options) {
   };
 }
 function renderProjectDescription(project) {
-  return [`Project: ${project.name ?? project.id}`, `Ref: ${project.slug ?? project.id}`, `Mode: ${project.mode}`].join("\n") + "\n";
+  return [`Project: ${project.path}`, `Ref: ${project.path}`, `ID: ${project.id}`, `Mode: ${project.mode}`].join("\n") + "\n";
 }
 function renderProjectList(projects) {
   if (projects.length === 0) {
     return "No projects found.\n";
   }
-  return `${projects.map((project) => `${project.name ?? "(unnamed project)"}
-  Ref: ${project.slug ?? project.id}
+  return `${projects.map((project) => `${project.path}
+  Ref: ${project.path}
+  ID: ${project.id}
   Mode: ${project.mode}`).join("\n\n")}
 `;
 }
@@ -575,50 +595,55 @@ function renderSessionList(sessions) {
 `;
 }
 function renderSessionDescription(session) {
-  return [`Session: ${session.id}`, `Project: ${session.projectName ?? session.projectId}`, `Branch: ${session.branchName}`].join("\n") + "\n";
+  return [`Session: ${session.id}`, `Project: ${session.projectPath}`, `Branch: ${session.branchName}`].join("\n") + "\n";
 }
-function parseProjectCreateArgs(args) {
-  const input = {};
-  for (let index = 0; index < args.length; index += 1) {
-    const arg = args[index];
-    if (arg === "--name") {
-      input.name = requireValue(args[index + 1], "Missing value for --name");
-      index += 1;
-      continue;
-    }
-    const inlineName = arg ? parseLongOptionWithEquals(arg, "--name") : void 0;
-    if (inlineName !== void 0) {
-      input.name = inlineName;
-      continue;
-    }
-    if (arg === "--org" || arg === "--org-id") {
-      input.orgId = requireValue(args[index + 1], `Missing value for ${arg}`);
-      index += 1;
-      continue;
-    }
-    const inlineOrg = arg ? parseLongOptionWithEquals(arg, "--org") ?? parseLongOptionWithEquals(arg, "--org-id") : void 0;
-    if (inlineOrg !== void 0) {
-      input.orgId = inlineOrg;
-      continue;
-    }
-    throw new Error(`Unknown project create argument: ${arg}`);
+function renderAgentStart(agent) {
+  return [
+    `Agent: ${agent.sessionId}`,
+    `Status: ${agent.status}`,
+    `Branch: ${agent.branchName}`,
+    `Base: ${agent.baseBranch} @ ${agent.baseCommit}`
+  ].join("\n") + "\n";
+}
+function renderAgentStatus(agent) {
+  const lines = [
+    `Agent: ${agent.sessionId}`,
+    `Status: ${agent.status}`,
+    `Branch: ${agent.branchName}`,
+    `Head: ${agent.headCommit}`
+  ];
+  if (agent.baseBranch && agent.baseCommit) {
+    lines.push(`Base: ${agent.baseBranch} @ ${agent.baseCommit}`);
   }
-  return input;
+  if (agent.error) {
+    lines.push(`Error: ${agent.error}`);
+  }
+  if (agent.diffSummary) {
+    lines.push("", agent.diffSummary);
+  }
+  if (agent.summary) {
+    lines.push("", agent.summary);
+  }
+  return `${lines.join("\n")}
+`;
+}
+function renderMergeResult(result) {
+  if (result.status === "merged") {
+    return `Merged ${result.sourceBranch} into ${result.targetBranch}: ${result.commitHash}
+${result.message}
+`;
+  }
+  const files = result.conflictedFiles.length > 0 ? `
+Conflicts:
+${result.conflictedFiles.map((file) => `- ${file}`).join("\n")}
+` : "\n";
+  return `Merge has conflicts from ${result.sourceBranch} into ${result.targetBranch}.${files}${result.message}
+`;
 }
 function parseProjectUpdateArgs(args) {
   const input = {};
   for (let index = 0; index < args.length; index += 1) {
     const arg = args[index];
-    if (arg === "--name") {
-      input.name = requireValue(args[index + 1], "Missing value for --name");
-      index += 1;
-      continue;
-    }
-    const inlineName = arg ? parseLongOptionWithEquals(arg, "--name") : void 0;
-    if (inlineName !== void 0) {
-      input.name = inlineName;
-      continue;
-    }
     if (arg === "--mode") {
       const mode = requireValue(args[index + 1], "Missing value for --mode");
       if (mode !== "greenfield" && mode !== "prod") throw new Error("Invalid value for --mode: expected greenfield or prod");
@@ -723,7 +748,7 @@ function parseConversationRenderArgs(args) {
 function renderConversationResponse(read, options = { full: false, compact: false }) {
   const thread = Array.isArray(read.thread) ? read.thread : [];
   const visibleThread = options.tail ? thread.slice(-options.tail) : thread;
-  const lines = [`Session: ${read.session.id}`, `Project: ${read.session.projectName ?? read.session.projectId}`, `Branch: ${read.session.branchName}`, ""];
+  const lines = [`Session: ${read.session.id}`, `Project: ${read.session.projectPath}`, `Branch: ${read.session.branchName}`, ""];
   lines.push(`Conversation nodes: ${visibleThread.length}${options.tail ? ` of ${thread.length}` : ""}`);
   if (!options.compact) {
     lines.push(JSON.stringify(visibleThread, null, options.full ? 2 : 0));
@@ -739,7 +764,7 @@ function renderConversationResponse(read, options = { full: false, compact: fals
   return `${lines.join("\n")}
 `;
 }
-async function executeBinctlCommand(client, json, args) {
+async function executeR5dctlCommand(client, json, args) {
   const write = (data, human) => writeDataOutput(json, data, human);
   const [first, second, third] = args;
   if (first === "auth" && second === "status") {
@@ -769,11 +794,6 @@ async function executeBinctlCommand(client, json, args) {
     write(projects, renderProjectList(projects));
     return;
   }
-  if (first === "projects" && second === "create" || first === "create" && second === "project") {
-    const project = await client.projects.create(parseProjectCreateArgs(args.slice(2)));
-    write(project, renderProjectDescription(project));
-    return;
-  }
   if (first === "projects" && second === "describe" || first === "describe" && second === "project") {
     const project = await client.projects.describe(requireValue(args[2], "Missing project reference"));
     write(project, renderProjectDescription(project));
@@ -800,7 +820,7 @@ async function executeBinctlCommand(client, json, args) {
   if (first === "projects" && second === "branches" && third === "describe" || first === "describe" && second === "branch") {
     const offset = first === "describe" ? 2 : 3;
     const result = await client.projects.branches.describe(requireValue(args[offset], "Missing project reference"), requireValue(args[offset + 1], "Missing branch name"));
-    write(result, `Project: ${result.project.name ?? result.project.id}
+    write(result, `Project: ${result.project.path}
 Branch: ${result.branchName}
 Sessions: ${result.sessions.length}
 `);
@@ -820,6 +840,65 @@ Sessions: ${result.sessions.length}
     write(session, renderSessionDescription(session));
     return;
   }
+  if (first === "start-agent") {
+    const projectRef = requireValue(args[1], "Missing project reference");
+    const sourceBranch = requireValue(args[2], "Missing source branch");
+    const agentType = requireValue(args[3], "Missing agent type");
+    if (!AGENT_TYPES.has(agentType)) {
+      throw new Error("Invalid agent type. Expected one of: research, debug, test");
+    }
+    const prompt = args.slice(4).join(" ").trim();
+    if (!prompt) {
+      throw new Error("Agent prompt is required");
+    }
+    const agent = await client.projects.agents.start(projectRef, {
+      sourceBranch,
+      agentType,
+      prompt
+    });
+    write(agent, renderAgentStart(agent));
+    return;
+  }
+  if (first === "agent-status") {
+    const agent = await client.agents.status(requireValue(args[1], "Missing session id"));
+    write(agent, renderAgentStatus(agent));
+    return;
+  }
+  if (first === "send-prompt") {
+    const sessionId = requireValue(args[1], "Missing session id");
+    const prompt = args.slice(2).join(" ").trim();
+    if (!prompt) {
+      throw new Error("Prompt is required");
+    }
+    const agent = await client.agents.sendPrompt(sessionId, { prompt });
+    write(agent, renderAgentStatus(agent));
+    return;
+  }
+  if (first === "merge-changes") {
+    const result = await client.projects.mergeChanges(requireValue(args[1], "Missing project reference"), {
+      targetBranch: requireValue(args[2], "Missing target branch"),
+      sourceBranch: requireValue(args[3], "Missing source branch")
+    });
+    write(result, renderMergeResult(result));
+    return;
+  }
+  if (first === "continue-merge") {
+    const result = await client.projects.continueMerge(requireValue(args[1], "Missing project reference"), {
+      targetBranch: requireValue(args[2], "Missing target branch")
+    });
+    write(result, `Merge committed: ${result.commitHash}
+${result.message}
+`);
+    return;
+  }
+  if (first === "abort-merge") {
+    const result = await client.projects.abortMerge(requireValue(args[1], "Missing project reference"), {
+      targetBranch: requireValue(args[2], "Missing target branch")
+    });
+    write(result, `${result.message}
+`);
+    return;
+  }
   if (first === "sessions" && second === "describe" || first === "describe" && second === "session") {
     const session = await client.sessions.describe(requireValue(args[2], "Missing session id"));
     write(session, renderSessionDescription(session));
@@ -1021,12 +1100,6 @@ function resolveCommandExecution(options, rest) {
   }
   if (command === "create") {
     const target = commandArgs[0];
-    if (target === "project") {
-      return {
-        kind: "plugin",
-        pluginArgs: ["create", "project", ...commandArgs.slice(1)]
-      };
-    }
     if (target === "session") {
       const rawArgs = commandArgs.slice(1);
       const firstFlagIndex = rawArgs.findIndex((arg) => arg.startsWith("-"));
@@ -1118,6 +1191,92 @@ function resolveCommandExecution(options, rest) {
       pluginArgs: ["prompt", sessionId, parsed.mode, parsed.model, parsed.message]
     };
   }
+  if (command === "start-agent") {
+    if (!options.project) {
+      throw new Error("--project/-p is required for `start-agent`");
+    }
+    const sourceBranch = commandArgs[0] ?? options.branch;
+    if (!sourceBranch) {
+      throw new Error("Source branch is required for `start-agent`");
+    }
+    const agentType = requireValue(commandArgs[1], "Agent type is required for `start-agent`");
+    if (!AGENT_TYPES.has(agentType)) {
+      throw new Error("Invalid agent type. Expected one of: research, debug, test");
+    }
+    const prompt = commandArgs.slice(2).join(" ").trim();
+    if (!prompt) {
+      throw new Error("Agent prompt is required");
+    }
+    return {
+      kind: "plugin",
+      pluginArgs: ["start-agent", options.project, sourceBranch, agentType, prompt]
+    };
+  }
+  if (command === "agent-status") {
+    const sessionId = commandArgs[0] ?? options.session;
+    if (!sessionId) {
+      throw new Error("Session id is required for `agent-status`");
+    }
+    return {
+      kind: "plugin",
+      pluginArgs: ["agent-status", sessionId]
+    };
+  }
+  if (command === "send-prompt") {
+    const sessionId = options.session ?? commandArgs[0];
+    if (!sessionId) {
+      throw new Error("Session id is required for `send-prompt`");
+    }
+    const promptArgs = options.session ? commandArgs : commandArgs.slice(1);
+    const prompt = promptArgs.join(" ").trim();
+    if (!prompt) {
+      throw new Error("Prompt is required for `send-prompt`");
+    }
+    return {
+      kind: "plugin",
+      pluginArgs: ["send-prompt", sessionId, prompt]
+    };
+  }
+  if (command === "merge-changes") {
+    if (!options.project) {
+      throw new Error("--project/-p is required for `merge-changes`");
+    }
+    const targetBranch = commandArgs[0] ?? options.branch;
+    if (!targetBranch) {
+      throw new Error("Target branch is required for `merge-changes`");
+    }
+    const sourceBranch = requireValue(commandArgs[1], "Sub-agent branch is required for `merge-changes`");
+    return {
+      kind: "plugin",
+      pluginArgs: ["merge-changes", options.project, targetBranch, sourceBranch]
+    };
+  }
+  if (command === "continue-merge") {
+    if (!options.project) {
+      throw new Error("--project/-p is required for `continue-merge`");
+    }
+    const targetBranch = commandArgs[0] ?? options.branch;
+    if (!targetBranch) {
+      throw new Error("Target branch is required for `continue-merge`");
+    }
+    return {
+      kind: "plugin",
+      pluginArgs: ["continue-merge", options.project, targetBranch]
+    };
+  }
+  if (command === "abort-merge") {
+    if (!options.project) {
+      throw new Error("--project/-p is required for `abort-merge`");
+    }
+    const targetBranch = commandArgs[0] ?? options.branch;
+    if (!targetBranch) {
+      throw new Error("Target branch is required for `abort-merge`");
+    }
+    return {
+      kind: "plugin",
+      pluginArgs: ["abort-merge", options.project, targetBranch]
+    };
+  }
   if (command === "answer-questions") {
     const sessionId = options.session;
     if (!sessionId) {
@@ -1147,7 +1306,7 @@ async function runCommand(argv) {
     return;
   }
   const config = parseConfig(options.configPath);
-  const client = new BinctlClient(resolveClientOptions(options, config));
+  const client = new R5dctlClient(resolveClientOptions(options, config));
   const execution = resolveCommandExecution(options, rest);
   if (execution.kind === "auth-login") {
     await handleAuthLogin(client, options, execution.commandArgs, config);
@@ -1161,7 +1320,7 @@ async function runCommand(argv) {
     process.stdout.write(execution.text);
     return;
   }
-  await executeBinctlCommand(client, options.json, execution.pluginArgs);
+  await executeR5dctlCommand(client, options.json, execution.pluginArgs);
   if (execution.clearAuthOnSuccess) {
     writeConfig(options.configPath, clearAuthFromConfig(config, options));
   }
@@ -1175,12 +1334,12 @@ function extractApiErrorMessage(error) {
   }
   return error.message;
 }
-async function runBinctlCli(argv) {
+async function runR5dctlCli(argv) {
   try {
     await runCommand(argv);
     return 0;
   } catch (error) {
-    if (error instanceof BinctlApiError) {
+    if (error instanceof R5dctlApiError) {
       process.stderr.write(`${extractApiErrorMessage(error)}
 `);
       return 1;
@@ -1191,7 +1350,7 @@ async function runBinctlCli(argv) {
   }
 }
 async function main(argv = process.argv.slice(2)) {
-  const exitCode = await runBinctlCli(argv);
+  const exitCode = await runR5dctlCli(argv);
   if (exitCode !== 0) {
     process.exit(exitCode);
   }
@@ -1204,5 +1363,5 @@ export {
   parseGlobalArgs,
   parsePromptArgs,
   resolveCommandExecution,
-  runBinctlCli
+  runR5dctlCli
 };

package/dist/mjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5dctl",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "type": "module"
 }

package/dist/types/cli.d.ts

@@ -10,7 +10,7 @@ export type GlobalOptions = {
     session?: string;
     help: boolean;
 };
-export type BinctlConfig = {
+export type R5dctlConfig = {
     baseUrl?: string;
     token?: string;
     apiKey?: string;
@@ -42,6 +42,6 @@ export declare function parsePromptArgs(args: string[]): {
     message: string;
 };
 export declare function resolveCommandExecution(options: GlobalOptions, rest: string[]): CommandExecutionPlan;
-export declare function runBinctlCli(argv: string[]): Promise<number>;
+export declare function runR5dctlCli(argv: string[]): Promise<number>;
 export declare function main(argv?: string[]): Promise<void>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ricsam/r5dctl",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "type": "module",
   "main": "./dist/cjs/cli.cjs",
   "module": "./dist/mjs/cli.mjs",
@@ -20,13 +20,13 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ricsam/r5d-dev.git",
-    "directory": "binctl-packages/binctl"
+    "directory": "packages/r5dctl"
   },
   "bin": {
     "r5dctl": "dist/cjs/main.cjs"
   },
   "dependencies": {
-    "@ricsam/r5d-api": "^0.0.5"
+    "@ricsam/r5d-api": "^0.0.7"
   },
   "files": [
     "dist",