@agent-commons/cli 0.1.18 → 0.2.1

package/dist/bin.js

@@ -45,10 +45,14 @@ var CONFIG_DIR = (0, import_path.join)((0, import_os.homedir)(), ".agc");
 var CONFIG_FILE = (0, import_path.join)(CONFIG_DIR, "config.json");
 var DEFAULT_API_URL = process.env.AGC_API_URL ?? "https://api.agentcommons.io";
 var DEFAULT_APP_URL = "https://www.agentcommons.io";
+var DEFAULT_IDENTITY_URL = process.env.COMMONS_IDENTITY_URL ?? "https://auth.agentcommons.io";
+var DEFAULT_IDENTITY_CLIENT_ID = process.env.COMMONS_IDENTITY_CLIENT_ID ?? "commons-cli";
 function loadConfig() {
   const fromEnv = {
     ...process.env.AGC_API_URL && { apiUrl: process.env.AGC_API_URL },
     ...process.env.AGC_API_KEY && { apiKey: process.env.AGC_API_KEY },
+    ...process.env.COMMONS_ACCESS_TOKEN && { accessToken: process.env.COMMONS_ACCESS_TOKEN },
+    ...process.env.COMMONS_IDENTITY_URL && { identityUrl: process.env.COMMONS_IDENTITY_URL },
     ...process.env.AGC_INITIATOR && { initiator: process.env.AGC_INITIATOR },
     ...process.env.AGC_AGENT_ID && { defaultAgentId: process.env.AGC_AGENT_ID }
   };
@@ -61,6 +65,8 @@ function loadConfig() {
   }
   return {
     apiUrl: DEFAULT_API_URL,
+    identityUrl: DEFAULT_IDENTITY_URL,
+    identityClientId: DEFAULT_IDENTITY_CLIENT_ID,
     ...fromFile,
     ...fromEnv
   };
@@ -73,17 +79,65 @@ function saveConfig(updates) {
 }
 function clearConfig() {
   if ((0, import_fs.existsSync)(CONFIG_FILE)) {
-    (0, import_fs.writeFileSync)(CONFIG_FILE, JSON.stringify({ apiUrl: DEFAULT_API_URL }, null, 2));
+    (0, import_fs.writeFileSync)(
+      CONFIG_FILE,
+      JSON.stringify(
+        {
+          apiUrl: DEFAULT_API_URL,
+          identityUrl: DEFAULT_IDENTITY_URL,
+          identityClientId: DEFAULT_IDENTITY_CLIENT_ID
+        },
+        null,
+        2
+      ),
+      { mode: 384 }
+    );
   }
 }
 function makeClient(overrides) {
   const cfg = { ...loadConfig(), ...overrides };
   return new import_sdk.CommonsClient({
     baseUrl: cfg.apiUrl,
-    apiKey: cfg.apiKey,
-    initiator: cfg.initiator
+    apiKey: cfg.accessToken ?? cfg.apiKey,
+    initiator: cfg.userId ?? cfg.initiator
   });
 }
+function decodeJwtPayload(token) {
+  const [, payload] = token.split(".");
+  if (!payload) return {};
+  try {
+    return JSON.parse(Buffer.from(payload, "base64url").toString("utf8"));
+  } catch {
+    return {};
+  }
+}
+async function ensureAccessToken() {
+  const cfg = loadConfig();
+  if (cfg.apiKey && !cfg.sessionToken) return cfg;
+  if (cfg.accessToken && cfg.accessTokenExpiresAt && cfg.accessTokenExpiresAt > Date.now() + 3e4) {
+    return cfg;
+  }
+  if (!cfg.sessionToken || !cfg.identityUrl) return cfg;
+  const response = await fetch(
+    `${cfg.identityUrl.replace(/\/$/, "")}/api/auth/token`,
+    { headers: { Authorization: `Bearer ${cfg.sessionToken}` } }
+  );
+  if (!response.ok) {
+    throw new Error("Your Commons login has expired. Run `agc login` again.");
+  }
+  const data = await response.json();
+  if (!data.token) throw new Error("Commons Identity did not return an access token.");
+  const claims = decodeJwtPayload(data.token);
+  const updates = {
+    accessToken: data.token,
+    accessTokenExpiresAt: typeof claims.exp === "number" ? claims.exp * 1e3 : Date.now() + 10 * 60 * 1e3,
+    userId: typeof claims.sub === "string" ? claims.sub : cfg.userId,
+    workspaceId: typeof claims.workspace_id === "string" ? claims.workspace_id : cfg.workspaceId,
+    initiator: typeof claims.sub === "string" ? claims.sub : cfg.initiator
+  };
+  saveConfig(updates);
+  return { ...cfg, ...updates };
+}
 
 // src/ui.ts
 var import_chalk = __toESM(require("chalk"));
@@ -106,7 +160,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.1") {
   const line = import_chalk.default.cyan("  \u2500".padEnd(2) + "\u2500".repeat(44));
   console.log("");
   console.log(line);
@@ -282,14 +336,14 @@ function prompt(question, hidden = false) {
 }
 function loginCommand() {
   const cmd = new import_commander.Command("login").description("Configure API credentials");
-  cmd.option("--api-url <url>", "API base URL", DEFAULT_API_URL).option("--api-key <key>", "API key (or set AGC_API_KEY env var)").option("--initiator <id>", "User/initiator ID (advanced \u2014 usually auto-detected)").action(async (opts) => {
+  cmd.option("--api-url <url>", "API base URL", DEFAULT_API_URL).option("--identity-url <url>", "Commons Identity URL", DEFAULT_IDENTITY_URL).option("--api-key <key>", "API key (or set AGC_API_KEY env var)").option("--initiator <id>", "User/initiator ID (advanced \u2014 usually auto-detected)").action(async (opts) => {
     try {
       const current = loadConfig();
       const isFirstRun = !(0, import_fs2.existsSync)(CONFIG_FILE2);
       banner();
       if (isFirstRun) {
         console.log(c.bold("  Welcome to Agent Commons CLI!"));
-        console.log(c.dim("  You just need an API key to get started.\n"));
+        console.log(c.dim("  Sign in once with your Commons account to get started.\n"));
       } else {
         console.log(c.bold("  Update your credentials"));
         console.log(c.dim("  Press Enter to keep existing values.\n"));
@@ -308,7 +362,74 @@ function loginCommand() {
       }
       const appUrl = apiUrl.includes("localhost") ? "http://localhost:3000" : DEFAULT_APP_URL;
       const apiKeysUrl = `${appUrl}/settings/api-keys`;
-      step(1, 1, "API Key");
+      if (!opts.apiKey) {
+        step(1, 1, "Commons account");
+        const identityUrl = String(opts.identityUrl).replace(/\/$/, "");
+        const clientId = DEFAULT_IDENTITY_CLIENT_ID;
+        const deviceResponse = await fetch(`${identityUrl}/api/auth/device/code`, {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({
+            client_id: clientId,
+            scope: "openid profile email offline_access agents:read agents:write agents:run compute:read compute:write activity:read usage:read"
+          })
+        });
+        const device = await deviceResponse.json();
+        if (!deviceResponse.ok || !device.device_code || !device.user_code) {
+          throw new Error(device.error_description || "Could not start Commons login.");
+        }
+        const verificationUrl = device.verification_uri_complete ?? `${identityUrl}/device?user_code=${encodeURIComponent(device.user_code)}`;
+        console.log(`  ${c.dim("Authorize this CLI in your browser:")}`);
+        console.log(`  ${c.primary(verificationUrl)}`);
+        console.log(`  ${c.dim("Code:")} ${c.bold(device.user_code)}
+`);
+        openBrowser(verificationUrl);
+        const deadline = Date.now() + (device.expires_in ?? 600) * 1e3;
+        let intervalMs = Math.max(device.interval ?? 5, 1) * 1e3;
+        let sessionToken;
+        while (Date.now() < deadline) {
+          await new Promise((resolve2) => setTimeout(resolve2, intervalMs));
+          const tokenResponse = await fetch(`${identityUrl}/api/auth/device/token`, {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({
+              grant_type: "urn:ietf:params:oauth:grant-type:device_code",
+              device_code: device.device_code,
+              client_id: clientId
+            })
+          });
+          const token = await tokenResponse.json();
+          if (tokenResponse.ok && token.access_token) {
+            sessionToken = token.access_token;
+            break;
+          }
+          if (token.error === "slow_down") {
+            intervalMs += 1e3;
+            continue;
+          }
+          if (token.error === "authorization_pending") continue;
+          throw new Error(token.error_description || token.error || "Commons login failed.");
+        }
+        if (!sessionToken) throw new Error("Commons login expired before approval.");
+        saveConfig({
+          apiUrl,
+          identityUrl,
+          identityClientId: clientId,
+          sessionToken,
+          accessToken: void 0,
+          accessTokenExpiresAt: void 0,
+          apiKey: void 0
+        });
+        const authenticated = await ensureAccessToken();
+        console.log(
+          `  ${sym.ok} ${c.success("Signed in")} as ${c.id(authenticated.userId ?? "Commons user")}`
+        );
+        console.log(`
+  ${sym.ok} ${c.success("All set!")} Credentials saved to ${c.dim("~/.agc/config.json")}
+`);
+        return;
+      }
+      step(1, 1, "Legacy API Key");
       let apiKey = opts.apiKey;
       if (!apiKey) {
         console.log(`  ${c.dim("You'll need an API key from your Agent Commons account.")}`);
@@ -377,15 +498,22 @@ function whoamiCommand() {
   return new import_commander.Command("whoami").description("Show current configuration and verify API connectivity").option("--json", "Output as JSON").action(async (opts) => {
     const cfg = loadConfig();
     if (opts.json) {
-      console.log(JSON.stringify({ apiUrl: cfg.apiUrl, initiator: cfg.initiator, hasApiKey: !!cfg.apiKey }, null, 2));
+      console.log(JSON.stringify({
+        apiUrl: cfg.apiUrl,
+        identityUrl: cfg.identityUrl,
+        userId: cfg.userId ?? cfg.initiator,
+        workspaceId: cfg.workspaceId,
+        authenticated: Boolean(cfg.sessionToken || cfg.apiKey)
+      }, null, 2));
       return;
     }
     console.log(`
 ${c.bold("Current configuration")}`);
     detail([
       ["API URL", cfg.apiUrl],
-      ["Initiator", cfg.initiator ?? c.dim("(not set)")],
-      ["API Key", cfg.apiKey ? `****${cfg.apiKey.slice(-4)}` : c.dim("(not set)")],
+      ["Identity", cfg.userId ?? cfg.initiator ?? c.dim("(not set)")],
+      ["Workspace", cfg.workspaceId ?? c.dim("(not set)")],
+      ["Auth", cfg.sessionToken ? "Commons account" : cfg.apiKey ? "Legacy API key" : c.dim("(not set)")],
       ["Agent ID", cfg.defaultAgentId ?? c.dim("(not set)")]
     ]);
     try {
@@ -482,7 +610,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 +624,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 +775,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) {
@@ -685,8 +815,50 @@ ${sym.ok} Session created`);
 
 // src/commands/tools.ts
 var import_commander4 = require("commander");
+var import_fs3 = require("fs");
 function toolsCommand() {
   const cmd = new import_commander4.Command("tools").description("Discover and manage tools");
+  cmd.command("create").description("Create a tool from a JSON file").requiredOption("--file <path>", "Path to a JSON tool definition").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."));
+      process.exit(1);
+    }
+    let payload;
+    try {
+      payload = JSON.parse((0, import_fs3.readFileSync)(opts.file, "utf8"));
+    } catch (error) {
+      console.error(c.error(`Could not read tool file: ${error.message}`));
+      process.exit(1);
+    }
+    if (!payload.name || !payload.schema) {
+      console.error(c.error('Tool file must include at least "name" and "schema".'));
+      process.exit(1);
+    }
+    const spinner = spin("Creating tool\u2026");
+    try {
+      const client = makeClient();
+      const res = await client.tools.create({
+        ...payload,
+        owner: cfg.initiator,
+        ownerType: payload.ownerType ?? "user"
+      });
+      const tool = res?.data ?? res;
+      spinner.stop();
+      if (opts.json) return jsonOut(tool);
+      console.log(`
+${sym.ok} Tool created`);
+      detail([
+        ["Tool ID", c.id(tool.toolId)],
+        ["Name", tool.name],
+        ["Visibility", tool.visibility ?? payload.visibility ?? "private"]
+      ]);
+    } catch (err) {
+      spinner.stop();
+      printError(err);
+      process.exit(1);
+    }
+  });
   cmd.command("list").description("List available tools").option("--owner <id>", "Filter by owner ID").option("--json", "Output as JSON").action(async (opts) => {
     const cfg = loadConfig();
     const spinner = spin("Fetching tools\u2026");
@@ -784,8 +956,37 @@ ${sym.ok} ${c.label(toolName)}`);
 
 // src/commands/workflow.ts
 var import_commander5 = require("commander");
+var import_fs4 = require("fs");
+var import_sdk2 = require("@agent-commons/sdk");
 function workflowCommand() {
   const cmd = new import_commander5.Command("workflow").description("Run and monitor workflows").alias("wf");
+  async function createTemplateWorkflow(params) {
+    const client = makeClient();
+    const template = (0, import_sdk2.buildWorkflowTemplate)(params.templateName, params.ctx);
+    const toolIds = {};
+    const createdTools = [];
+    for (const tool of template.tools) {
+      const created = await client.tools.create({
+        ...tool.payload,
+        owner: params.ctx.ownerId,
+        ownerType: "user"
+      });
+      const createdTool = created?.data ?? created;
+      toolIds[tool.key] = createdTool.toolId;
+      createdTools.push(createdTool);
+    }
+    const workflow = await client.workflows.create({
+      name: template.name,
+      description: template.description,
+      ownerId: params.ctx.ownerId,
+      ownerType: "user",
+      isPublic: params.isPublic,
+      category: template.category,
+      tags: template.tags,
+      definition: template.buildDefinition(toolIds, params.ctx)
+    });
+    return { template, workflow, createdTools };
+  }
   cmd.command("list").description("List workflows owned by the current initiator").option("--json", "Output as JSON").action(async (opts) => {
     const cfg = loadConfig();
     if (!cfg.initiator) {
@@ -815,6 +1016,166 @@ function workflowCommand() {
       process.exit(1);
     }
   });
+  cmd.command("create").description("Create a workflow from a JSON file").requiredOption("--file <path>", "Path to a workflow payload or definition JSON file").option("--name <name>", "Workflow name").option("--description <text>", "Workflow description").option("--public", "Make workflow public").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."));
+      process.exit(1);
+    }
+    let fileJson;
+    try {
+      fileJson = JSON.parse((0, import_fs4.readFileSync)(opts.file, "utf8"));
+    } catch (error) {
+      console.error(c.error(`Could not read workflow file: ${error.message}`));
+      process.exit(1);
+    }
+    const definition = fileJson.definition ?? fileJson;
+    if (!Array.isArray(definition.nodes) || !Array.isArray(definition.edges)) {
+      console.error(c.error('Workflow file must include a definition with "nodes" and "edges".'));
+      process.exit(1);
+    }
+    const spinner = spin("Creating workflow\u2026");
+    try {
+      const client = makeClient();
+      const workflow = await client.workflows.create({
+        name: opts.name ?? fileJson.name ?? "CLI Workflow",
+        description: opts.description ?? fileJson.description,
+        definition,
+        ownerId: cfg.initiator,
+        ownerType: "user",
+        isPublic: opts.public ?? fileJson.isPublic,
+        category: fileJson.category,
+        tags: fileJson.tags
+      });
+      spinner.stop();
+      if (opts.json) return jsonOut(workflow);
+      console.log(`
+${sym.ok} Workflow created`);
+      detail([
+        ["Workflow ID", c.id(workflow.workflowId)],
+        ["Name", workflow.name],
+        ["Nodes", String((workflow.definition?.nodes ?? []).length)]
+      ]);
+    } catch (err) {
+      spinner.stop();
+      printError(err);
+      process.exit(1);
+    }
+  });
+  const templates = cmd.command("templates").description("Create workflows from built-in templates");
+  templates.command("list").description("List built-in workflow templates").option("--json", "Output as JSON").action((opts) => {
+    const rows = (0, import_sdk2.listWorkflowTemplates)();
+    if (opts.json) return jsonOut(rows);
+    section(`Workflow Templates (${rows.length})`);
+    table(
+      rows.map((template) => ({
+        Name: template.name,
+        Description: template.description
+      })),
+      ["Name", "Description"]
+    );
+  });
+  templates.command("create <templateName>").description("Create a workflow template and its required API tools").option("--prefix <prefix>", "Stable prefix for generated tool/workflow names").option("--agent <agentId>", "Agent ID for agent_processor nodes").option("--reviewer-agent <agentId>", "Second agent ID for multi-agent templates").option("--child-workflow <workflowId>", "Child workflow ID for workflow-invocation-smoke").option("--public", "Make workflow public").option("--run", "Run the workflow after creating it").option("--input <json>", "Run input JSON; defaults to template sample input").option("--json", "Output as JSON").action(async (templateNameRaw, opts) => {
+    const cfg = loadConfig();
+    if (!cfg.initiator) {
+      console.error(c.error("No initiator set. Run `agc login` first."));
+      process.exit(1);
+    }
+    const templateNames = (0, import_sdk2.listWorkflowTemplates)().map((item) => item.name);
+    if (!templateNames.includes(templateNameRaw)) {
+      console.error(c.error(`Unknown template "${templateNameRaw}".`));
+      console.error(c.dim(`Available: ${templateNames.join(", ")}`));
+      process.exit(1);
+    }
+    const templateName = templateNameRaw;
+    const needsAgent = templateName === "agent-research-summary" || templateName === "multi-agent-field-report";
+    const agentId = opts.agent ?? cfg.defaultAgentId;
+    if (needsAgent && !agentId) {
+      console.error(c.error("This template requires --agent <agentId> or a configured defaultAgentId."));
+      process.exit(1);
+    }
+    const prefix = opts.prefix ?? `cli_${templateName.replace(/[^a-z0-9]+/gi, "_")}_${Date.now().toString(36)}`;
+    const spinner = spin("Creating workflow template\u2026");
+    try {
+      let childWorkflowId = opts.childWorkflow;
+      let childResult;
+      if (templateName === "workflow-invocation-smoke" && !childWorkflowId) {
+        const childCtx = {
+          ownerId: cfg.initiator,
+          prefix: `${prefix}_child`
+        };
+        childResult = await createTemplateWorkflow({
+          templateName: "country-weather-brief",
+          ctx: childCtx,
+          isPublic: opts.public
+        });
+        childWorkflowId = childResult.workflow.workflowId;
+      }
+      const ctx = {
+        ownerId: cfg.initiator,
+        prefix,
+        agentId,
+        reviewerAgentId: opts.reviewerAgent,
+        childWorkflowId
+      };
+      const result = await createTemplateWorkflow({
+        templateName,
+        ctx,
+        isPublic: opts.public
+      });
+      let execution;
+      if (opts.run) {
+        let inputData = result.template.sampleInput;
+        if (opts.input) {
+          try {
+            inputData = JSON.parse(opts.input);
+          } catch {
+            throw new Error("--input must be valid JSON");
+          }
+        }
+        execution = await makeClient().workflows.execute(result.workflow.workflowId, {
+          agentId,
+          inputData,
+          userId: cfg.initiator
+        });
+      }
+      spinner.stop();
+      const output = { ...result, child: childResult, execution };
+      if (opts.json) return jsonOut(output);
+      console.log(`
+${sym.ok} Workflow template created`);
+      if (childResult) {
+        detail([
+          ["Child workflow", c.id(childResult.workflow.workflowId)],
+          ["Parent workflow", c.id(result.workflow.workflowId)],
+          ["Template", templateName]
+        ]);
+      } else {
+        detail([
+          ["Workflow ID", c.id(result.workflow.workflowId)],
+          ["Template", templateName],
+          ["Tools created", String(result.createdTools.length)]
+        ]);
+      }
+      if (execution) {
+        console.log(`
+${sym.ok} Execution started: ${c.id(execution.executionId)}`);
+        console.log(`   Status: ${statusBadge(execution.status)}`);
+        const resultData = execution.result ?? execution.outputData;
+        if (resultData !== void 0) {
+          console.log("\n" + c.label("Result"));
+          console.log("  " + JSON.stringify(resultData, null, 2).replace(/\n/g, "\n  "));
+        }
+      } else {
+        console.log(c.dim(`
+  Run it with: agc workflow run ${result.workflow.workflowId} --input '${JSON.stringify(result.template.sampleInput)}'`));
+      }
+    } catch (err) {
+      spinner.stop();
+      printError(err);
+      process.exit(1);
+    }
+  });
   cmd.command("get <workflowId>").description("Show workflow details").option("--json", "Output as JSON").action(async (workflowId, opts) => {
     const spinner = spin("Fetching workflow\u2026");
     try {
@@ -1187,7 +1548,7 @@ var import_commander7 = require("commander");
 var readline3 = __toESM(require("readline"));
 
 // src/local-tools.ts
-var import_fs3 = require("fs");
+var import_fs5 = require("fs");
 var import_path3 = require("path");
 var import_child_process2 = require("child_process");
 var readline2 = __toESM(require("readline"));
@@ -1205,7 +1566,7 @@ function buildDirSnapshot(dir, maxDepth = 2) {
     if (lines.length >= 300) return;
     let entries;
     try {
-      entries = (0, import_fs3.readdirSync)(d, { withFileTypes: true });
+      entries = (0, import_fs5.readdirSync)(d, { withFileTypes: true });
     } catch {
       return;
     }
@@ -1235,11 +1596,11 @@ function readFileForContext(rootDir, filePath) {
     for (const pat of [/\/\.ssh\//, /\/\.aws\//, /\/\.env$/, /\/\.env\./, /id_rsa/, /id_ed25519/]) {
       if (pat.test(abs)) return `[error: sensitive path blocked]`;
     }
-    if (!(0, import_fs3.existsSync)(abs)) return `[error: file not found: ${filePath}]`;
-    const stat = (0, import_fs3.statSync)(abs);
+    if (!(0, import_fs5.existsSync)(abs)) return `[error: file not found: ${filePath}]`;
+    const stat = (0, import_fs5.statSync)(abs);
     if (stat.isDirectory()) return `[error: "${filePath}" is a directory \u2014 use list_directory]`;
     if (stat.size > 1e5) return `[truncated \u2014 file too large (${Math.round(stat.size / 1024)} KB). Use cli_read_file for full content]`;
-    return (0, import_fs3.readFileSync)(abs, "utf8");
+    return (0, import_fs5.readFileSync)(abs, "utf8");
   } catch (err) {
     return `[error reading file: ${err?.message}]`;
   }
@@ -1267,11 +1628,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 +1666,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 +1679,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 +1708,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_fs5.existsSync)(gitPath)) return null;
+  const s = (0, import_fs5.statSync)(gitPath);
+  if (s.isDirectory()) return gitPath;
+  if (s.isFile()) {
+    const content = (0, import_fs5.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_fs5.mkdirSync)(hooksDir, { recursive: true });
+  const hookPath = (0, import_path3.join)(hooksDir, "prepare-commit-msg");
+  if ((0, import_fs5.existsSync)(hookPath)) {
+    const existing = (0, import_fs5.readFileSync)(hookPath, "utf8");
+    if (!existing.includes(AGC_HOOK_MARKER)) {
+      (0, import_fs5.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_fs5.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_fs5.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_fs5.existsSync)(hookPath)) return;
+  const content = (0, import_fs5.readFileSync)(hookPath, "utf8");
+  if (!content.includes(AGC_HOOK_MARKER)) return;
+  const backupPath = hookPath + HOOK_BACKUP_SUFFIX;
+  if ((0, import_fs5.existsSync)(backupPath)) {
+    (0, import_fs5.writeFileSync)(hookPath, (0, import_fs5.readFileSync)(backupPath, "utf8"), { mode: 493 });
+    (0, import_fs5.unlinkSync)(backupPath);
+  } else {
+    (0, import_fs5.unlinkSync)(hookPath);
+  }
+}
 function safePath(root, userPath) {
   const abs = (0, import_path3.resolve)(root, userPath);
   const rel = (0, import_path3.relative)(root, abs);
@@ -1450,7 +1867,7 @@ function extractViaCommand(cmd, cmdArgs) {
 }
 async function extractPdfText(abs) {
   try {
-    const buffer = (0, import_fs3.readFileSync)(abs);
+    const buffer = (0, import_fs5.readFileSync)(abs);
     const data = await pdfParse(buffer);
     const text2 = data.text?.trim();
     if (text2) {
@@ -1478,8 +1895,8 @@ async function toolReadFile(args, cfg) {
   if (!userPath) throw new Error('read_file requires a "path" argument');
   const abs = safePath(cfg.rootDir, userPath);
   assertNotSensitive(abs);
-  if (!(0, import_fs3.existsSync)(abs)) throw new Error(`File not found: ${userPath}`);
-  const stat = (0, import_fs3.statSync)(abs);
+  if (!(0, import_fs5.existsSync)(abs)) throw new Error(`File not found: ${userPath}`);
+  const stat = (0, import_fs5.statSync)(abs);
   if (stat.isDirectory()) throw new Error(`"${userPath}" is a directory, not a file`);
   const ext = (0, import_path3.extname)(abs).toLowerCase();
   if (PDF_EXTS.has(ext)) {
@@ -1494,7 +1911,7 @@ async function toolReadFile(args, cfg) {
     throw new Error(`Cannot read binary file "${userPath}" (${ext} format). Only text, PDF, and Office documents are supported.`);
   }
   if (stat.size > 5e5) throw new Error(`File too large to read (${Math.round(stat.size / 1024)} KB). Max 500 KB.`);
-  return (0, import_fs3.readFileSync)(abs, "utf8");
+  return (0, import_fs5.readFileSync)(abs, "utf8");
 }
 async function toolWriteFile(args, cfg) {
   const { path: userPath, content } = args;
@@ -1508,16 +1925,16 @@ async function toolWriteFile(args, cfg) {
     "write_file"
   );
   if (!ok) return "User denied write operation.";
-  (0, import_fs3.mkdirSync)((0, import_path3.dirname)(abs), { recursive: true });
-  (0, import_fs3.writeFileSync)(abs, content, "utf8");
+  (0, import_fs5.mkdirSync)((0, import_path3.dirname)(abs), { recursive: true });
+  (0, import_fs5.writeFileSync)(abs, content, "utf8");
   return `Written ${String(content).length} bytes to ${userPath}`;
 }
 async function toolListDirectory(args, cfg) {
   const userPath = args.path ?? ".";
   const abs = safePath(cfg.rootDir, userPath);
   assertNotSensitive(abs);
-  if (!(0, import_fs3.existsSync)(abs)) throw new Error(`Directory not found: ${userPath}`);
-  const entries = (0, import_fs3.readdirSync)(abs, { withFileTypes: true });
+  if (!(0, import_fs5.existsSync)(abs)) throw new Error(`Directory not found: ${userPath}`);
+  const entries = (0, import_fs5.readdirSync)(abs, { withFileTypes: true });
   const lines = entries.map((e) => {
     const type = e.isDirectory() ? "d" : e.isSymbolicLink() ? "l" : "f";
     return `[${type}] ${e.name}`;
@@ -1537,7 +1954,7 @@ async function toolSearchFiles(args, cfg) {
   function walk(dir, depth = 0) {
     if (results.length >= 50 || depth > 10) return;
     try {
-      for (const entry of (0, import_fs3.readdirSync)(dir, { withFileTypes: true })) {
+      for (const entry of (0, import_fs5.readdirSync)(dir, { withFileTypes: true })) {
         if (entry.name.startsWith(".") && depth > 0) continue;
         const full = (0, import_path3.join)(dir, entry.name);
         const rel = (0, import_path3.relative)(cfg.rootDir, full);
@@ -1841,7 +2258,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 +2334,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;
@@ -1939,18 +2357,18 @@ ${sym.fail} ${c.error(event.message ?? "Error")}`);
 // src/commands/chat.ts
 var import_commander8 = require("commander");
 var readline4 = __toESM(require("readline"));
-var import_fs4 = require("fs");
+var import_fs6 = require("fs");
 var import_path4 = require("path");
 var import_os3 = require("os");
 var SESSIONS_DIR = (0, import_path4.join)((0, import_os3.homedir)(), ".agc", "sessions");
 function ensureSessionsDir() {
-  if (!(0, import_fs4.existsSync)(SESSIONS_DIR)) (0, import_fs4.mkdirSync)(SESSIONS_DIR, { recursive: true });
+  if (!(0, import_fs6.existsSync)(SESSIONS_DIR)) (0, import_fs6.mkdirSync)(SESSIONS_DIR, { recursive: true });
 }
 function appendSessionLog(sessionId, record) {
   try {
     ensureSessionsDir();
     const file = (0, import_path4.join)(SESSIONS_DIR, `${sessionId}.jsonl`);
-    (0, import_fs4.appendFileSync)(file, JSON.stringify(record) + "\n", { mode: 384 });
+    (0, import_fs6.appendFileSync)(file, JSON.stringify(record) + "\n", { mode: 384 });
   } catch {
   }
 }
@@ -2039,23 +2457,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 +2490,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 +2759,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);
@@ -3423,6 +3853,7 @@ function memoryCommand() {
       const res = await client.memory.create({
         agentId: opts.agent,
         content: opts.content,
+        summary: String(opts.content).slice(0, 200),
         memoryType: opts.type
       });
       const memory = res?.data ?? res;
@@ -3673,7 +4104,7 @@ var CONFIG_FILE3 = (0, import_path5.join)((0, import_os4.homedir)(), ".agc", "co
 async function interactiveMenu() {
   banner();
   const cfg = loadConfig();
-  const isSetup = !!(cfg.apiKey && cfg.initiator);
+  const isSetup = !!((cfg.accessToken || cfg.apiKey || cfg.sessionToken) && (cfg.userId || cfg.initiator));
   if (!isSetup) {
     console.log(c.bold("  Welcome to Agent Commons CLI!"));
     console.log(c.dim("  Looks like this is your first time here \u2014 let's get you set up.\n"));
@@ -3683,7 +4114,7 @@ async function interactiveMenu() {
     return;
   }
   console.log(
-    `  ${c.dim("Connected to")}  ${c.primary(cfg.apiUrl)}  ${c.dim("\xB7")}  ${c.dim("Wallet")} ${c.id(cfg.initiator.slice(0, 8) + "\u2026" + cfg.initiator.slice(-4))}
+    `  ${c.dim("Connected to")}  ${c.primary(cfg.apiUrl)}  ${c.dim("\xB7")}  ${c.dim("Identity")} ${c.id((cfg.userId ?? cfg.initiator).slice(0, 8) + "\u2026" + (cfg.userId ?? cfg.initiator).slice(-4))}
 `
   );
   const action = await select("What would you like to do?", [
@@ -3801,9 +4232,13 @@ 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.1", "-v, --version").action(async () => {
   await interactiveMenu();
 });
+program.hook("preAction", async (_thisCommand, actionCommand) => {
+  if (actionCommand.name() === "login" || actionCommand.name() === "logout") return;
+  await ensureAccessToken();
+});
 program.addCommand(loginCommand());
 program.addCommand(logoutCommand());
 program.addCommand(whoamiCommand());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-commons/cli",
-  "version": "0.1.18",
+  "version": "0.2.1",
   "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.1"
   },
   "devDependencies": {
     "@types/node": "^22.10.2",