@nonbot/cli 0.9.1 → 0.9.3

package/dist/commands/daemon.js

@@ -4,6 +4,7 @@ import * as activations from '../lib/activations.js';
 import { fireActivation, makeHeadlessSpawner, } from '../lib/activations.js';
 import { checkCompletions } from '../lib/completion.js';
 import { deliverAnsweredPrompts } from '../lib/run-prompt.js';
+import { loadOrCreateMachineId, resolveMachineName } from '../lib/machine.js';
 import { emitRunStage as defaultEmitRunStage, startRunHeartbeat as defaultStartRunHeartbeat, RUN_STAGE, } from '../lib/choir/run-progress.js';
 import { groupBySession, launchCoordinatedSet, } from '../lib/choir/coordinated-set.js';
 import { applyPaneTitle } from '../lib/pane-title.js';
@@ -177,6 +178,8 @@ export async function runDaemonCommand(args = [], options = {}, deps = {}) {
     }
     const detectTmux = deps.detectTmuxSession ?? detectTmuxSession;
     const tmuxSessionName = detectTmux();
+    const machineId = deps.machineId ?? loadOrCreateMachineId();
+    const machineName = resolveMachineName();
     if (tmuxSessionName) {
         applyNonbotTmuxConfig({ spawnSync: deps.spawnSync });
     }
@@ -304,6 +307,8 @@ export async function runDaemonCommand(args = [], options = {}, deps = {}) {
                 'X-CLI-Version': VERSION,
                 'X-Terminal-Kind': terminalKind,
                 'X-Terminal-Launchable': terminalLaunchable ? 'true' : 'false',
+                'X-Machine-Id': machineId,
+                'X-Machine-Name': machineName,
             };
             if (tmuxSessionName)
                 headers['X-Tmux-Session'] = tmuxSessionName;
@@ -460,19 +465,18 @@ export async function runDaemonCommand(args = [], options = {}, deps = {}) {
                         emitSummary();
                     }
                 }
