@wagemule/daemon 0.1.7 → 0.1.9

package/dist/main.cjs

@@ -1837,7 +1837,11 @@ var KimiAdapter = class {
     });
     this.lines = import_node_readline4.default.createInterface({ input: this.child.stdout });
     this.lines.on("line", (line) => this.handleLine(line));
-    this.writeWire("initialize", { clientInfo: { name: "wm-daemon", version: "0.0.1" } });
+    this.writeWire("initialize", {
+      protocol_version: "1.10",
+      client: { name: "wm-daemon", version: "0.0.1" },
+      capabilities: { supports_question: false, supports_plan_mode: false }
+    });
   }
   async prompt(input) {
     const startInput = this.startInput;
@@ -1878,8 +1882,17 @@ var KimiAdapter = class {
       if (input.abortSignal?.aborted) throw new Error("Runtime aborted");
       input.abortSignal?.addEventListener("abort", abortHandler, { once: true });
       events.push({ type: "task_delivered", content: input.prompt });
-      this.writeWire("prompt", { prompt: input.prompt, sessionId: this.sessionId });
+      this.active.promptRequestId = this.writeWire("prompt", { user_input: input.prompt });
       await withTimeout(turnFinished, input.timeoutMs ?? 18e4, "Kimi wire turn timeout");
+      if (this.active.errorMessage) {
+        return {
+          status: this.active.status ?? "runtime_error",
+          finalMessage,
+          runtimeSessionId: this.sessionId,
+          events,
+          errorMessage: this.active.errorMessage
+        };
+      }
       return { status: "ok", finalMessage, runtimeSessionId: this.sessionId, events };
     } catch (error) {
       return {
@@ -1908,20 +1921,29 @@ var KimiAdapter = class {
     this.child = null;
   }
   writeWire(method, params) {
-    this.child?.stdin.write(`${JSON.stringify({ jsonrpc: "2.0", id: this.nextId++, method, params })}
+    const id = String(this.nextId++);
+    this.child?.stdin.write(`${JSON.stringify({ jsonrpc: "2.0", id, method, params })}
 `);
+    return id;
   }
   handleLine(line) {
-    const parsed = parseStreamJsonLine("kimi", line);
+    const parsed = parseKimiWireLine(line);
     if (!parsed) return;
-    if (parsed.sessionId) this.sessionId = parsed.sessionId;
     const active = this.active;
     const runInput = active?.runInput ?? (this.startInput ? { ...this.startInput, prompt: "" } : void 0);
     if (!runInput) return;
+    if (parsed.errorMessage && active && parsed.id === active.promptRequestId) {
+      active.errorMessage = parsed.errorMessage;
+      active.status = "runtime_error";
+      active.events.push({ type: "runtime_error", content: parsed.errorMessage, data: parsed.data });
+      runInput.onEvent?.({ type: "runtime_error", content: parsed.errorMessage, data: parsed.data });
+      active.finish();
+      return;
+    }
     if (active) {
       if (parsed.appendFinalMessage) active.append(parsed.appendFinalMessage);
       if (parsed.finalMessage) active.set(parsed.finalMessage);
-      if (parsed.events.some((event) => event.type === "turn_finished")) active.finish();
+      if (parsed.finished || parsed.events.some((event) => event.type === "turn_finished")) active.finish();
       for (const event of parsed.events) {
         active.events.push(event);
         runInput.onEvent?.(event);
@@ -1929,6 +1951,67 @@ var KimiAdapter = class {
     }
   }
 };
+function parseKimiWireLine(line) {
+  if (!line.trim()) return void 0;
+  let value;
+  try {
+    value = JSON.parse(line);
+  } catch {
+    return {
+      appendFinalMessage: `${line}
+`,
+      events: [{ type: "runtime_stdout", content: line }]
+    };
+  }
+  const msg = value;
+  const id = typeof msg.id === "string" ? msg.id : void 0;
+  if (msg.error && typeof msg.error === "object") {
+    const error = msg.error;
+    return {
+      id,
+      errorMessage: typeof error.message === "string" ? error.message : "Kimi wire request failed",
+      data: msg,
+      events: []
+    };
+  }
+  if (msg.result && typeof msg.result === "object") {
+    const result = msg.result;
+    const status = typeof result.status === "string" ? result.status : void 0;
+    return {
+      id,
+      finished: status === "finished" || status === "cancelled" || status === "max_steps_reached",
+      data: msg,
+      events: status ? [{ type: "turn_finished", data: { runtime: "kimi", status, result } }] : [{ type: "runtime_started", data: { runtime: "kimi", result } }]
+    };
+  }
+  if (msg.method !== "event" || !msg.params || typeof msg.params !== "object") {
+    return { id, events: [{ type: "runtime_event", data: msg }] };
+  }
+  const params = msg.params;
+  const eventType = typeof params.type === "string" ? params.type : "runtime_event";
+  const payload = params.payload && typeof params.payload === "object" ? params.payload : {};
+  const text = stringValue5(payload.text) ?? stringValue5(payload.content) ?? stringValue5(payload.message) ?? stringValue5(payload.delta?.text);
+  if ((eventType === "TextPart" || eventType === "ContentPart") && text) {
+    return {
+      appendFinalMessage: text,
+      events: [{ type: "assistant_delta", content: text, data: msg }]
+    };
+  }
+  if (eventType === "TurnEnd") {
+    return { finished: true, events: [{ type: "turn_finished", data: msg }] };
+  }
+  return {
+    events: [{ type: kimiEventName(eventType), content: text, data: msg }]
+  };
+}
+function kimiEventName(eventType) {
+  if (/tool/i.test(eventType)) return "tool_progress";
+  if (/begin|status|loading|retry|compaction|hook|notification/i.test(eventType)) return "runtime_event";
+  return eventType;
+}
+function stringValue5(value) {
+  return typeof value === "string" ? value : void 0;
+}
 function kimiAgentYaml() {
   return [
     "version: 1",
@@ -3853,21 +3936,21 @@ function renderRuntimeLine(context, line) {
 function extractTextFromRuntimeJsonLine(line) {
   try {
     const record = JSON.parse(line);
-    const direct = stringValue5(record.result ?? record.text ?? record.content);
+    const direct = stringValue6(record.result ?? record.text ?? record.content);
     if (direct) return direct;
     const message = record.message;
-    const messageText = message ? stringValue5(message.text ?? message.content) : void 0;
+    const messageText = message ? stringValue6(message.text ?? message.content) : void 0;
     if (messageText) return messageText;
     const content = Array.isArray(message?.content) ? message?.content : [];
     const parts = content.map(
-      (part) => typeof part === "object" && part ? stringValue5(part.text) : void 0
+      (part) => typeof part === "object" && part ? stringValue6(part.text) : void 0
     ).filter(Boolean);
     return parts.length > 0 ? parts.join("") : void 0;
   } catch {
     return line;
   }
 }
-function stringValue5(value) {
+function stringValue6(value) {
   return typeof value === "string" && value.length > 0 ? value : void 0;
 }
 function writeLine(context, line) {
@@ -3891,7 +3974,7 @@ var import_ws = __toESM(require("ws"));
 // package.json
 var package_default = {
   name: "@wagemule/daemon",
-  version: "0.1.7",
+  version: "0.1.9",
   private: false,
   description: "Wage Mule local daemon for connecting local agent runtimes to Workspace Server.",
   main: "./dist/main.cjs",
@@ -3987,30 +4070,7 @@ var ServerConnection = class {
     ws.on("open", () => {
       this.reconnectAttempt = 0;
       this.log(`socket open url=${redactUrl(url)}`);
-      this.send({
-        type: "ready",
-        capabilities: [
-          "agent:start",
-          "agent:stop",
-          "agent:deliver",
-          "agent:reset-workspace",
-          "agent:diagnostic",
-          "workspace:list",
-          "workspace:read",
-          "agent:skills:list",
-          "machine:runtime_models:detect",
-          "machine:workspace:scan",
-          "machine:workspace:delete",
-          "reminder-cache"
-        ],
-        runtimes: supportedRuntimeIds,
-        runningAgents: this.options.runningAgentsProvider?.() ?? [],
-        wakeableAgents: this.options.wakeableAgentsProvider?.() ?? [],
-        hostname: import_node_os6.default.hostname() || "local",
-        name: this.options.name,
-        os: `${process.platform}/${process.arch}`,
-        daemonVersion: this.options.daemonVersion ?? package_default.version
-      });
+      void this.sendReady();
     });
     ws.on("message", (raw) => {
       const msg = JSON.parse(String(raw));
@@ -4036,6 +4096,42 @@ var ServerConnection = class {
       this.scheduleReconnect();
     });
   }
+  async sendReady() {
+    this.send({
+      type: "ready",
+      capabilities: [
+        "agent:start",
+        "agent:stop",
+        "agent:deliver",
+        "agent:reset-workspace",
+        "agent:diagnostic",
+        "workspace:list",
+        "workspace:read",
+        "agent:skills:list",
+        "machine:runtime_models:detect",
+        "machine:workspace:scan",
+        "machine:workspace:delete",
+        "reminder-cache"
+      ],
+      runtimes: await this.detectAvailableRuntimes(),
+      runningAgents: this.options.runningAgentsProvider?.() ?? [],
+      wakeableAgents: this.options.wakeableAgentsProvider?.() ?? [],
+      hostname: import_node_os6.default.hostname() || "local",
+      name: this.options.name,
+      os: `${process.platform}/${process.arch}`,
+      daemonVersion: this.options.daemonVersion ?? package_default.version
+    });
+  }
+  async detectAvailableRuntimes() {
+    if (this.options.runtimesProvider) return this.options.runtimesProvider();
+    try {
+      const results = await doctorRuntimes(supportedRuntimeIds);
+      return results.filter((result) => result.detected).map((result) => result.runtime);
+    } catch (error) {
+      this.log(`runtime detection failed ${error instanceof Error ? error.message : String(error)}`);
+      return [];
+    }
+  }
   scheduleReconnect() {
     if (this.stopped || this.reconnectTimer) return;
     const delay = this.nextReconnectDelayMs();
@@ -4298,20 +4394,24 @@ ${stderr}`);
 };
 function parseKimiModelConfig(configText) {
   const ids = [];
+  const labels = /* @__PURE__ */ new Map();
   let defaultModel;
   let section;
+  let currentModelKey;
   for (const rawLine of configText.split(/\r?\n/)) {
     const line = stripYamlComment(rawLine).trim();
     if (!line) continue;
     const table = line.match(/^\[models\.([^\]]+)]$/);
     if (table) {
-      section = `models.${unquote(table[1].trim())}`;
-      pushUnique(ids, section.slice("models.".length));
+      currentModelKey = unquote(table[1].trim());
+      section = `models.${currentModelKey}`;
+      pushUnique(ids, currentModelKey);
       continue;
     }
     const anyTable = line.match(/^\[([^\]]+)]$/);
     if (anyTable) {
       section = anyTable[1]?.trim();
+      currentModelKey = void 0;
       continue;
     }
     const defaultModelLine = line.match(/^default_model\s*=\s*["']?([^"']+)["']?\s*$/);
@@ -4320,7 +4420,11 @@ function parseKimiModelConfig(configText) {
       pushUnique(ids, defaultModel);
       continue;
     }
-    if (section?.startsWith("models.")) continue;
+    if (section?.startsWith("models.")) {
+      const model2 = line.match(/^model\s*=\s*["']?([^"']+)["']?\s*$/);
+      if (model2 && currentModelKey) labels.set(currentModelKey, model2[1].trim());
+      continue;
+    }
     const model = line.match(/^model\s*=\s*["']?([^"']+)["']?\s*$/);
     if (model) {
       const value = model[1]?.trim();
@@ -4335,6 +4439,7 @@ function parseKimiModelConfig(configText) {
   }
   const models = ids.map((id) => ({
     ...defaultReasoningModel(id, id === defaultModel),
+    label: labels.get(id) ?? id,
     default: id === defaultModel ? true : void 0
   }));
   return { models: normalizeDefault(models, defaultModel), defaultModel };