@nowcrew/daemon 0.6.88-beta.19 → 0.6.88-beta.20

package/dist/runtimes/acp-probe-transport.js

@@ -0,0 +1,69 @@
+import { Readable as NodeReadable } from "node:stream";
+import { ReadableStream, WritableStream } from "node:stream/web";
+/** Probe-only counters. Never retain/log chunks, JSON-RPC params, stderr or env values. */
+export class AcpProbeTransport {
+    elapsed;
+    initializeRequestedMs;
+    initializeResponseMs;
+    firstStdinWriteMs;
+    firstStdoutMs;
+    stdinBytesWritten = 0;
+    stdoutBytes = 0;
+    stdoutEnded = false;
+    constructor(elapsed) {
+        this.elapsed = elapsed;
+    }
+    initializeRequested() { this.initializeRequestedMs = this.elapsed(); }
+    initializeResponse() { this.initializeResponseMs = this.elapsed(); }
+    fields() {
+        return {
+            initialize_requested_ms: this.initializeRequestedMs,
+            initialize_response_ms: this.initializeResponseMs,
+            first_stdin_write_ms: this.firstStdinWriteMs,
+            first_stdout_ms: this.firstStdoutMs,
+            stdin_bytes_written: this.stdinBytesWritten,
+            stdout_bytes: this.stdoutBytes,
+            stdout_ended: this.stdoutEnded,
+        };
+    }
+    /** A write callback confirms acceptance by the pipe, NOT receipt by the agent. */
+    writable(stdin) {
+        return new WritableStream({
+            start: (controller) => { stdin.once("error", (error) => controller.error(error)); },
+            write: (chunk) => new Promise((resolve, reject) => {
+                stdin.write(chunk, (error) => {
+                    if (error) {
+                        reject(error);
+                        return;
+                    }
+                    this.firstStdinWriteMs ??= this.elapsed();
+                    this.stdinBytesWritten += chunk.byteLength;
+                    resolve();
+                });
+            }),
+            close: () => new Promise((resolve, reject) => {
+                stdin.end((error) => error ? reject(error) : resolve());
+            }),
+            abort: () => { stdin.destroy(); },
+        });
+    }
+    /** Observe before NDJSON decoding, without adding a competing 'data' listener. */
+    readable(stdout) {
+        const reader = NodeReadable.toWeb(stdout).getReader();
+        return new ReadableStream({
+            pull: async (controller) => {
+                const item = await reader.read();
+                if (item.done) {
+                    this.stdoutEnded = true;
+                    controller.close();
+                    return;
+                }
+                const chunk = item.value;
+                this.firstStdoutMs ??= this.elapsed();
+                this.stdoutBytes += chunk.byteLength;
+                controller.enqueue(chunk);
+            },
+            cancel: (reason) => reader.cancel(reason),
+        });
+    }
+}

package/dist/runtimes/kimi-acp-runner.js

@@ -1,3 +1,4 @@
+import { AcpProbeTransport } from "./acp-probe-transport.js";
 import { randomUUID } from "node:crypto";
 import { dslog } from "../slog.js";
 import { once } from "node:events";
@@ -204,18 +205,27 @@ export async function probeKimiAcp(options, spawnProcess = spawn) {
     const provider = options.provider ?? "kimi";
     const permission = options.effectivePermission ?? "sandboxed";
     const probeId = options.probeId ?? randomUUID();
-    const started = Date.now();
+    const started = performance.now();
+    const elapsed = () => Math.round(performance.now() - started);
+    const transport = new AcpProbeTransport(elapsed);
+    let spawnConfirmedMs;
     let reason = "initializing", protocolVersion;
     let stderrSeen = false;
-    const fields = () => ({ probe_id: probeId, runtime: provider, duration_ms: Date.now() - started,
+    const fields = () => ({ probe_id: probeId, runtime: provider, duration_ms: elapsed(),
+        ...transport.fields(), spawn_confirmed_ms: spawnConfirmedMs, child_pid: child.pid,
         reason, protocol_version: protocolVersion, stderr_seen: stderrSeen, aborted: options.signal?.aborted ?? false });
     dslog("execution.acp_probe_started", "ACP 探测开始", { probe_id: probeId, runtime: provider, node_version: process.version });
+    const launchEnv = options.launchEnv ?? providerEnv(provider, permission);
     const child = spawnProcess(options.bin, options.launchArgs ?? providerArgs(provider, options.configPath), {
         cwd: options.launchCwd ?? process.cwd(),
-        // probe 在 daemon 自身 PATH 下运行,补上用户级 CLI 目录,与 which 探测保持一致。
-        env: { ...(options.launchEnv ?? providerEnv(provider, permission)), PATH: augmentedPath() },
+        // 显式 launchEnv 也决定 PATH/HOME;不能把它与父进程 PATH 混用。
+        env: { ...launchEnv, PATH: augmentedPath(launchEnv) },
         stdio: ["pipe", "pipe", "pipe"],
     });
+    child.once("spawn", () => {
+        spawnConfirmedMs = elapsed();
+        dslog("execution.acp_probe_spawned", "ACP 探测子进程已启动", fields());
+    });
     if (child.stdin === null || child.stdout === null || child.stderr === null)
         return false;
     child.stderr.on("data", () => { stderrSeen = true; });
@@ -228,13 +238,15 @@ export async function probeKimiAcp(options, spawnProcess = spawn) {
     let timeout;
     let onAbort;
     try {
-        const stream = ndJsonStream(Writable.toWeb(child.stdin), Readable.toWeb(child.stdout));
+        const stream = ndJsonStream(transport.writable(child.stdin), transport.readable(child.stdout));
         const connected = app.connectWith(stream, async (context) => {
+            transport.initializeRequested();
             const initialized = await context.request(methods.agent.initialize, {
                 protocolVersion: PROTOCOL_VERSION,
                 clientCapabilities: {},
                 clientInfo: { name: "nowcrew-daemon", version: "1" },
             });
+            transport.initializeResponse();
             protocolVersion = initialized.protocolVersion;
             const ready = protocolVersion === PROTOCOL_VERSION;
             if (reason === "initializing")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nowcrew/daemon",
-  "version": "0.6.88-beta.19",
+  "version": "0.6.88-beta.20",
   "type": "module",
   "description": "crew daemon — 运行在用户机器:拉起/管理 agent 进程,注入 crew CLI,归一化 runtime 事件",
   "license": "Apache-2.0",