@tiny-fish/cli 0.33.0 → 0.33.1-next.279

package/dist/lib/connect-runtime.js

@@ -2,7 +2,7 @@ import { randomUUID } from 'node:crypto';
 import spawn from 'cross-spawn';
 import { CONNECT_ATTEMPT_ENV, isAttemptId, resolvedApiKey, takePendingConnectAttempt, } from './auth.js';
 import { CLI_INVOCATION_ID, CLI_VERSION } from './constants.js';
-import { detectHarness, detectHumanInitiated } from './harness.js';
+import { detectHarness, detectHumanInitiated, detectRuntimeEnv } from './harness.js';
 import { errLine, sanitizeLine } from './output.js';
 import { postConnectEvent, telemetryDisabled } from './setup-telemetry.js';
 import { installSignalGuard } from './signals.js';
@@ -290,6 +290,7 @@ export function createConnectTelemetry(mcpUrl, client, opts) {
                 // "none", not absent — absent has to keep meaning "CLI too old".
                 calling_harness: detectHarness() ?? 'none',
                 cli_invocation_id: CLI_INVOCATION_ID,
+                runtime_env: detectRuntimeEnv(),
             })).catch((error) => {
                 // postConnectEvent is total, so this only fires if something inside deliver starts
                 // throwing. Same channel postConnectEvent uses for its own failures.

package/dist/lib/harness.d.ts

@@ -1,6 +1,13 @@
 type Env = Record<string, string | undefined>;
 /** Returns the detected harness name, or null when none match. */
 export declare function detectHarness(env?: Env): string | null;
+export type RuntimeEnv = 'container' | 'desktop';
+interface FsApi {
+    existsSync: (path: string) => boolean;
+    readFileSync: (path: string, encoding: 'utf8') => string;
+}
+/** Fails open to desktop: a probe error must never break telemetry. */
+export declare function detectRuntimeEnv(env?: Env, fsApi?: FsApi): RuntimeEnv;
 interface HumanInitiatedStreams {
     stdin: {
         isTTY?: boolean;

package/dist/lib/harness.js

@@ -7,6 +7,7 @@
 // Order matters: wrappers that embed another agent must precede the embedded
 // one. OpenClaw drives Claude Code via `sdk-cli`, so its env carries both
 // CLAUDECODE=1 and OPENCLAW_MCP_*; it must be checked before claude-code.
+import { existsSync, readFileSync } from 'node:fs';
 const hasVarWithPrefix = (env, prefix) => Object.keys(env).some((key) => key.startsWith(prefix));
 // A new name here must also join KNOWN_CALLING_HARNESSES in
 // frontend/app/api/cli/connect-event/route.ts, or connect telemetry buckets it as `other`.
@@ -34,6 +35,77 @@ const HARNESS_FINGERPRINTS = [
 export function detectHarness(env = process.env) {
     return HARNESS_FINGERPRINTS.find((fingerprint) => fingerprint.matches(env))?.name ?? null;
 }
+// Markers verified live (PF-3778); exact names only — substring "SANDBOX" misfires.
+const SANDBOX_ENV_VARS = [
+    // Codex cloud task container.
+    'CODEX_PROXY_CERT',
+    // ChatGPT agent-mode container; absent in some sessions, NETWORK below backstops.
+    'CAAS_ARTIFACTORY_BASE_URL',
+    'CLAUDE_CODE_REMOTE_SESSION_ID',
+    'E2B_SANDBOX',
+    'MODAL_TASK_ID',
+    'MODAL_SANDBOX_ID',
+];
+// Real humans in containerized dev clouds; still container.
+const DEV_CLOUD_ENV_VARS = [
+    'CODESPACES',
+    'GITPOD_WORKSPACE_ID',
+    'CLOUD_SHELL',
+    'REPL_ID',
+    'KUBERNETES_SERVICE_HOST',
+];
+const CONTAINER_FILES = ['/.dockerenv', '/run/.containerenv'];
+// Container-side line shape only: host mountinfo carries .../containers/<id>/mounts/shm.
+const MOUNTINFO_MARKER = /\/docker\/containers\/[0-9a-f]{64}\/(?:resolv\.conf|hostname|hosts)/;
+const CGROUP_MARKERS = /docker|containerd|kubepods|libpod|lxc/;
+// Per-read isolation: a missing mountinfo must not skip the cgroup probe.
+const safeRead = (fsApi, path) => {
+    try {
+        return fsApi.readFileSync(path, 'utf8');
+    }
+    catch {
+        return '';
+    }
+};
+// One verdict per process, like CLI_INVOCATION_ID: events must never disagree.
+let cachedRuntimeEnv;
+// CODEX_CI / CODEX_SANDBOX* / CLAUDECODE mean agent-spawned, not containerized: never here.
+/** Fails open to desktop: a probe error must never break telemetry. */
+export function detectRuntimeEnv(env, fsApi) {
+    // Injected args bypass the cache so tests stay independent.
+    if (env || fsApi) {
+        return computeRuntimeEnv(env ?? process.env, fsApi ?? { existsSync, readFileSync });
+    }
+    cachedRuntimeEnv ??= computeRuntimeEnv(process.env, { existsSync, readFileSync });
+    return cachedRuntimeEnv;
+}
+function computeRuntimeEnv(env, fsApi) {
+    // Docs guarantee it is never true locally.
+    if (env['CLAUDE_CODE_REMOTE'] === 'true')
+        return 'container';
+    // Generic name, so match the value (ChatGPT agent mode).
+    if (env['NETWORK'] === 'caas_packages_only')
+        return 'container';
+    if (SANDBOX_ENV_VARS.some((name) => env[name]))
+        return 'container';
+    if (hasVarWithPrefix(env, 'CODEX_ENV_'))
+        return 'container';
+    if (DEV_CLOUD_ENV_VARS.some((name) => env[name]))
+        return 'container';
+    try {
+        if (CONTAINER_FILES.some((file) => fsApi.existsSync(file)))
+            return 'container';
+    }
+    catch {
+        // A failed probe is not evidence of a container.
+    }
+    // Modern docker cgroup is bare 0::/; mountinfo still carries the path.
+    if (MOUNTINFO_MARKER.test(safeRead(fsApi, '/proc/self/mountinfo')))
+        return 'container';
+    if (CGROUP_MARKERS.test(safeRead(fsApi, '/proc/self/cgroup')))
+        return 'container';
+    return 'desktop';
+}
 /**
  * True only when both ends are a real terminal — a human at a prompt. Agents
  * shell out without a TTY, so this reads false for every harness above and is

package/dist/lib/setup-telemetry.js

@@ -3,7 +3,7 @@ import { z } from 'zod';
 import { validateKeyFormat } from './auth.js';
 import { BASE_URL, CLI_INVOCATION_ID, CLI_VERSION } from './constants.js';
 import { ALL_HARNESSES, AuthMode, Registered } from './harness-detect.js';
-import { detectHarness } from './harness.js';
+import { detectHarness, detectRuntimeEnv } from './harness.js';
 import { captureNotice } from './notice.js';
 import { errLine } from './output.js';
 const CONNECT_EVENT_TIMEOUT_MS = 2_000;
@@ -116,6 +116,7 @@ export async function sendSetupStarted(mcpUrl, attemptId, apiKey) {
             runtime_platform: process.platform,
             ...(stamped ? { connect_attempt_id: stamped } : {}),
             cli_invocation_id: CLI_INVOCATION_ID,
+            runtime_env: detectRuntimeEnv(),
         }),
         attempts: 1,
         label: 'setup',
@@ -145,6 +146,7 @@ export async function sendUpgradeCompleted(fromVersion, toVersion, outcome, scop
             outcome,
             scope,
             cli_invocation_id: CLI_INVOCATION_ID,
+            runtime_env: detectRuntimeEnv(),
         }),
         attempts: 1,
         label: 'upgrade',
@@ -173,6 +175,7 @@ export async function sendSetupCompleted(mcpUrl, harnesses, apiKey, mode, attemp
             event: 'setup_completed',
             ...payload,
             cli_invocation_id: CLI_INVOCATION_ID,
+            runtime_env: detectRuntimeEnv(),
         });
     }
     catch (e) {
@@ -237,6 +240,7 @@ export async function sendDoctorCompleted(mcpUrl, payload, apiKey) {
             node_version: process.version,
             calling_harness: detectHarness() ?? 'none',
             cli_invocation_id: CLI_INVOCATION_ID,
+            runtime_env: detectRuntimeEnv(),
         });
     }
     catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiny-fish/cli",
-  "version": "0.33.0",
+  "version": "0.33.1-next.279",
   "description": "TinyFish CLI — run web automations from your terminal",
   "type": "module",
   "bin": {