@songsid/agend 2.1.1-beta.11 → 2.1.1-beta.13

package/dist/cli.js

@@ -13,6 +13,8 @@ import { spawn, execSync, execFileSync } from "node:child_process";
 import { getAgendHome, getTmuxSocketName } from "./paths.js";
 import { readClassicLastActivityAt } from "./classic-channel-manager.js";
 import { hasPausedMarker } from "./pause-marker.js";
+import { PIE_PERCENT_RE } from "./tui-glyphs.js";
+import { COMPLETION_SHELLS, completionScript } from "./completion.js";
 import { getUpdateSelector, lookupTargetVersion, reportUpdateRestart, shouldSkipUpdate, } from "./update-check.js";
 /** Prefix tmux args with -L when socket isolation is active. */
 function tmuxArgs(args) {
@@ -1834,28 +1836,7 @@ async function fuzzyMatch(query, names) {
     return null;
 }
 async function resolveInstance(query, config) {
-    const names = Object.keys(config.instances);
-    // Include classic instances from classicBot.yaml
-    try {
-        const classicPath = join(DATA_DIR, "classicBot.yaml");
-        if (existsSync(classicPath)) {
-            const yamlMod = (await import("js-yaml")).default;
-            const classic = yamlMod.load(readFileSync(classicPath, "utf-8"));
-            if (classic?.channels) {
-                for (const [key, val] of Object.entries(classic.channels)) {
-                    // New format persists instanceName; old format keyed by channelId.
-                    if (val.instanceName) {
-                        names.push(val.instanceName);
-                        continue;
-                    }
-                    const channelId = val.channelId ?? key;
-                    const chName = (val.name ?? channelId).toLowerCase().replace(/[^\p{L}\d-]/gu, "-").replace(/-+/g, "-").replace(/^-|-$/g, "") || "project";
-                    names.push(`classic-${chName}-${channelId.slice(-4)}`);
-                }
-            }
-        }
-    }
-    catch { /* ignore */ }
+    const names = await listInstanceNames(config);
     const match = await fuzzyMatch(query, names);
     if (!match) {
         console.error(`No instance matching "${query}". Available: ${names.join(", ")}`);
@@ -1950,7 +1931,7 @@ function formatTimeSince(isoStr) {
  * Universal context-% parser for `agend ls` (all backends). Kept in sync with
  * parseContextPercent() in topic-commands.ts — same formats, bottom-up so the
  * most recent prompt wins:
- *   kiro classic "8% !>" / TUI "◔ 1%" / bracket "[8%]" / prompt "8% ❯"
+ *   kiro classic "8% !>" / TUI "◑ 1%" (any pie glyph) / bracket "[8%]" / prompt "8% ❯"
  *   codex "Context N% left" (remaining → 100-N) or "Context N% used"
  *   opencode "1.2K (6%)"
  *   grok "12K / 500K" (used tokens / context window)
@@ -1977,7 +1958,7 @@ const defaultParser = (output) => {
                 return used / total * 100;
         }
         const m = line.match(/(\d+)%.*[!❯>]/)
-            || line.match(/◔\s*(\d+)%/)
+            || line.match(PIE_PERCENT_RE)
             || line.match(/\[(\d+)%\]/)
             || line.match(/Context\s+(\d+)%\s+used/i)
             || line.match(/\d+(?:\.\d+)?[KM]?\s*\((\d+)%\)/);
@@ -1988,10 +1969,48 @@ const defaultParser = (output) => {
 };
 /** Optional backend-specific overrides; none needed — defaultParser covers all. */
 const contextParsers = {};
+/**
+ * Every instance name the CLI accepts: fleet.yaml instances plus the
+ * dynamically-created ClassicBot ones. Shared by `resolveInstance` (fuzzy
+ * matching for `attach`) and `ls --names-only` (shell completion), so the
+ * candidates offered by tab-completion are exactly the ones `attach` resolves.
+ */
+async function listInstanceNames(config) {
+    const names = Object.keys(config.instances);
+    try {
+        const classicPath = join(DATA_DIR, "classicBot.yaml");
+        if (existsSync(classicPath)) {
+            const yamlMod = (await import("js-yaml")).default;
+            const classic = yamlMod.load(readFileSync(classicPath, "utf-8"));
+            if (classic?.channels) {
+                for (const [key, val] of Object.entries(classic.channels)) {
+                    // New format persists instanceName; old format keyed by channelId.
+                    if (val.instanceName) {
+                        names.push(val.instanceName);
+                        continue;
+                    }
+                    const channelId = val.channelId ?? key;
+                    const chName = (val.name ?? channelId).toLowerCase().replace(/[^\p{L}\d-]/gu, "-").replace(/-+/g, "-").replace(/^-|-$/g, "") || "project";
+                    names.push(`classic-${chName}-${channelId.slice(-4)}`);
+                }
+            }
+        }
+    }
+    catch { /* ignore */ }
+    return names;
+}
 async function lsAction(opts) {
     const yaml = (await import("js-yaml")).default;
     const config = yaml.load(readFileSync(FLEET_CONFIG_PATH, "utf-8"));
     const names = Object.keys(config.instances);
+    // --names-only feeds shell completion, so it must return before any tmux or
+    // status work (a tab press should not wait on the fleet) and must print
+    // nothing but names — a "no instances" notice would become a candidate.
+    if (opts.namesOnly) {
+        for (const n of await listInstanceNames(config))
+            console.log(n);
+        return;
+    }
     // Load classic channels from classicBot.yaml (keyed by channelId)
     const classicPath = join(DATA_DIR, "classicBot.yaml");
     let classicConfig = null;
@@ -2277,12 +2296,38 @@ program
     .command("ls")
     .description("List all instances with status, backend, team, and last activity")
     .option("--json", "Output as JSON")
+    .option("--names-only", "Print instance names one per line (for shell completion)")
     .action(async (opts) => {
     await lsAction(opts);
 });
 program
-    .command("health")
-    .description("Fleet health check — shows problems and diagnostics")
+    .command("completion")
+    .description("Print a shell completion script (bash or zsh)")
+    .argument("<shell>", `Shell to generate for (${COMPLETION_SHELLS.join(", ")})`)
+    .addHelpText("after", `
+Install:
+  bash   echo 'eval "$(agend completion bash)"' >> ~/.bashrc
+  zsh    echo 'eval "$(agend completion zsh)"'  >> ~/.zshrc
+
+Then reload the shell. Tab-completes instance names for \`agend attach\` and
+\`agend fleet start|stop|restart\`, and subcommands elsewhere.`)
+    .action((shell) => {
+    if (!COMPLETION_SHELLS.includes(shell)) {
+        console.error(`Unsupported shell: ${shell}. Supported: ${COMPLETION_SHELLS.join(", ")}`);
+        process.exit(2);
+    }
+    // Subcommand names come from commander itself, so the script can't drift
+    // out of sync with the CLI the way a hardcoded list would.
+    const fleetCmd = program.commands.find(c => c.name() === "fleet");
+    console.log(completionScript(shell, {
+        topLevel: program.commands.map(c => c.name()),
+        fleetSub: fleetCmd?.commands.map(c => c.name()) ?? [],
+        instanceCommands: ["attach"],
+        fleetInstanceCommands: ["start", "stop", "restart"],
+    }));
+});
+program
+    .command("health").description("Fleet health check — shows problems and diagnostics")
     .option("--json", "Output as JSON")
     .option("-q, --quiet", "One-line summary only")
     .action(async (opts) => {