@bli-cockpit/cli 0.2.35 → 0.2.37

package/dist/commands/jarvis-attachment.js

@@ -0,0 +1,82 @@
+/**
+ * Reads a local file for `cockpit jarvis --image <path>` (BLI-3414), before
+ * anything is uploaded.
+ *
+ * The dashboard's `/api/jarvis/cli` route is the ONE authority on whether an
+ * attached image is acceptable — it runs the exact same
+ * `checkAttachedImage`/`attachedImageRefusalSentence` gate the JARVIS panel
+ * uses (`apps/dashboard/src/lib/jarvis/chat-v2/attached-image.ts`), and this
+ * package cannot import from `apps/dashboard` (separate workspace, no
+ * dependency edge). So this module only catches what is cheap and purely
+ * local to check BEFORE spending a network round trip: does the path exist
+ * and is it readable, and does its extension even look like an image. Byte
+ * size and decoded-dimension refusals still come from the server and are
+ * relayed to the terminal verbatim (`readReply`/`writeFailure` in
+ * `jarvis.ts`) — this module's `ATTACHED_IMAGE_MAX_BYTES` constant is a local
+ * courtesy check to avoid uploading something the server is certain to
+ * refuse, not a second source of truth; if the two ever drift, the server's
+ * check still wins.
+ */
+import { readFile, stat } from "node:fs/promises";
+import path from "node:path";
+import { errorMessage } from "./cli-io.js";
+/** Mirrors `ATTACHED_IMAGE_MAX_BYTES` in `apps/dashboard/src/lib/jarvis/chat-v2/attached-image.ts`. */
+export const ATTACHED_IMAGE_MAX_BYTES = 10 * 1024 * 1024;
+const EXTENSION_MIME_TYPES = {
+    ".png": "image/png",
+    ".jpg": "image/jpeg",
+    ".jpeg": "image/jpeg",
+    ".webp": "image/webp",
+};
+/** The sentence the terminal prints for a refusal caught locally, before any request goes out. */
+export function attachedFileRefusalSentence(refusal, filePath) {
+    switch (refusal) {
+        case "file_not_found":
+            return `I could not find that file: ${filePath}`;
+        case "file_unreadable":
+            return `I could not read that file: ${filePath}`;
+        case "unsupported_file_type":
+            // Same wording as the panel's own refusal for this case (BLI-3170).
+            return "That is not an image I can read — attach a PNG, JPEG, or WEBP.";
+        case "file_too_big":
+            // Same wording as the panel's own refusal for this case (BLI-3170).
+            return "That image is too big to attach — keep it under 10 MB.";
+    }
+}
+/**
+ * Reads and locally screens one attached file. Never throws — every failure
+ * mode comes back as a named refusal so the caller can print a plain
+ * sentence instead of a stack trace.
+ */
+export async function readAttachedImage(filePath) {
+    const extension = path.extname(filePath).toLowerCase();
+    const mimeType = EXTENSION_MIME_TYPES[extension];
+    if (!mimeType) {
+        return { ok: false, refusal: "unsupported_file_type", detail: extension || "no_extension" };
+    }
+    let size;
+    try {
+        const info = await stat(filePath);
+        if (!info.isFile()) {
+            return { ok: false, refusal: "file_unreadable", detail: "not_a_regular_file" };
+        }
+        size = info.size;
+    }
+    catch (error) {
+        const code = error.code;
+        if (code === "ENOENT")
+            return { ok: false, refusal: "file_not_found", detail: "enoent" };
+        return { ok: false, refusal: "file_unreadable", detail: errorMessage(error) };
+    }
+    if (size > ATTACHED_IMAGE_MAX_BYTES) {
+        return { ok: false, refusal: "file_too_big", detail: `byte_size_${size}` };
+    }
+    let bytes;
+    try {
+        bytes = await readFile(filePath);
+    }
+    catch (error) {
+        return { ok: false, refusal: "file_unreadable", detail: errorMessage(error) };
+    }
+    return { ok: true, bytes, mimeType, fileName: path.basename(filePath) };
+}

package/dist/commands/jarvis.js

@@ -6,6 +6,7 @@
  * through the same JARVIS runtime used by web chat and Slack.
  */
 import { errorMessage, isInteractiveStdin, readLine, writeLine } from "./cli-io.js";
+import { attachedFileRefusalSentence, readAttachedImage, } from "./jarvis-attachment.js";
 import { getCollectorRuntimePaths, readLocalCollectorSessionFile, } from "../local-state.js";
 const TRACE_DIM = "\x1b[2m";
 const TRACE_RESET = "\x1b[0m";
