@ishlabs/cli 0.17.5 → 0.17.7

package/dist/lib/command-helpers.js

@@ -10,7 +10,7 @@ import { outputError, setVerbose, setFields, setGetField } from "./output.js";
 import { setColorsEnabled, colorsEnabled } from "./colors.js";
 import { loadConfig } from "../config.js";
 import { resolveId } from "./alias-store.js";
-import { exitWithFlush } from "./observability.js";
+import { exitWithFlush, withCliSpan } from "./observability.js";
 function isSimulatable(p) {
     return Boolean(p.simulation_config_id) || Boolean(p.simulation_config);
 }
@@ -406,16 +406,32 @@ function applyGlobals(globals) {
     setColorsEnabled(globals.color);
     _activeWorkspace = globals.workspace;
 }
+/**
+ * Build the dotted command path (`workspace.list` rather than just `list`)
+ * for the root-span name. Mirrors the walk in the program's `preAction`
+ * baggage hook so span names line up with `client.surface` on the backend.
+ */
+function commandPath(cmd) {
+    const parts = [];
+    let c = cmd;
+    while (c && c.parent) {
+        parts.unshift(c.name());
+        c = c.parent;
+    }
+    return parts.join(".") || cmd.name();
+}
 export async function withClient(cmd, fn) {
     const globals = getGlobals(cmd);
-    try {
-        const client = await createClient(globals);
-        await fn(client, globals);
-    }
-    catch (err) {
-        outputError(err, globals.json);
-        await exitWithFlush(exitCodeFromError(err));
-    }
+    await withCliSpan(commandPath(cmd), async () => {
+        try {
+            const client = await createClient(globals);
+            await fn(client, globals);
+        }
+        catch (err) {
+            outputError(err, globals.json);
+            await exitWithFlush(exitCodeFromError(err));
+        }
+    });
 }
 /**
  * Wrap an inline (non-API) command action with the same uniform error
@@ -424,13 +440,15 @@ export async function withClient(cmd, fn) {
  */
 export async function runInline(cmd, fn) {
     const globals = getGlobals(cmd);
-    try {
-        await fn(globals);
-    }
-    catch (err) {
-        outputError(err, globals.json);
-        await exitWithFlush(exitCodeFromError(err));
-    }
+    await withCliSpan(commandPath(cmd), async () => {
+        try {
+            await fn(globals);
+        }
+        catch (err) {
+            outputError(err, globals.json);
+            await exitWithFlush(exitCodeFromError(err));
+        }
+    });
 }
 export function getWebUrl(globals, path) {
     const base = globals.dev ? "http://localhost:3000" : getAppUrl();

package/dist/lib/observability.d.ts

@@ -43,6 +43,17 @@ export declare function initObservability(): Promise<void>;
  * CLI.
  */
 export declare function flushObservability(timeoutMs?: number): Promise<void>;
+/**
+ * Open a root transaction for a CLI command. `@sentry/node` only auto-creates
+ * transactions for HTTP server frameworks; arbitrary code paths need an
+ * explicit `startSpan` to anchor child spans (the UndiciInstrumentation
+ * fetch spans) so the exporter ships them. Without this wrap, every CLI
+ * run produces zero spans in the ish-cli Sentry project.
+ *
+ * No-op (passthrough) when Sentry isn't initialised — DSN unset or init
+ * failed — so the helper is always safe to call from withClient / runInline.
+ */
+export declare function withCliSpan<T>(commandName: string, fn: () => Promise<T>): Promise<T>;
 /**
  * Async-flush-then-exit helper. Use this in place of `process.exit(code)`
  * anywhere we want telemetry to ship before teardown.

package/dist/lib/observability.js

@@ -24,9 +24,6 @@
  */
 import pkg from "../../package.json" with { type: "json" };
 import { beforeSend } from "./sentry-scrub.js";
-/** Module-local reference to the loaded Sentry module so `flushObservability`
- * can call `flush()` without re-importing (which would lose runtime-pinned
- * state and create a second Hub in some bundler configurations). */
 let _sentryModule = null;
 /** Bun-global probe. ``typeof Bun !== 'undefined'`` is the only reliable
  * runtime-detect: ``process.versions.bun`` exists but is set up well after
@@ -76,6 +73,15 @@ export async function initObservability() {
             setTag("client.name", "ish-cli");
             setTag("client.version", pkg.version);
         }
+        // Natural-exit flush hook. `process.exit()` paths are covered by
+        // `exitWithFlush`, but successful CLI commands return normally —
+        // Node tears the process down via `beforeExit` and there's no
+        // process.exit to wrap. This is the catch-all for that case.
+        // Use `once` so a command that explicitly calls exit doesn't
+        // double-flush.
+        process.once("beforeExit", () => {
+            void flushObservability();
+        });
     }
     catch (err) {
         // Don't crash the CLI on init failure. Print to stderr at verbose
@@ -151,6 +157,22 @@ export async function flushObservability(timeoutMs = 2000) {
         // Swallow — same rationale as init failure.
     }
 }
+/**
+ * Open a root transaction for a CLI command. `@sentry/node` only auto-creates
+ * transactions for HTTP server frameworks; arbitrary code paths need an
+ * explicit `startSpan` to anchor child spans (the UndiciInstrumentation
+ * fetch spans) so the exporter ships them. Without this wrap, every CLI
+ * run produces zero spans in the ish-cli Sentry project.
+ *
+ * No-op (passthrough) when Sentry isn't initialised — DSN unset or init
+ * failed — so the helper is always safe to call from withClient / runInline.
+ */
+export async function withCliSpan(commandName, fn) {
+    if (!_initialized || _sentryModule?.startSpan === undefined) {
+        return await fn();
+    }
+    return await _sentryModule.startSpan({ name: `cli.${commandName}`, op: "cli.command" }, async () => await fn());
+}
 /**
  * Async-flush-then-exit helper. Use this in place of `process.exit(code)`
  * anywhere we want telemetry to ship before teardown.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ishlabs/cli",
-  "version": "0.17.5",
+  "version": "0.17.7",
   "description": "The command-line interface for ish",
   "type": "module",
   "bin": {