@integrity-labs/agt-cli 0.10.10 → 0.10.12

package/dist/bin/agt.js

@@ -32,7 +32,7 @@ import {
   resolveChannels,
   serializeManifestForSlackCli,
   setActiveTeam
-} from "../chunk-PZG4XPJV.js";
+} from "../chunk-KZ7Y55HJ.js";
 
 // src/bin/agt.ts
 import { join as join11 } from "path";
@@ -2211,32 +2211,38 @@ import { join as join8 } from "path";
 import { homedir } from "os";
 
 // src/lib/watchdog.ts
-import { readFileSync as readFileSync2, writeFileSync as writeFileSync4, unlinkSync, existsSync as existsSync2, mkdirSync as mkdirSync4 } from "fs";
+import { readFileSync as readFileSync2, writeFileSync as writeFileSync4, unlinkSync, existsSync as existsSync2, mkdirSync as mkdirSync4, openSync, closeSync, chmodSync } from "fs";
 import { join as join7 } from "path";
-var AUGMENTED_DIR = join7(process.env["HOME"] ?? "/tmp", ".augmented");
-var PID_FILE = join7(AUGMENTED_DIR, "manager.pid");
-var STATE_FILE = join7(AUGMENTED_DIR, "manager-state.json");
-function ensureDir() {
-  if (!existsSync2(AUGMENTED_DIR)) {
-    mkdirSync4(AUGMENTED_DIR, { recursive: true });
+import { spawn as spawn2 } from "child_process";
+var DEFAULT_CONFIG_DIR = join7(process.env["HOME"] ?? "/tmp", ".augmented");
+function getManagerPaths(configDir) {
+  return {
+    pidFile: join7(configDir, "manager.pid"),
+    stateFile: join7(configDir, "manager-state.json"),
+    logFile: join7(configDir, "manager.log")
+  };
+}
+function ensureDir(configDir) {
+  if (!existsSync2(configDir)) {
+    mkdirSync4(configDir, { recursive: true });
   }
 }
-function writePidFile(pid) {
-  ensureDir();
-  writeFileSync4(PID_FILE, String(pid), { mode: 384 });
+function writePidFile(configDir, pid) {
+  ensureDir(configDir);
+  writeFileSync4(getManagerPaths(configDir).pidFile, String(pid), { mode: 384 });
 }
-function readPidFile() {
+function readPidFile(configDir) {
   try {
-    const raw = readFileSync2(PID_FILE, "utf-8").trim();
+    const raw = readFileSync2(getManagerPaths(configDir).pidFile, "utf-8").trim();
     const pid = parseInt(raw, 10);
     return isNaN(pid) ? null : pid;
   } catch {
     return null;
   }
 }
-function removePidFile() {
+function removePidFile(configDir) {
   try {
-    unlinkSync(PID_FILE);
+    unlinkSync(getManagerPaths(configDir).pidFile);
   } catch {
   }
 }
@@ -2248,49 +2254,91 @@ function isProcessAlive(pid) {
     return false;
   }
 }
-function readStateFile() {
+function readStateFile(configDir) {
   try {
-    const raw = readFileSync2(STATE_FILE, "utf-8");
+    const raw = readFileSync2(getManagerPaths(configDir).stateFile, "utf-8");
     return JSON.parse(raw);
   } catch {
     return null;
   }
 }
-function removeStateFile() {
+function removeStateFile(configDir) {
   try {
-    unlinkSync(STATE_FILE);
+    unlinkSync(getManagerPaths(configDir).stateFile);
   } catch {
   }
 }
 function startWatchdog(opts) {
-  const existingPid = readPidFile();
+  const { configDir } = opts;
+  const existingPid = readPidFile(configDir);
   if (existingPid !== null) {
     if (isProcessAlive(existingPid)) {
       throw new Error(`Manager already running (PID ${existingPid}). Use \`agt manager stop\` first.`);
     }
-    removePidFile();
-    removeStateFile();
+    removePidFile(configDir);
+    removeStateFile(configDir);
+  }
+  if (opts.detached) {
+    ensureDir(configDir);
+    const { logFile } = getManagerPaths(configDir);
+    const logFd = openSync(logFile, "a", 384);
+    try {
+      chmodSync(logFile, 384);
+    } catch {
+    }
+    const intervalSec = String(Math.max(Math.floor(opts.intervalMs / 1e3), 5));
+    const child = spawn2(
+      process.execPath,
+      [process.argv[1], "manager", "start", "--interval", intervalSec, "--config-dir", configDir],
+      {
+        detached: true,
+        stdio: ["ignore", logFd, logFd],
+        env: process.env
+      }
+    );
+    child.unref();
+    closeSync(logFd);
+    if (!child.pid) {
+      throw new Error("Failed to spawn detached manager process");
+    }
+    const { pidFile } = getManagerPaths(configDir);
+    const deadline = Date.now() + 5e3;
+    const sleepBuf = new Int32Array(new SharedArrayBuffer(4));
+    while (Date.now() < deadline) {
+      if (existsSync2(pidFile)) {
+        return { pid: child.pid };
+      }
+      if (child.exitCode !== null) {
+        throw new Error(
+          `Manager exited during startup (code ${child.exitCode}). See ${logFile} for details.`
+        );
+      }
+      Atomics.wait(sleepBuf, 0, 0, 100);
+    }
+    throw new Error(
+      `Manager did not become ready within 5s. See ${logFile} for details.`
+    );
   }
-  writePidFile(process.pid);
+  writePidFile(configDir, process.pid);
   void import("../lib/manager-worker.js").then(({ startManager }) => {
     startManager({
       intervalMs: opts.intervalMs,
-      configDir: opts.configDir
+      configDir
     });
   });
   process.on("exit", () => {
-    removePidFile();
+    removePidFile(configDir);
   });
   return { pid: process.pid };
 }
-async function stopWatchdog() {
-  const pid = readPidFile();
+async function stopWatchdog(configDir = DEFAULT_CONFIG_DIR) {
+  const pid = readPidFile(configDir);
   if (pid === null) {
     return { stopped: false };
   }
   if (!isProcessAlive(pid)) {
-    removePidFile();
-    removeStateFile();
+    removePidFile(configDir);
+    removeStateFile(configDir);
     return { stopped: true, pid };
   }
   process.kill(pid, "SIGTERM");
@@ -2298,7 +2346,7 @@ async function stopWatchdog() {
   while (Date.now() < deadline) {
     await new Promise((r) => setTimeout(r, 200));
     if (!isProcessAlive(pid)) {
-      removePidFile();
+      removePidFile(configDir);
       return { stopped: true, pid };
     }
   }
@@ -2306,19 +2354,19 @@ async function stopWatchdog() {
     process.kill(pid, "SIGKILL");
   } catch {
   }
-  removePidFile();
-  removeStateFile();
+  removePidFile(configDir);
+  removeStateFile(configDir);
   return { stopped: true, pid };
 }
-function getManagerStatus() {
-  const pid = readPidFile();
+function getManagerStatus(configDir = DEFAULT_CONFIG_DIR) {
+  const pid = readPidFile(configDir);
   if (pid === null) return null;
   if (!isProcessAlive(pid)) {
-    removePidFile();
-    removeStateFile();
+    removePidFile(configDir);
+    removeStateFile(configDir);
     return null;
   }
-  return readStateFile();
+  return readStateFile(configDir);
 }
 
 // src/commands/manager.ts
@@ -2367,10 +2415,11 @@ function managerStartCommand(opts) {
     process.exitCode = 1;
   }
 }
-async function managerStopCommand() {
+async function managerStopCommand(opts = {}) {
   const json = isJsonMode();
+  const configDir = opts.configDir ?? join8(homedir(), ".augmented");
   try {
-    const result = await stopWatchdog();
+    const result = await stopWatchdog(configDir);
     if (!result.stopped && !result.pid) {
       if (json) {
         jsonOutput({ ok: false, error: "Manager is not running" });
@@ -2394,9 +2443,10 @@ async function managerStopCommand() {
     process.exitCode = 1;
   }
 }
-function managerStatusCommand() {
+function managerStatusCommand(opts = {}) {
   const json = isJsonMode();
-  const status = getManagerStatus();
+  const configDir = opts.configDir ?? join8(homedir(), ".augmented");
+  const status = getManagerStatus(configDir);
   if (!status) {
     if (json) {
       jsonOutput({ ok: true, running: false });
@@ -2865,7 +2915,7 @@ async function kanbanRecurringDisableCommand(titleOrId, opts) {
 }
 
 // src/commands/setup.ts
-import { existsSync as existsSync4, readFileSync as readFileSync4, writeFileSync as writeFileSync5, mkdirSync as mkdirSync5 } from "fs";
+import { existsSync as existsSync4, readFileSync as readFileSync4, writeFileSync as writeFileSync5, mkdirSync as mkdirSync5, accessSync, constants as fsConstants } from "fs";
 import { join as join10, dirname } from "path";
 import { homedir as homedir2 } from "os";
 import chalk18 from "chalk";
@@ -2884,6 +2934,30 @@ function detectShellProfile() {
   if (existsSync4(bashrc)) return bashrc;
   return join10(home, ".bash_profile");
 }
+function maybeWriteEtcEnvironment(apiUrl, apiKey) {
+  if (process.platform === "win32") return false;
+  if (typeof process.getuid !== "function" || process.getuid() !== 0) return false;
+  const envPath = "/etc/environment";
+  if (!existsSync4(envPath)) return false;
+  try {
+    accessSync(envPath, fsConstants.W_OK);
+  } catch {
+    return false;
+  }
+  try {
+    const current = readFileSync4(envPath, "utf-8");
+    const stripped = current.split(/\r?\n/).filter((line) => !/^\s*(?:export\s+)?AGT_(?:HOST|API_KEY)=/.test(line)).join("\n");
+    const base = stripped.endsWith("\n") || stripped.length === 0 ? stripped : `${stripped}
+`;
+    const appended = `${base}AGT_HOST="${apiUrl}"
+AGT_API_KEY="${apiKey}"
+`;
+    writeFileSync5(envPath, appended, { mode: 420 });
+    return true;
+  } catch {
+    return false;
+  }
+}
 function buildExportLines(shell, apiUrl, apiKey) {
   if (shell.includes("fish")) {
     return [
@@ -3003,11 +3077,15 @@ async function setupCommand(token) {
   if (!json) {
     success(`Environment variables written to ${chalk18.bold(profilePath)}`);
   }
+  const envWritten = maybeWriteEtcEnvironment(finalApiUrl, setupResult.api_key);
+  if (!json && envWritten) {
+    success(`System-wide env written to ${chalk18.bold("/etc/environment")}`);
+  }
   const managerSpinner = ora13({ text: "Starting manager daemon\u2026", isSilent: json });
   managerSpinner.start();
   try {
     const configDir = join10(homedir2(), ".augmented");
-    const { pid } = startWatchdog({ intervalMs: 1e4, configDir });
+    const { pid } = startWatchdog({ intervalMs: 1e4, configDir, detached: true });
     managerSpinner.succeed(`Manager started (PID ${pid})`);
   } catch (err) {
     managerSpinner.warn("Could not start manager daemon");
@@ -3016,6 +3094,7 @@ async function setupCommand(token) {
       info("Start it manually with: agt manager start");
     }
   }
+  const includeApiKey = process.env["AGT_SETUP_INCLUDE_API_KEY"] === "1";
   if (json) {
     jsonOutput({
       ok: true,
@@ -3023,14 +3102,11 @@ async function setupCommand(token) {
       host_id: setupResult.host_id,
       team_slug: setupResult.team_slug,
       api_url: finalApiUrl,
-      // Host API key — exposed only in JSON mode so bootstrap/automation can
-      // persist it system-wide. The token the caller just supplied grants
-      // access to this key anyway; re-emitting it here just saves the caller
-      // from having to parse the shell profile we wrote.
-      api_key: setupResult.api_key,
+      ...includeApiKey ? { api_key: setupResult.api_key } : {},
       agents: setupResult.agents,
       profile: profilePath
     });
+    process.exit(0);
   } else {
     console.log();
     console.log(chalk18.green.bold("  Setup complete!"));
@@ -3340,7 +3416,7 @@ function getAcpAgent(name) {
 }
 
 // ../../packages/core/dist/acp/client.js
-import { spawn as spawn2 } from "child_process";
+import { spawn as spawn3 } from "child_process";
 function resolveAgentCommand(agentName) {
   const adapter = getAcpAgent(agentName);
   if (adapter) {
@@ -3356,7 +3432,7 @@ function resolveAgentCommand(agentName) {
 }
 async function runAcpx(args, options = {}) {
   return new Promise((resolve2) => {
-    const child = spawn2("acpx", args, {
+    const child = spawn3("acpx", args, {
       cwd: options.cwd,
       stdio: ["pipe", "pipe", "pipe"],
       env: { ...process.env }
@@ -3558,7 +3634,7 @@ async function acpxCloseCommand(agent2, _opts, cmd) {
 import { execSync } from "child_process";
 import chalk20 from "chalk";
 import ora15 from "ora";
-var cliVersion = true ? "0.10.10" : "dev";
+var cliVersion = true ? "0.10.12" : "dev";
 async function fetchLatestVersion() {
   const host2 = getHost();
   if (!host2) return null;
@@ -3957,7 +4033,7 @@ function handleError(err) {
 }
 
 // src/bin/agt.ts
-var cliVersion2 = true ? "0.10.10" : "dev";
+var cliVersion2 = true ? "0.10.12" : "dev";
 var program = new Command();
 program.name("agt").description("Augmented CLI \u2014 agent provisioning and management").version(cliVersion2).option("--json", "Emit machine-readable JSON output (suppress spinners and colors)").option("--skip-update-check", "Skip the automatic update check on startup");
 program.hook("preAction", (thisCommand) => {
@@ -4005,8 +4081,8 @@ host.command("pair <host-name>").description("Start an SSM port-forward + shell
 );
 var manager = program.command("manager").description("Host config sync daemon \u2014 keeps local agent files in sync with API");
 manager.command("start").description("Start the manager daemon (polls API for config changes and detects local drift)").option("--interval <seconds>", "Poll interval in seconds (min 5)", "10").option("--config-dir <dir>", "Config directory for agent files", join11(homedir3(), ".augmented")).action(managerStartCommand);
-manager.command("stop").description("Stop the running manager daemon").action(managerStopCommand);
-manager.command("status").description("Show the current manager daemon status and discovered agents").action(managerStatusCommand);
+manager.command("stop").description("Stop the running manager daemon").option("--config-dir <dir>", "Config directory for agent files", join11(homedir3(), ".augmented")).action(managerStopCommand);
+manager.command("status").description("Show the current manager daemon status and discovered agents").option("--config-dir <dir>", "Config directory for agent files", join11(homedir3(), ".augmented")).action(managerStatusCommand);
 var agent = program.command("agent").description("Inspect and manage agents");
 agent.command("show <code-name>").description("Display an agent's provisioned OpenClaw configuration").option("--config-dir <dir>", "Config directory", join11(homedir3(), ".augmented")).option("--all-channels", "Show all channels (including disabled)").action(agentShowCommand);
 var kanban = program.command("kanban").description("Manage agent kanban boards");