@agent-commons/cli 0.1.18 → 0.2.0

package/dist/bin.js

@@ -106,7 +106,7 @@ var sym = {
   bullet: import_chalk.default.dim("\u2022"),
   dot: import_chalk.default.dim("\xB7")
 };
-function banner(version = "0.1.18") {
+function banner(version = "0.2.0") {
   const line = import_chalk.default.cyan("  \u2500".padEnd(2) + "\u2500".repeat(44));
   console.log("");
   console.log(line);
@@ -482,7 +482,7 @@ function agentsCommand() {
       process.exit(1);
     }
   });
-  cmd.command("create").description("Create a new agent").requiredOption("--name <name>", "Agent name").option("--instructions <text>", "System instructions").option("--provider <provider>", "Model provider (openai|anthropic|google|groq)", "openai").option("--model <id>", "Model ID", "gpt-4o").option("--json", "Output as JSON").action(async (opts) => {
+  cmd.command("create").description("Create a new agent").requiredOption("--name <name>", "Agent name").option("--instructions <text>", "System instructions").option("--provider <provider>", "Model provider (openai|anthropic|google|groq|openrouter|xai|ollama|custom)", "openai").option("--model <id>", "Model ID", "gpt-5.4-mini").option("--model-api-key <key>", "Provider API key (BYOK)").option("--model-base-url <url>", "Base URL for custom or local OpenAI-compatible providers").option("--json", "Output as JSON").action(async (opts) => {
     const cfg = loadConfig();
     if (!cfg.initiator) {
       console.error(c.error("No initiator set. Run `agc login` first."));
@@ -496,7 +496,9 @@ function agentsCommand() {
         instructions: opts.instructions,
         owner: cfg.initiator,
         modelProvider: opts.provider,
-        modelId: opts.model
+        modelId: opts.model,
+        modelApiKey: opts.modelApiKey,
+        modelBaseUrl: opts.modelBaseUrl
       });
       const agent = res?.data ?? res;
       spinner.stop();
@@ -645,7 +647,7 @@ function sessionsCommand() {
       process.exit(1);
     }
   });
-  cmd.command("create").description("Create a new session").option("--agent <agentId>", "Agent ID").option("--title <title>", "Session title").option("--model <id>", "Model ID (e.g. gpt-4o, claude-sonnet-4-6)").option("--provider <provider>", "Model provider").option("--json", "Output as JSON").action(async (opts) => {
+  cmd.command("create").description("Create a new session").option("--agent <agentId>", "Agent ID").option("--title <title>", "Session title").option("--model <id>", "Model ID (e.g. gpt-5.4-mini, claude-sonnet-4-6)").option("--provider <provider>", "Model provider").option("--json", "Output as JSON").action(async (opts) => {
     const cfg = loadConfig();
     const agentId = opts.agent ?? cfg.defaultAgentId;
     if (!agentId) {
@@ -1267,11 +1269,12 @@ ${fileSection}
 ### MANDATORY RULES \u2014 READ CAREFULLY
 
 1. **Call cli_* tools immediately and directly.** Do NOT create tasks (createTask) for local file operations. Do NOT delegate to sub-agents. Do NOT ask the user to run commands themselves.
-2. **Always show the actual output** returned by the tool in your response. Never say "I listed the files" without showing them. Report exactly what the tool returns.
-3. **Never fabricate results.** Wait for the real tool output before responding.
-4. **Sensitive paths are blocked** (.ssh, .gnupg, .aws, .env, credentials). Attempting to access them will return an error.
-5. ${autoApprove ? "**cli_write_file and cli_run_command execute immediately** \u2014 auto-approve is active, no user confirmation is required." : "**cli_write_file and cli_run_command require the user to confirm** before executing \u2014 you will see the result after they approve."}
-6. **Git commits must carry the agc co-author trailer.** Always include \`--trailer "Co-Authored-By: <AgentName> (agc) <agc-agent@users.noreply.github.com>"\` when running \`git commit\`. The CLI injects this automatically \u2014 do not omit it or pass \`--no-trailer\`.
+2. **Own the request through completion.** Continue across tool calls, process polling, retries, debugging, and verification. Do not stop after describing a plan or asking whether to proceed when the request is already clear.
+3. **Use actual tool output as evidence.** Summarize the important result; do not fabricate success or dump noisy logs unless they help diagnose a failure.
+4. **Never fabricate results.** Wait for the real tool output before responding.
+5. **Sensitive paths are blocked** (.ssh, .gnupg, .aws, .env, credentials). Attempting to access them will return an error.
+6. ${autoApprove ? "**cli_write_file and cli_run_command execute immediately** \u2014 auto-approve is active, no user confirmation is required." : "**cli_write_file and cli_run_command require the user to confirm** before executing \u2014 you will see the result after they approve."}
+7. **Git commits must carry the agc co-author trailer.** Always include \`--trailer "Co-Authored-By: <AgentName> (agc) <agc-agent@users.noreply.github.com>"\` when running \`git commit\`. The CLI injects this automatically \u2014 do not omit it or pass \`--no-trailer\`.
 
 ### Available CLI tools
 
@@ -1304,12 +1307,12 @@ ${fileSection}
 
 For long commands like \`npx create-next-app@latest my-app --yes\`:
 
-1. Call \`cli_start_process\` \u2014 returns \`{processId, status: "running"}\` immediately. Tell the user it has started.
-2. Call \`cli_wait_for_process\` with \`{"processId": "...", "wait_seconds": 60}\` \u2014 blocks up to 60s then returns current stdout/status. Report progress to the user.
-3. Repeat step 2 until \`status\` is \`"done"\` or \`"error"\`.
-4. Report the final output to the user.
+1. Call \`cli_start_process\` \u2014 it returns \`{processId, status: "running"}\` immediately.
+2. Call \`cli_wait_for_process\` with \`{"processId": "...", "wait_seconds": 60}\`.
+3. Repeat step 2 until \`status\` is \`"done"\` or \`"error"\`; diagnose and repair errors when possible.
+4. Continue with the rest of the assignment and verify the final outcome before responding.
 
-Never hold the user in silence. Between each \`cli_wait_for_process\` call, tell them what you saw so far.
+Do not end the turn merely because a process is still running. Keep polling within the same run. Progress events may be streamed by the client, but the final answer comes only after completion or a genuine blocker.
 
 ### Example \u2014 scaffolding a Next.js project
 
@@ -1317,18 +1320,14 @@ Never hold the user in silence. Between each \`cli_wait_for_process\` call, tell
 cli_start_process: {"command": "npx", "args": ["create-next-app@latest", "my-app", "--yes"], "cwd": "Desktop"}
 \u2192 {processId: "proc_1a2b", status: "running"}
 
-Tell user: "Started! Installing dependencies, this takes a minute or two. Checking in 60s\u2026"
-
 cli_wait_for_process: {"processId": "proc_1a2b", "wait_seconds": 60}
 \u2192 {status: "running", elapsedSec: 60, stdout: "Creating project...
 Installing packages\u2026"}
 
-Tell user: "Still installing \u2014 here's output so far: [stdout]. Checking again\u2026"
-
 cli_wait_for_process: {"processId": "proc_1a2b", "wait_seconds": 60}
 \u2192 {status: "done", exitCode: 0, elapsedSec: 93, stdout: "Success! Created my-app"}
 
-Tell user: "Done! Project created in Desktop/my-app"
+Continue by running the requested checks and opening/inspecting the app when the assignment requires it.
 \`\`\`
 `;
 }
@@ -1350,6 +1349,65 @@ function injectAgcTrailer(command, args, agentId, agentName) {
   const identity = agentName ? `${agentName} (agc)` : agentId ? `agc/${agentId}` : "agc agent";
   return [...args, "--trailer", `Co-Authored-By: ${identity} <agc-agent@users.noreply.github.com>`];
 }
+var AGC_HOOK_MARKER = "# agc-session:";
+var HOOK_BACKUP_SUFFIX = ".agc-backup";
+function findGitDir(rootDir) {
+  const gitPath = (0, import_path3.join)(rootDir, ".git");
+  if (!(0, import_fs3.existsSync)(gitPath)) return null;
+  const s = (0, import_fs3.statSync)(gitPath);
+  if (s.isDirectory()) return gitPath;
+  if (s.isFile()) {
+    const content = (0, import_fs3.readFileSync)(gitPath, "utf8");
+    const match = content.match(/^gitdir:\s*(.+)$/m);
+    if (match) return match[1].trim();
+  }
+  return null;
+}
+function installGitHook(rootDir, sessionId, agentId, agentName) {
+  const gitDir = findGitDir(rootDir);
+  if (!gitDir) return;
+  const hooksDir = (0, import_path3.join)(gitDir, "hooks");
+  (0, import_fs3.mkdirSync)(hooksDir, { recursive: true });
+  const hookPath = (0, import_path3.join)(hooksDir, "prepare-commit-msg");
+  if ((0, import_fs3.existsSync)(hookPath)) {
+    const existing = (0, import_fs3.readFileSync)(hookPath, "utf8");
+    if (!existing.includes(AGC_HOOK_MARKER)) {
+      (0, import_fs3.writeFileSync)(hookPath + HOOK_BACKUP_SUFFIX, existing, { mode: 493 });
+    }
+  }
+  const identity = agentName ? `${agentName} (agc)` : agentId ? `agc/${agentId}` : "agc agent";
+  const trailer = `Co-Authored-By: ${identity} <agc-agent@users.noreply.github.com>`;
+  const chainLine = (0, import_fs3.existsSync)(hookPath + HOOK_BACKUP_SUFFIX) ? `
+# chain pre-existing hook
+"$(dirname "$0")/prepare-commit-msg${HOOK_BACKUP_SUFFIX}" "$@" 2>/dev/null || true
+` : "";
+  const hook = `#!/bin/sh
+${AGC_HOOK_MARKER}${sessionId}
+COMMIT_MSG_FILE="$1"
+COMMIT_SOURCE="$2"
+${chainLine}
+case "$COMMIT_SOURCE" in merge|squash) exit 0 ;; esac
+TRAILER="${trailer}"
+grep -qF "$TRAILER" "$COMMIT_MSG_FILE" 2>/dev/null && exit 0
+printf '\\n%s\\n' "$TRAILER" >> "$COMMIT_MSG_FILE"
+`;
+  (0, import_fs3.writeFileSync)(hookPath, hook, { mode: 493 });
+}
+function removeGitHook(rootDir) {
+  const gitDir = findGitDir(rootDir);
+  if (!gitDir) return;
+  const hookPath = (0, import_path3.join)(gitDir, "hooks", "prepare-commit-msg");
+  if (!(0, import_fs3.existsSync)(hookPath)) return;
+  const content = (0, import_fs3.readFileSync)(hookPath, "utf8");
+  if (!content.includes(AGC_HOOK_MARKER)) return;
+  const backupPath = hookPath + HOOK_BACKUP_SUFFIX;
+  if ((0, import_fs3.existsSync)(backupPath)) {
+    (0, import_fs3.writeFileSync)(hookPath, (0, import_fs3.readFileSync)(backupPath, "utf8"), { mode: 493 });
+    (0, import_fs3.unlinkSync)(backupPath);
+  } else {
+    (0, import_fs3.unlinkSync)(hookPath);
+  }
+}
 function safePath(root, userPath) {
   const abs = (0, import_path3.resolve)(root, userPath);
   const rel = (0, import_path3.relative)(root, abs);
@@ -1841,7 +1899,7 @@ function runCommand() {
       ...cfg.initiator && { initiatorId: cfg.initiator },
       ...cliContext && { cliContext }
     };
-    if (opts.noStream) {
+    if (opts.noStream && !localEnabled) {
       const spinner = spin("Running\u2026");
       try {
         const result = await client.run.once(params);
@@ -1917,7 +1975,8 @@ Session: ${sessionId}  (resume with: agc run --session ${sessionId} "<prompt>")`
         } else if (event.type === "final") {
           if (hasOutput) process.stdout.write("\n");
           const e = event;
-          if (e.content && !hasOutput) console.log(e.content);
+          const finalText = e.content ?? e.payload?.content ?? e.payload?.text ?? e.payload?.message;
+          if (finalText && !hasOutput) console.log(finalText);
           if (sessionId) console.log(c.dim(`
 Session: ${sessionId}  (resume with: agc run --session ${sessionId} "<prompt>")`));
           break;
@@ -2039,23 +2098,27 @@ function chatCommand() {
         process.exit(1);
       }
     }
+    let agentName;
     let walletLine = "";
-    try {
-      const primary = await client.wallets.primary(agentId);
-      const w = primary?.data ?? primary;
-      if (w?.id) {
-        const bal = await client.wallets.balance(w.id).catch(() => null);
-        const b = bal?.data ?? bal;
-        const addr = `${w.address.slice(0, 6)}\u2026${w.address.slice(-4)}`;
-        const usdc = b?.usdc ?? "0";
-        walletLine = `${addr}  ${c.bold(usdc + " USDC")}`;
-      }
-    } catch {
-    }
+    await Promise.allSettled([
+      client.agents.get(agentId).then((res) => {
+        agentName = (res?.data ?? res)?.name;
+      }),
+      client.wallets.primary(agentId).then(async (primary) => {
+        const w = primary?.data ?? primary;
+        if (w?.id) {
+          const bal = await client.wallets.balance(w.id).catch(() => null);
+          const b = bal?.data ?? bal;
+          const addr = `${w.address.slice(0, 6)}\u2026${w.address.slice(-4)}`;
+          const usdc = b?.usdc ?? "0";
+          walletLine = `${addr}  ${c.bold(usdc + " USDC")}`;
+        }
+      })
+    ]);
     console.log(`
 ${c.bold("Agent Commons Chat")}`);
     const headerRows = [
-      ["Agent", agentId],
+      ["Agent", agentName ? `${agentName}  ${c.dim(agentId)}` : agentId],
       ["Session", c.id(sessionId) + (isResume ? c.dim(" (resumed)") : c.dim(" (new)"))]
     ];
     if (walletLine) headerRows.push(["Wallet", walletLine]);
@@ -2068,9 +2131,12 @@ ${c.bold("Agent Commons Chat")}`);
       localToolsCfg = {
         rootDir,
         sessionId,
+        agentId,
+        agentName,
         appendLog: (record) => appendSessionLog(sessionId, record),
         permissions: /* @__PURE__ */ new Map()
       };
+      installGitHook(rootDir, sessionId, agentId, agentName);
       appendSessionLog(sessionId, {
         type: "local_tools_enabled",
         rootDir,
@@ -2334,10 +2400,15 @@ ${sym.fail} ${c.error(event.message ?? "Stream error")}`);
       rl.resume();
       rl.prompt();
     });
+    const cleanup = () => {
+      if (localToolsCfg) removeGitHook(localToolsCfg.rootDir);
+    };
     rl.on("close", () => {
+      cleanup();
       process.exit(0);
     });
     process.on("SIGINT", () => {
+      cleanup();
       console.log(c.dim(`
 Session preserved. Resume with: agc chat --resume ${sessionId}`));
       process.exit(130);
@@ -3801,7 +3872,7 @@ async function pickAgentInteractively(action) {
   return agentId;
 }
 var program = new import_commander16.Command();
-program.name("agc").description("Agent Commons CLI \u2014 interact with the Agent Commons platform").version("0.1.18", "-v, --version").action(async () => {
+program.name("agc").description("Agent Commons CLI \u2014 interact with the Agent Commons platform").version("0.2.0", "-v, --version").action(async () => {
   await interactiveMenu();
 });
 program.addCommand(loginCommand());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-commons/cli",
-  "version": "0.1.18",
+  "version": "0.2.0",
   "description": "Agent Commons CLI — chat, run, and manage agents from your terminal",
   "license": "MIT",
   "bin": {
@@ -16,7 +16,7 @@
     "commander": "^12.1.0",
     "ora": "^8.1.1",
     "pdf-parse": "^1.1.1",
-    "@agent-commons/sdk": "0.1.13"
+    "@agent-commons/sdk": "0.2.0"
   },
   "devDependencies": {
     "@types/node": "^22.10.2",