@nowcrew/daemon 0.3.0 → 0.4.2

package/dist/normalize.js

@@ -106,6 +106,9 @@ export function extractRunMeta(event) {
         meta.sessionId = e.session_id;
     if (typeof e.thread_id === "string" && e.thread_id)
         meta.sessionId = e.thread_id;
+    // claude 的 system/init 事件自报实际模型(配置可能为空/别名,以 runtime 自报为准)
+    if (typeof e.model === "string" && e.model)
+        meta.model = e.model;
     // 仅 result 事件携带本轮 usage 汇总
     if ((e.type === "result" || e.type === "turn.completed") && e.usage) {
         meta.usage = {

package/dist/runner.js

@@ -72,6 +72,9 @@ onConsole = () => { }) {
         : baseWake;
     const childEnv = {
         ...process.env,
+        // 用户自定义 env(表单 ENVIRONMENT VARIABLES):先合入,可覆盖继承的 shell 环境;
+        // 但 PATH/CREW_*/XDG_* 及下方由表单生成的值(ANTHROPIC_*/思考预算)在其后合入,始终以系统为准。
+        ...sanitizeEnvVars(cfg.envVars),
         PATH: `${ws.crewDir}${delimiter}${process.env.PATH ?? ""}`,
         CREW_SERVER_URL: config.serverUrl,
         CREW_TOKEN: cred.token,
@@ -139,6 +142,7 @@ onConsole = () => { }) {
     // 身份是本轮下发的 launchSessionId;仍兜底采 claude 自报的 session_id(理应一致)。
     let sessionId = launchSessionId;
     let usage;
+    let observedModel = currentModel;
     let finalText = null;
     let sentViaCrew = false;
     const rl = createInterface({ input: child.stdout });
@@ -151,6 +155,8 @@ onConsole = () => { }) {
             sessionId = meta.sessionId;
         if (meta.usage)
             usage = meta.usage;
+        if (meta.model)
+            observedModel = meta.model;
         for (const a of normalizeEvent(evt)) {
             if (a.kind === "sending")
                 sentViaCrew = true;
@@ -183,15 +189,21 @@ onConsole = () => { }) {
         onActivity(a);
     }
     if ((runtime === "codex" || runtime === "kimi") && exitCode === 0 && !sentViaCrew && finalText) {
+        // force:兜底回帖锚定本轮触发消息的线程,语义上必须送达;不 force 时 agent(-p 单发不跑
+        // crew read)游标落后,回帖会被 freshness hold 成 draft(202)而永远不可见。
         const sent = await sendAgentMessage(config.serverUrl, cred.token, input.channelId, {
             content: finalText,
+            force: true,
             ...(input.wakeMessageId ? { thread: input.wakeMessageId } : {}),
         });
-        if (sent.ok) {
+        if (sent.delivered) {
             const a = { kind: "sending", label: "发消息", detail: `${runtime} final answer fallback` };
             activities.push(a);
             onActivity(a);
         }
+        else if (sent.status === 202) {
+            process.stderr.write(`${runtime} fallback reply was held as draft (HTTP 202) — not visible in channel\n`);
+        }
         else {
             process.stderr.write(`${runtime} fallback send failed (HTTP ${sent.status})\n`);
         }
@@ -210,14 +222,30 @@ onConsole = () => { }) {
         process.stdout.write(`📊 tokens: in=${u.inputTokens} out=${u.outputTokens} cache_read=${u.cacheReadTokens} cache_create=${u.cacheCreationTokens}` +
             `${u.costUsd != null ? ` cost=$${u.costUsd.toFixed(4)}` : ""} ${resuming ? "(resumed)" : "(fresh)"}\n`);
     }
-    return { exitCode, activities, ...(usage ? { usage } : {}) };
+    return { exitCode, activities, model: observedModel, runtime, resumed: resuming, ...(usage ? { usage } : {}) };
 }
 function defaultPrint(a) {
     const icon = ICON[a.kind] ?? "·";
     const detail = a.detail ? `  ${a.detail.replace(/\s+/g, " ").slice(0, 120)}` : "";
     process.stdout.write(`${icon} ${a.label}${detail}\n`);
 }
-async function sendAgentMessage(serverUrl, token, channelId, body) {
+// daemon 侧兜底(server 已校验,这里防旧数据/绕过):只接受合法 key 的 string 值,CREW_ 前缀保留给系统。
+const ENV_KEY_RE = /^[A-Za-z_][A-Za-z0-9_]*$/;
+export function sanitizeEnvVars(raw) {
+    if (!raw)
+        return {};
+    const out = {};
+    for (const [k, v] of Object.entries(raw)) {
+        if (typeof v !== "string")
+            continue;
+        if (!ENV_KEY_RE.test(k) || k.toUpperCase().startsWith("CREW_"))
+            continue;
+        out[k] = v;
+    }
+    return out;
+}
+/** exported for tests */
+export async function sendAgentMessage(serverUrl, token, channelId, body) {
     const res = await fetch(`${serverUrl}/agent/channels/${encodeURIComponent(channelId)}/messages`, {
         method: "POST",
         headers: {
@@ -226,5 +254,7 @@ async function sendAgentMessage(serverUrl, token, channelId, body) {
         },
         body: JSON.stringify(body),
     });
-    return { ok: res.ok, status: res.status };
+    // 只有 201(sent)算送达;202 表示被 freshness hold 成 draft——消息没有出现在频道里,
+    // 不能当成功(把 202 当成功正是 kimi/codex fallback 回帖丢失的根因)。
+    return { delivered: res.status === 201, status: res.status };
 }

package/dist/serve.js

@@ -222,7 +222,7 @@ export function serve(config, opts = {}) {
                 const readCmd = threadId
                     ? `crew thread read`
                     : `crew message read --channel ${msg.channelId}`;
-                await runAgent(config, {
+                const result = await runAgent(config, {
                     handle: msg.agentHandle,
                     channelId: msg.channelId,
                     taskKey, // 每任务隔离 cwd + work-log(并行不冲突)
@@ -230,6 +230,28 @@ export function serve(config, opts = {}) {
                     ...(threadId ? { wakeMessageId: threadId } : {}),
                     ...(msg.wake?.content ? { wake: `你被唤醒(${msg.reason}): ${msg.wake.content}\n用 ${readCmd} 读${threadId ? "本线程" : "频道"}后按需处理。${reasonHint}${ackHint}${threadHint}${attHint}` } : {}),
                 }, reportActivity, reportConsole);
+                // 本轮 token 用量上报:runner 已从 result 事件提取(含缓存读/写细分),
+                // 连同模型/runtime 一起上送控制面落库 → 支撑每 agent / 每任务(线程)的用量监控与成本核算。
+                if (result.usage) {
+                    const u = result.usage;
+                    try {
+                        ws?.send(JSON.stringify({
+                            type: "agent:usage",
+                            agentHandle: msg.agentHandle,
+                            channelId: msg.channelId,
+                            threadId: threadId ?? null, // 线程根消息 id(= 任务锚点);null = 频道级唤醒
+                            runtime: result.runtime,
+                            model: result.model,
+                            resumed: result.resumed,
+                            inputTokens: u.inputTokens,
+                            outputTokens: u.outputTokens,
+                            cacheReadTokens: u.cacheReadTokens,
+                            cacheCreationTokens: u.cacheCreationTokens,
+                            ...(u.costUsd != null ? { costUsd: u.costUsd } : {}),
+                        }));
+                    }
+                    catch { /* ws 非 OPEN,忽略(用量非关键路径,丢一轮不阻塞) */ }
+                }
                 reportActivity({ kind: "done", label: "本轮结束" });
                 reportConsole({ stream: "result", text: "● 本轮结束" });
                 log(`✅ agent=${msg.agentHandle} 本轮完成`);

package/package.json

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