@lobehub/cli 0.0.26 → 0.0.28

package/dist/index.js

@@ -3,7 +3,7 @@ import { createRequire } from "node:module";
 import { EventEmitter, once } from "node:events";
 import { execFile, execFileSync, spawn } from "node:child_process";
 import path, { basename, extname } from "node:path";
-import fs, { createReadStream, existsSync, readFileSync, writeFileSync } from "node:fs";
+import fs, { createReadStream, createWriteStream, existsSync, readFileSync, writeFileSync } from "node:fs";
 import process$1 from "node:process";
 import crypto$1, { createHash, randomUUID } from "node:crypto";
 import os, { platform, tmpdir } from "node:os";
@@ -211922,7 +211922,12 @@ const spawnAgent = async (options) => {
 			}
 		});
 	};
-	stdout.on("data", enqueuePush);
+	stdout.on("data", (chunk) => {
+		if (options.onRawStdout) try {
+			options.onRawStdout(chunk);
+		} catch {}
+		enqueuePush(chunk);
+	});
 	stdout.on("end", enqueueFlush);
 	stdout.on("error", (err) => {
 		pipelineQueue = pipelineQueue.then(() => {
@@ -212147,7 +212152,7 @@ var SerialServerIngester = class {
 	}
 	push(event) {
 		if (this.fatalError) return;
-		if (event.type === "stream_chunk" && event.data?.chunkType === "text" && typeof event.data?.content === "string") {
+		if (event.type === "stream_chunk" && event.data?.chunkType === "text" && typeof event.data?.content === "string" && !event.data?.subagent) {
 			this.accumulatedText += event.data.content;
 			this.pendingTextEvent = event;
 			if (this.timer) clearTimeout(this.timer);
@@ -212198,6 +212203,59 @@ var SerialServerIngester = class {
 		});
 	}
 };
+/**
+* Persists the agent process's RAW stdout/stderr — the untouched stream-json,
+* BEFORE the adapter — to disk for post-hoc debugging. The adapted/ingested
+* view can't tell a CC-side empty `tool_result` apart from an adapter
+* extraction bug; the raw dump can.
+*
+* Enabled via `lh hetero exec --raw-dump <dir>`. Each exec gets its own
+* `<dir>/<timestamp>-<operationId>/` session folder; each spawn attempt (the
+* resume retry is a second attempt) writes `<label>.stdout.jsonl` /
+* `<label>.stderr.log`. Fully best-effort: any dump failure is logged and
+* swallowed so it never affects the run or its exit code.
+*
+* Future: the server-side sandbox runner (`spawnHeteroSandbox`) and the
+* desktop device path (`spawnLhHeteroExec`) can pass `--raw-dump` pointing at
+* a collectable location to capture remote runs the same way.
+*/
+var RawStreamDump = class RawStreamDump {
+	constructor(dir) {
+		this.dir = dir;
+	}
+	static async create(root, operationId, meta) {
+		try {
+			const safeTs = (/* @__PURE__ */ new Date()).toISOString().replaceAll(/[.:]/g, "-");
+			const dir = path.join(path.resolve(root), `${safeTs}-${operationId}`);
+			await mkdir(dir, { recursive: true });
+			await writeFile(path.join(dir, "meta.json"), `${JSON.stringify({
+				...meta,
+				operationId,
+				startedAt: (/* @__PURE__ */ new Date()).toISOString()
+			}, null, 2)}\n`);
+			log$7.info(`Raw stream dump enabled → ${dir}`);
+			return new RawStreamDump(dir);
+		} catch (err) {
+			log$7.warn(`Failed to initialize raw stream dump: ${err instanceof Error ? err.message : String(err)}`);
+			return;
+		}
+	}
+	openAttempt(label) {
+		const stdout = createWriteStream(path.join(this.dir, `${label}.stdout.jsonl`));
+		const stderr = createWriteStream(path.join(this.dir, `${label}.stderr.log`));
+		stdout.on("error", () => {});
+		stderr.on("error", () => {});
+		return {
+			close: () => Promise.all([new Promise((resolve) => stdout.end(() => resolve())), new Promise((resolve) => stderr.end(() => resolve()))]).then(() => void 0),
+			writeStderr: (chunk) => {
+				stderr.write(chunk);
+			},
+			writeStdout: (chunk) => {
+				stdout.write(chunk);
+			}
+		};
+	}
+};
 const exec = async (options) => {
 	if (!SUPPORTED_AGENT_TYPES.has(options.type)) {
 		log$7.error(`Unsupported --type "${options.type}". Supported: ${[...SUPPORTED_AGENT_TYPES].join(", ")}`);
@@ -212220,6 +212278,13 @@ const exec = async (options) => {
 		process.exit(2);
 	}
 	const operationId = options.operationId || randomUUID();
+	let rawDump;
+	if (options.rawDump) rawDump = await RawStreamDump.create(options.rawDump, operationId, {
+		agentType: options.type,
+		cwd: options.cwd || process.cwd(),
+		resume: options.resume ?? null,
+		topicId: options.topic ?? null
+	});
 	const emitJsonl = options.render === "jsonl" || options.render === void 0 && !serverIngest;
 	const agentType = options.type;
 	let sink;
@@ -212245,11 +212310,16 @@ const exec = async (options) => {
 	*   resumeNotFound — true when a resume-not-found error was intercepted
 	*   stderrContent  — accumulated stderr (only when interceptResumeErrors=true)
 	*/
-	const runOneAgent = async (spawnOpts, interceptResumeErrors) => {
+	const runOneAgent = async (spawnOpts, interceptResumeErrors, runLabel) => {
+		const dumpAttempt = rawDump?.openAttempt(runLabel);
 		let handle;
 		try {
-			handle = await spawnAgent(spawnOpts);
+			handle = await spawnAgent({
+				...spawnOpts,
+				onRawStdout: dumpAttempt?.writeStdout
+			});
 		} catch (err) {
+			await dumpAttempt?.close();
 			log$7.error("Failed to start agent:", err instanceof Error ? err.message : String(err));
 			process.exit(1);
 		}
@@ -212258,6 +212328,7 @@ const exec = async (options) => {
 		const stderrEnded = once(handle.stderr, "end").then(() => void 0);
 		handle.stderr.on("data", (chunk) => {
 			if (stderrContent.length < STDERR_CAP) stderrContent += chunk.toString();
+			dumpAttempt?.writeStderr(chunk);
 		});
 		handle.stderr.pipe(process.stderr);
 		let interrupted = false;
@@ -212309,6 +212380,7 @@ const exec = async (options) => {
 					result: "error"
 				});
 			} catch {}
+			await dumpAttempt?.close();
 			process.exit(1);
 		} finally {
 			process.off("SIGINT", onSigint);
@@ -212316,6 +212388,7 @@ const exec = async (options) => {
 		}
 		const { code, signal } = await handle.exit;
 		await stderrEnded;
+		await dumpAttempt?.close();
 		if (interceptResumeErrors && !resumeNotFound && code !== 0 && looksLikeNeedsRetryWithoutResume(stderrContent)) resumeNotFound = true;
 		return {
 			code,
@@ -212334,7 +212407,7 @@ const exec = async (options) => {
 		operationId,
 		prompt: resolved.prompt,
 		resumeSessionId: options.resume
-	}, interceptResume);
+	}, interceptResume, "attempt-1");
 	let result = first;
 	if (first.resumeNotFound) {
 		log$7.info("Resume failed (session not found or context overflow) — retrying without --resume");
@@ -212344,7 +212417,7 @@ const exec = async (options) => {
 			cwd: options.cwd || process.cwd(),
 			operationId,
 			prompt: resolved.prompt
-		}, false);
+		}, false, "attempt-2-noresume");
 	}
 	const { code, signal, sessionId } = result;
 	if (serverIngester && sink) {
@@ -212380,7 +212453,7 @@ const exec = async (options) => {
 	process.exit(1);
 };
 function registerHeteroCommand(program) {
-	program.command("hetero").description("Run heterogeneous agent CLIs (Claude Code / Codex) and stream their output").command("exec").description("Spawn a heterogeneous agent CLI and stream its events as JSONL on stdout. Standalone mode (no server ingest).").requiredOption("-t, --type <type>", `Agent type: ${[...SUPPORTED_AGENT_TYPES].join(" | ")}`).option("-p, --prompt [text]", "Prompt text. Pass `-` (or omit the value) to read from stdin.").option("-i, --image <path|url>", "Attach an image (repeatable). Accepts a local path, http(s) URL, or data: URL.", collectImage).option("--input-json <path>", "Read full multimodal prompt as JSON content blocks from a file. Use `-` for stdin.").option("-r, --resume <sessionId>", "Resume an existing agent session by its native id").option("-d, --cwd <path>", "Working directory for the spawned agent (default: process.cwd())").option("-c, --command <bin>", "Override the agent CLI binary name (default: `claude` or `codex`)").option("--operation-id <id>", "Operation id stamped onto every emitted event. Required in server-ingest mode (--topic). Generated as a UUID if omitted (standalone).").option("--topic <topicId>", "Server topic id. Enables server-ingest mode: events are batch-POSTed to aiAgent.heteroIngest. Requires --operation-id.").option("--render <mode>", "Output mode: jsonl (emit events as JSONL on stdout) | none (suppress stdout). Defaults to jsonl in standalone, none in server-ingest mode.").action(exec);
+	program.command("hetero").description("Run heterogeneous agent CLIs (Claude Code / Codex) and stream their output").command("exec").description("Spawn a heterogeneous agent CLI and stream its events as JSONL on stdout. Standalone mode (no server ingest).").requiredOption("-t, --type <type>", `Agent type: ${[...SUPPORTED_AGENT_TYPES].join(" | ")}`).option("-p, --prompt [text]", "Prompt text. Pass `-` (or omit the value) to read from stdin.").option("-i, --image <path|url>", "Attach an image (repeatable). Accepts a local path, http(s) URL, or data: URL.", collectImage).option("--input-json <path>", "Read full multimodal prompt as JSON content blocks from a file. Use `-` for stdin.").option("-r, --resume <sessionId>", "Resume an existing agent session by its native id").option("-d, --cwd <path>", "Working directory for the spawned agent (default: process.cwd())").option("-c, --command <bin>", "Override the agent CLI binary name (default: `claude` or `codex`)").option("--operation-id <id>", "Operation id stamped onto every emitted event. Required in server-ingest mode (--topic). Generated as a UUID if omitted (standalone).").option("--topic <topicId>", "Server topic id. Enables server-ingest mode: events are batch-POSTed to aiAgent.heteroIngest. Requires --operation-id.").option("--render <mode>", "Output mode: jsonl (emit events as JSONL on stdout) | none (suppress stdout). Defaults to jsonl in standalone, none in server-ingest mode.").option("--raw-dump <dir>", "Persist the agent process RAW stdout/stderr (pre-adapter stream-json) under <dir>/<timestamp>-<operationId>/ for debugging. Each spawn attempt writes its own .stdout.jsonl / .stderr.log. Best-effort; never affects the run.").action(exec);
 }
 
 //#endregion

package/man/man1/lh.1

@@ -1,6 +1,6 @@
 .\" Code generated by `npm run man:generate`; DO NOT EDIT.
 .\" Manual command details come from the Commander command tree.
-.TH LH 1 "" "@lobehub/cli 0.0.26" "User Commands"
+.TH LH 1 "" "@lobehub/cli 0.0.28" "User Commands"
 .SH NAME
 lh \- LobeHub CLI \- manage and connect to LobeHub services
 .SH SYNOPSIS

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/cli",
-  "version": "0.0.26",
+  "version": "0.0.28",
   "type": "module",
   "bin": {
     "lh": "./dist/index.js",
@@ -31,12 +31,12 @@
     "tsdown": "^0.21.4",
     "typescript": "^6.0.3",
     "ws": "^8.18.1",
-    "@lobechat/device-gateway-client": "1.0.0",
-    "@lobechat/heterogeneous-agents": "1.0.0",
-    "@lobechat/local-file-shell": "1.0.0",
     "@lobechat/device-identity": "1.0.0",
     "@lobechat/agent-gateway-client": "1.0.0",
-    "@lobechat/tool-runtime": "1.0.0"
+    "@lobechat/heterogeneous-agents": "1.0.0",
+    "@lobechat/tool-runtime": "1.0.0",
+    "@lobechat/local-file-shell": "1.0.0",
+    "@lobechat/device-gateway-client": "1.0.0"
   },
   "publishConfig": {
     "access": "public",