-                if (trackedPanes.size > 0) {
-                    try {
-                        await deliverAnsweredPrompts({
-                            baseUrl: auth.baseUrl,
-                            pat: auth.pat,
-                            injected: injectedPrompts,
-                            fetchImpl,
-                            spawnImpl: deps.spawnSync,
-                            log,
-                        });
-                    }
-                    catch {
-                    }
+                try {
+                    await deliverAnsweredPrompts({
+                        baseUrl: auth.baseUrl,
+                        pat: auth.pat,
+                        injected: injectedPrompts,
+                        machineId,
+                        fetchImpl,
+                        spawnImpl: deps.spawnSync,
+                        log,
+                    });
+                }
+                catch {
                 }
                 if (trackedPanes.size > 0) {
                     const reported = await checkCompletions({

package/dist/lib/machine.js

@@ -0,0 +1,51 @@
+import { homedir, hostname } from 'node:os';
+import { randomUUID } from 'node:crypto';
+import * as nodeFs from 'node:fs';
+import * as path from 'node:path';
+const NAME_MAX = 64;
+function configDir() {
+    const override = process.env.NONBOT_CONFIG_DIR;
+    if (override && override.length > 0)
+        return override;
+    return path.join(homedir(), '.config', 'nonbot');
+}
+export function machineFilePath(dir = configDir()) {
+    return path.join(dir, 'machine.json');
+}
+export function loadOrCreateMachineId(deps = {}) {
+    const fs = deps.fs ?? nodeFs;
+    const uuid = deps.uuid ?? randomUUID;
+    const dir = deps.dir ?? configDir();
+    const file = path.join(dir, 'machine.json');
+    try {
+        if (fs.existsSync(file)) {
+            const raw = JSON.parse(fs.readFileSync(file, 'utf-8'));
+            if (raw && typeof raw.machineId === 'string' && raw.machineId.length > 0) {
+                return raw.machineId;
+            }
+        }
+    }
+    catch {
+    }
+    const machineId = uuid();
+    try {
+        fs.mkdirSync(dir, { recursive: true, mode: 0o700 });
+        fs.writeFileSync(file, JSON.stringify({ machineId, createdAt: Date.now() }), { mode: 0o600 });
+    }
+    catch {
+    }
+    return machineId;
+}
+export function resolveMachineName(env = process.env) {
+    const override = env.NONBOT_MACHINE_NAME;
+    if (override && override.trim().length > 0)
+        return override.trim().slice(0, NAME_MAX);
+    try {
+        const h = hostname();
+        if (h && h.length > 0)
+            return h.slice(0, NAME_MAX);
+    }
+    catch {
+    }
+    return 'unknown';
+}

package/dist/lib/run-prompt.js

@@ -4,6 +4,9 @@ import { VERSION } from '../version.js';
 const QUESTION_MAX = 200;
 const LABEL_MAX = 80;
 const OPTIONS_MAX = 8;
+const PANE_ID_RE = /^%\d+$/;
+const ANSWERED_MAX = 16;
+const ANSWER_TEXT_MAX = 4096;
 const MENU_LINE_RE = /^\s*[>❯▸▶*•]?\s*(\d{1,2})[.)]\s+(\S.*)$/;
 const GLYPH_RE = /[│┃|╭╮╯╰─━┄┈┌┐└┘├┤>❯▸▶*•]/g;
 export function parsePromptMenu(paneText, fallbackMessage = '') {
@@ -96,20 +99,21 @@ export async function reportPrompt(args) {
 export async function pollAnsweredPrompts(args) {
     const fetchImpl = args.fetchImpl ?? fetch;
     try {
-        const res = await fetchImpl(`${args.baseUrl}/api/cli/run-prompts/answered`, {
-            headers: {
-                Authorization: `Bearer ${args.pat}`,
-                'X-Requested-With': 'ConradPM-Native',
-                'X-CLI-Version': VERSION,
-            },
-        });
+        const headers = {
+            Authorization: `Bearer ${args.pat}`,
+            'X-Requested-With': 'ConradPM-Native',
+            'X-CLI-Version': VERSION,
+        };
+        if (args.machineId)
+            headers['X-Machine-Id'] = args.machineId;
+        const res = await fetchImpl(`${args.baseUrl}/api/cli/run-prompts/answered`, { headers });
         if (!res.ok)
             return [];
         const data = (await res.json());
         if (!data || !Array.isArray(data.prompts))
             return [];
         const out = [];
-        for (const r of data.prompts) {
+        for (const r of data.prompts.slice(0, ANSWERED_MAX)) {
             if (!r || typeof r.promptId !== 'string' || typeof r.activationId !== 'string')
                 continue;
             out.push({
@@ -117,7 +121,7 @@ export async function pollAnsweredPrompts(args) {
                 activationId: r.activationId,
                 paneId: typeof r.paneId === 'string' && r.paneId.length > 0 ? r.paneId : null,
                 answerIndex: typeof r.answerIndex === 'number' ? r.answerIndex : null,
-                answerText: typeof r.answerText === 'string' ? r.answerText : null,
+                answerText: typeof r.answerText === 'string' ? r.answerText.slice(0, ANSWER_TEXT_MAX) : null,
                 answeredAt: typeof r.answeredAt === 'number' ? r.answeredAt : undefined,
             });
         }
@@ -147,13 +151,15 @@ export async function confirmDelivered(args) {
     }
 }
 export function injectAnswer(paneId, answerIndex, answerText, spawnImpl = nodeSpawnSync) {
-    const keys = answerIndex !== null && Number.isFinite(answerIndex)
+    if (!PANE_ID_RE.test(paneId))
+        return false;
+    const keys = answerIndex !== null && Number.isFinite(answerIndex) && answerIndex >= 0
         ? String(answerIndex)
         : answerText ?? '';
     if (keys.length === 0)
         return false;
     try {
-        spawnImpl('tmux', ['send-keys', '-l', '-t', paneId, keys], {
+        spawnImpl('tmux', ['send-keys', '-l', '-t', paneId, '--', keys], {
             encoding: 'utf-8',
             timeout: 2000,
             windowsHide: true,
@@ -173,6 +179,7 @@ export async function deliverAnsweredPrompts(opts) {
     const answered = await pollAnsweredPrompts({
         baseUrl: opts.baseUrl,
         pat: opts.pat,
+        machineId: opts.machineId,
         fetchImpl: opts.fetchImpl,
     });
     if (answered.length === 0)

package/dist/version.js

@@ -1 +1 @@
-export const VERSION = '0.9.1';
+export const VERSION = '0.9.3';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nonbot/cli",
-  "version": "0.9.1",
+  "version": "0.9.3",
   "type": "module",
   "description": "The local host for non.bot ▶ Run — opens a terminal on your machine and starts the work in your linked repo.",
   "license": "UNLICENSED",