@@ -54,21 +55,40 @@ async function resolveOneShotPrompt(command, io) {
 }
 async function sendOneTurn(context, prompt, io) {
     const startedAt = Date.now();
+    // BLI-3414: an attached file is read and locally screened (exists,
+    // readable, a supported extension, under the byte ceiling) BEFORE any
+    // network call — a refusal here never reaches the dashboard and is
+    // terminal, same discipline as the panel's own attached-image gate.
+    let attachment = null;
+    if (context.command.imagePath) {
+        const read = await readAttachedImage(context.command.imagePath);
+        if (!read.ok) {
+            writeAttachmentRefusal(context.command, io, read.refusal, context.command.imagePath);
+            return 1;
+        }
+        attachment = read;
+    }
     let response;
     try {
-        response = await io.fetch(`${context.dashboardUrl}/api/jarvis/cli`, {
-            method: "POST",
-            headers: {
-                authorization: `Bearer ${context.deviceToken}`,
-                "content-type": "application/json",
-            },
-            body: JSON.stringify({
-                question: prompt,
-                thread: context.command.thread,
-                subject: context.command.subject,
-                model: context.command.model,
-            }),
-        });
+        response = attachment
+            ? await io.fetch(`${context.dashboardUrl}/api/jarvis/cli`, {
+                method: "POST",
+                headers: { authorization: `Bearer ${context.deviceToken}` },
+                body: buildAttachmentForm(context.command, prompt, attachment),
+            })
+            : await io.fetch(`${context.dashboardUrl}/api/jarvis/cli`, {
+                method: "POST",
+                headers: {
+                    authorization: `Bearer ${context.deviceToken}`,
+                    "content-type": "application/json",
+                },
+                body: JSON.stringify({
+                    question: prompt,
+                    thread: context.command.thread,
+                    subject: context.command.subject,
+                    model: context.command.model,
+                }),
+            });
     }
     catch (error) {
         writeFailure(context.command, io, "gateway_unreachable", errorMessage(error));
@@ -105,9 +125,38 @@ async function sendOneTurn(context, prompt, io) {
         elapsed_ms: Date.now() - startedAt,
         thread: context.command.thread === "main" ? "default" : "named",
         subject: context.command.subject ? "selected" : "caller",
+        image_attached: attachment !== null,
+        image_byte_size: attachment?.bytes.byteLength ?? null,
     })}`);
     return 0;
 }
+/**
+ * The multipart body `/api/jarvis/cli` reads when a file is attached
+ * (BLI-3414) — same field names the request handler parses, mirroring the
+ * JSON body's fields plus one `image` file field.
+ */
+function buildAttachmentForm(command, prompt, attachment) {
+    const form = new FormData();
+    form.set("question", prompt);
+    form.set("thread", command.thread);
+    if (command.subject)
+        form.set("subject", command.subject);
+    if (command.model)
+        form.set("model", command.model);
+    form.set("image", new File([attachment.bytes], attachment.fileName, { type: attachment.mimeType }));
+    return form;
+}
+/** A refusal caught locally, before any request went out — never a stack trace. */
+function writeAttachmentRefusal(command, io, refusal, filePath) {
+    const message = attachedFileRefusalSentence(refusal, filePath);
+    if (command.json) {
+        writeLine(io.stdout, JSON.stringify({ ok: false, error: refusal, detail: message }));
+    }
+    else {
+        writeLine(io.stderr, `JARVIS could not attach that file: ${message}`);
+    }
+    writeLine(io.stderr, `[jarvis cli] attachment refused ${JSON.stringify({ reason: refusal })}`);
+}
 /**
  * One dim line per tool the turn called (BLI-3381): what it was, how long it
  * took, and — for a failure — the reason, matching what the web thinking

package/dist/commands/local-args.js

@@ -611,8 +611,18 @@ function parseAgentRulesHost(value) {
 }
 function parseJarvisArgs(args) {
     const values = parseNamedArgs(args, {
-        allowedFlags: ["--home", "--dashboard-url", "--prompt", "--as", "--thread", "--model", "--json"],
-        valueFlags: ["--home", "--dashboard-url", "--prompt", "--as", "--thread", "--model"],
+        allowedFlags: [
+            "--home",
+            "--dashboard-url",
+            "--prompt",
+            "--as",
+            "--thread",
+            "--model",
+            "--image",
+            "--file",
+            "--json",
+        ],
+        valueFlags: ["--home", "--dashboard-url", "--prompt", "--as", "--thread", "--model", "--image", "--file"],
     });
     const flaggedPrompt = optionalNonEmpty(values.flags.get("--prompt"));
     const positionalPrompt = optionalNonEmpty(values.positionals.join(" "));
@@ -623,6 +633,13 @@ function parseJarvisArgs(args) {
     if (!/^[A-Za-z0-9_-]{1,40}$/.test(thread)) {
         throw new Error("jarvis --thread must use 1 to 40 letters, numbers, underscores, or hyphens.");
     }
+    // BLI-3414: `--file` is a plain alias for `--image` — same flag, whichever
+    // word a person reaches for first.
+    const image = optionalNonEmpty(values.flags.get("--image"));
+    const file = optionalNonEmpty(values.flags.get("--file"));
+    if (image && file) {
+        throw new Error("jarvis accepts either --image or --file, not both — they are the same flag.");
+    }
     return {
         kind: "jarvis",
         homeDir: optionalNonEmpty(values.flags.get("--home")),
@@ -633,6 +650,7 @@ function parseJarvisArgs(args) {
         // BLI-3381: no client-side allowlist — the dashboard forwards this key
         // to the inference server's own allowlist and relays its refusal.
         model: optionalNonEmpty(values.flags.get("--model")),
+        imagePath: image ?? file,
         json: values.booleans.has("--json"),
     };
 }

package/dist/commands/local-help.js

@@ -46,7 +46,7 @@ export function localCommandHelp(command) {
         "  cockpit start [--ticket <id>|--clear-ticket] [--topic <label>] [--intent <intent>] [--phase <phase>] [--workspace <path>] [--branch <name>] [--max-depth <n>] [--max-repos <n>] [--json]",
         "  cockpit sync [--workspace <path>] [--dashboard-url <url>] [--max-depth <n>] [--max-repos <n>] [--json]",
         "  cockpit analyze [--workspace <path>] [--dashboard-url <url>] [--max-depth <n>] [--max-repos <n>] [--json]",
-        "  cockpit jarvis [question] [--prompt <question>] [--as <person>] [--thread <name>] [--model <key>] [--dashboard-url <url>] [--json]",
+        "  cockpit jarvis [question] [--prompt <question>] [--as <person>] [--thread <name>] [--model <key>] [--image <path>|--file <path>] [--dashboard-url <url>] [--json]",
         "  cockpit backfill (--since-days <n>|--all) [--source codex|claude] [--dry-run] [--max-files <n>] [--max-depth <n>] [--max-repos <n>] [--yes] [--workspace <path>] [--json]",
         "  cockpit status [--workspace <path>] [--max-depth <n>] [--max-repos <n>] [--json]",
         "  cockpit sessions [--source codex|claude] [--since-days <n>|--all] [--workspace <path>] [--max-depth <n>] [--max-repos <n>] [--json]",
@@ -190,11 +190,12 @@ function localSubcommandHelp(command) {
         [
             "jarvis",
             [
-                "Usage: cockpit jarvis [question] [--prompt <question>] [--as <person>] [--thread <name>] [--model <key>] [--dashboard-url <url>] [--json]",
+                "Usage: cockpit jarvis [question] [--prompt <question>] [--as <person>] [--thread <name>] [--model <key>] [--image <path>|--file <path>] [--dashboard-url <url>] [--json]",
                 "",
                 "Chats with the same JARVIS used by Tower web chat and the BLI Slack DM.",
                 "--as selects the existing website person space; it changes who the chat is about, never who is authenticated.",
                 "--model <key> requests one provider:model pair (e.g. openai:gpt-5.6-terra); an unrecognised key is refused by the dashboard, not this command.",
+                "--image <path> (alias --file) attaches one local PNG, JPEG, or WEBP under 10 MB with the question, the same one-image gate the JARVIS panel uses. A bad path, an unsupported type, or an oversized file is refused with its own plain sentence — never a stack trace.",
                 "Run with no question for an interactive terminal conversation.",
                 "Agents can pass --prompt, positional text, or pipe one question on stdin.",
                 "Each answer prints a per-tool trace line and, only on a fallback or model mismatch, one model receipt line.",

package/dist/commands/public-root.js

@@ -15,7 +15,7 @@ export async function runCockpitCli(argv, io) {
   }
 
   if (command === "--version" || command === "-V" || command === "version") {
-    writeLine(io?.stdout ?? process.stdout, "0.2.35");
+    writeLine(io?.stdout ?? process.stdout, "0.2.37");
     return 0;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bli-cockpit/cli",
-  "version": "0.2.35",
+  "version": "0.2.37",
   "private": false,
   "type": "module",
   "bin": {