@rdmind/rdmind 0.1.4-alpha.5 → 0.1.4-alpha.9

package/cli.js

@@ -89300,6 +89300,8 @@ var init_subagent_statistics = __esm({
       failedToolCalls = 0;
       inputTokens = 0;
       outputTokens = 0;
+      thoughtTokens = 0;
+      cachedTokens = 0;
       toolUsage = /* @__PURE__ */ new Map();
       start(now = Date.now()) {
         this.startTimeMs = now;
@@ -89328,15 +89330,17 @@ var init_subagent_statistics = __esm({
         tu.averageDurationMs = tu.count > 0 ? tu.totalDurationMs / tu.count : 0;
         this.toolUsage.set(name3, tu);
       }
-      recordTokens(input, output) {
+      recordTokens(input, output, thought = 0, cached2 = 0) {
         this.inputTokens += Math.max(0, input || 0);
         this.outputTokens += Math.max(0, output || 0);
+        this.thoughtTokens += Math.max(0, thought || 0);
+        this.cachedTokens += Math.max(0, cached2 || 0);
       }
       getSummary(now = Date.now()) {
         const totalDurationMs = this.startTimeMs ? now - this.startTimeMs : 0;
         const totalToolCalls = this.totalToolCalls;
         const successRate = totalToolCalls > 0 ? this.successfulToolCalls / totalToolCalls * 100 : 0;
-        const totalTokens = this.inputTokens + this.outputTokens;
+        const totalTokens = this.inputTokens + this.outputTokens + this.thoughtTokens + this.cachedTokens;
         const estimatedCost = this.inputTokens * 3e-5 + this.outputTokens * 6e-5;
         return {
           rounds: this.rounds,
@@ -89347,6 +89351,8 @@ var init_subagent_statistics = __esm({
           successRate,
           inputTokens: this.inputTokens,
           outputTokens: this.outputTokens,
+          thoughtTokens: this.thoughtTokens,
+          cachedTokens: this.cachedTokens,
           totalTokens,
           estimatedCost,
           toolUsage: Array.from(this.toolUsage.values())
@@ -89361,8 +89367,12 @@ var init_subagent_statistics = __esm({
           `\u23F1\uFE0F Duration: ${this.fmtDuration(stats.totalDurationMs)} | \u{1F501} Rounds: ${stats.rounds}`
         ];
         if (typeof stats.totalTokens === "number") {
+          const parts = [
+            `in ${stats.inputTokens ?? 0}`,
+            `out ${stats.outputTokens ?? 0}`
+          ];
           lines.push(
-            `\u{1F522} Tokens: ${stats.totalTokens.toLocaleString()}${stats.inputTokens || stats.outputTokens ? ` (in ${stats.inputTokens ?? 0}, out ${stats.outputTokens ?? 0})` : ""}`
+            `\u{1F522} Tokens: ${stats.totalTokens.toLocaleString()}${parts.length ? ` (${parts.join(", ")})` : ""}`
           );
         }
         return lines.join("\n");
@@ -89390,8 +89400,12 @@ var init_subagent_statistics = __esm({
           `\u{1F527} Tools: ${stats.totalToolCalls} calls, ${sr.toFixed(1)}% success (${stats.successfulToolCalls} ok, ${stats.failedToolCalls} failed)`
         );
         if (typeof stats.totalTokens === "number") {
+          const parts = [
+            `in ${stats.inputTokens ?? 0}`,
+            `out ${stats.outputTokens ?? 0}`
+          ];
           lines.push(
-            `\u{1F522} Tokens: ${stats.totalTokens.toLocaleString()} (in ${stats.inputTokens ?? 0}, out ${stats.outputTokens ?? 0})`
+            `\u{1F522} Tokens: ${stats.totalTokens.toLocaleString()} (${parts.join(", ")})`
           );
         }
         if (stats.toolUsage && stats.toolUsage.length) {
@@ -147566,6 +147580,7 @@ var init_uiTelemetry = __esm({
     init_esbuild_shims();
     init_constants();
     init_tool_call_decision();
+    init_constants();
     createInitialModelMetrics = /* @__PURE__ */ __name(() => ({
       api: {
         totalRequests: 0,
@@ -160811,7 +160826,7 @@ function createContentGeneratorConfig(config2, authType, generationConfig) {
   };
 }
 async function createContentGenerator(config2, gcConfig, isInitialAuth) {
-  const version3 = "0.1.4-alpha.5";
+  const version3 = "0.1.4-alpha.9";
   const userAgent2 = `QwenCode/${version3} (${process.platform}; ${process.arch})`;
   const baseHeaders = {
     "User-Agent": userAgent2
@@ -179328,6 +179343,7 @@ var init_subagent_events = __esm({
       SubAgentEventType2["TOOL_CALL"] = "tool_call";
       SubAgentEventType2["TOOL_RESULT"] = "tool_result";
       SubAgentEventType2["TOOL_WAITING_APPROVAL"] = "tool_waiting_approval";
+      SubAgentEventType2["USAGE_METADATA"] = "usage_metadata";
       SubAgentEventType2["FINISH"] = "finish";
       SubAgentEventType2["ERROR"] = "error";
       return SubAgentEventType2;
@@ -179579,6 +179595,7 @@ var init_subagent = __esm({
                 tools: [{ functionDeclarations: toolsList }]
               }
             };
+            const roundStreamStart = Date.now();
             const responseStream = await chat.sendMessageStream(
               this.modelConfig.model || this.runtimeContext.getModel() || DEFAULT_QWEN_MODEL,
               messageParams,
@@ -179641,16 +179658,27 @@ var init_subagent = __esm({
             if (lastUsage) {
               const inTok = Number(lastUsage.promptTokenCount || 0);
               const outTok = Number(lastUsage.candidatesTokenCount || 0);
-              if (isFinite(inTok) || isFinite(outTok)) {
+              const thoughtTok = Number(lastUsage.thoughtsTokenCount || 0);
+              const cachedTok = Number(lastUsage.cachedContentTokenCount || 0);
+              if (isFinite(inTok) || isFinite(outTok) || isFinite(thoughtTok) || isFinite(cachedTok)) {
                 this.stats.recordTokens(
                   isFinite(inTok) ? inTok : 0,
-                  isFinite(outTok) ? outTok : 0
+                  isFinite(outTok) ? outTok : 0,
+                  isFinite(thoughtTok) ? thoughtTok : 0,
+                  isFinite(cachedTok) ? cachedTok : 0
                 );
                 this.executionStats.inputTokens = (this.executionStats.inputTokens || 0) + (isFinite(inTok) ? inTok : 0);
                 this.executionStats.outputTokens = (this.executionStats.outputTokens || 0) + (isFinite(outTok) ? outTok : 0);
-                this.executionStats.totalTokens = (this.executionStats.inputTokens || 0) + (this.executionStats.outputTokens || 0);
+                this.executionStats.totalTokens = (this.executionStats.inputTokens || 0) + (this.executionStats.outputTokens || 0) + (isFinite(thoughtTok) ? thoughtTok : 0) + (isFinite(cachedTok) ? cachedTok : 0);
                 this.executionStats.estimatedCost = (this.executionStats.inputTokens || 0) * 3e-5 + (this.executionStats.outputTokens || 0) * 6e-5;
               }
+              this.eventEmitter?.emit("usage_metadata" /* USAGE_METADATA */, {
+                subagentId: this.subagentId,
+                round: turnCounter,
+                usage: lastUsage,
+                durationMs: Date.now() - roundStreamStart,
+                timestamp: Date.now()
+              });
             }
             if (functionCalls.length > 0) {
               currentMessages = await this.processFunctionCalls(
@@ -235963,8 +235991,8 @@ var init_git_commit = __esm({
   "packages/core/src/generated/git-commit.ts"() {
     "use strict";
     init_esbuild_shims();
-    GIT_COMMIT_INFO = "24f4e0cf";
-    CLI_VERSION = "0.1.4-alpha.5";
+    GIT_COMMIT_INFO = "a5a74672";
+    CLI_VERSION = "0.1.4-alpha.9";
   }
 });
 
@@ -236900,6 +236928,9 @@ __export(core_exports4, {
   DeclarativeTool: () => DeclarativeTool,
   DiscoveredMCPTool: () => DiscoveredMCPTool,
   DiscoveredTool: () => DiscoveredTool,
+  EVENT_API_ERROR: () => EVENT_API_ERROR,
+  EVENT_API_RESPONSE: () => EVENT_API_RESPONSE,
+  EVENT_TOOL_CALL: () => EVENT_TOOL_CALL,
   EditTool: () => EditTool,
   EndSessionEvent: () => EndSessionEvent,
   ExitPlanModeTool: () => ExitPlanModeTool,
@@ -334041,7 +334072,7 @@ var patchConsole = /* @__PURE__ */ __name((callback) => {
 var dist_default2 = patchConsole;
 
 // node_modules/ink/build/ink.js
-var import_constants20 = __toESM(require_constants11(), 1);
+var import_constants21 = __toESM(require_constants11(), 1);
 
 // node_modules/yoga-layout/dist/src/index.js
 init_esbuild_shims();
@@ -336104,7 +336135,7 @@ __name(wrapAnsi, "wrapAnsi");
 // node_modules/ink/build/reconciler.js
 init_esbuild_shims();
 var import_react_reconciler = __toESM(require_react_reconciler(), 1);
-var import_constants19 = __toESM(require_constants11(), 1);
+var import_constants20 = __toESM(require_constants11(), 1);
 import process15 from "node:process";
 var import_react = __toESM(require_react(), 1);
 
@@ -337075,7 +337106,7 @@ var cleanupYogaNode = /* @__PURE__ */ __name((node) => {
   node?.unsetMeasureFunc();
   node?.freeRecursive();
 }, "cleanupYogaNode");
-var currentUpdatePriority = import_constants19.NoEventPriority;
+var currentUpdatePriority = import_constants20.NoEventPriority;
 var currentRootNode;
 var reconciler_default = (0, import_react_reconciler.default)({
   getRootHostContext: /* @__PURE__ */ __name(() => ({
@@ -337232,10 +337263,10 @@ var reconciler_default = (0, import_react_reconciler.default)({
   },
   getCurrentUpdatePriority: /* @__PURE__ */ __name(() => currentUpdatePriority, "getCurrentUpdatePriority"),
   resolveUpdatePriority() {
-    if (currentUpdatePriority !== import_constants19.NoEventPriority) {
+    if (currentUpdatePriority !== import_constants20.NoEventPriority) {
       return currentUpdatePriority;
     }
-    return import_constants19.DefaultEventPriority;
+    return import_constants20.DefaultEventPriority;
   },
   maySuspendCommit() {
     return false;
@@ -339753,7 +339784,7 @@ var Ink = class {
     this.fullStaticOutput = "";
     this.container = reconciler_default.createContainer(
       this.rootNode,
-      import_constants20.LegacyRoot,
+      import_constants21.LegacyRoot,
       null,
       false,
       null,
@@ -346320,7 +346351,7 @@ __name(getPackageJson, "getPackageJson");
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "0.1.4-alpha.5";
+  return "0.1.4-alpha.9";
 }
 __name(getCliVersion, "getCliVersion");
 
@@ -352850,7 +352881,7 @@ var formatDuration = /* @__PURE__ */ __name((milliseconds) => {
 
 // packages/cli/src/generated/git-commit.ts
 init_esbuild_shims();
-var GIT_COMMIT_INFO2 = "24f4e0cf";
+var GIT_COMMIT_INFO2 = "a5a74672";
 
 // packages/cli/src/utils/systemInfo.ts
 async function getNpmVersion() {
@@ -406605,6 +406636,17 @@ var annotationsSchema = external_exports.object({
   lastModified: external_exports.string().optional().nullable(),
   priority: external_exports.number().optional().nullable()
 });
+var usageSchema = external_exports.object({
+  promptTokens: external_exports.number().optional().nullable(),
+  completionTokens: external_exports.number().optional().nullable(),
+  thoughtsTokens: external_exports.number().optional().nullable(),
+  totalTokens: external_exports.number().optional().nullable(),
+  cachedTokens: external_exports.number().optional().nullable()
+});
+var sessionUpdateMetaSchema = external_exports.object({
+  usage: usageSchema.optional().nullable(),
+  durationMs: external_exports.number().optional().nullable()
+});
 var requestPermissionResponseSchema = external_exports.object({
   outcome: requestPermissionOutcomeSchema
 });
@@ -406760,11 +406802,13 @@ var sessionUpdateSchema = external_exports.union([
   }),
   external_exports.object({
     content: contentBlockSchema,
-    sessionUpdate: external_exports.literal("agent_message_chunk")
+    sessionUpdate: external_exports.literal("agent_message_chunk"),
+    _meta: sessionUpdateMetaSchema.optional().nullable()
   }),
   external_exports.object({
     content: contentBlockSchema,
-    sessionUpdate: external_exports.literal("agent_thought_chunk")
+    sessionUpdate: external_exports.literal("agent_thought_chunk"),
+    _meta: sessionUpdateMetaSchema.optional().nullable()
   }),
   external_exports.object({
     content: external_exports.array(toolCallContentSchema).optional(),
@@ -407094,6 +407138,15 @@ var AcpFileSystemService = class {
       line: null,
       limit: null
     });
+    if (response.content.startsWith("ERROR: ENOENT:")) {
+      const match2 = /^ERROR:\s*ENOENT:\s*(?<path>.*)$/i.exec(response.content);
+      const err = new Error(response.content);
+      err.code = "ENOENT";
+      err.errno = -2;
+      const rawPath = match2?.groups?.["path"]?.trim();
+      err["path"] = rawPath ? rawPath.replace(/^['"]|['"]$/g, "") || filePath : filePath;
+      throw err;
+    }
     return response.content;
   }
   async writeTextFile(filePath, content) {
@@ -407175,6 +407228,15 @@ var MessageEmitter = class extends BaseEmitter {
       content: { type: "text", text }
     });
   }
+  /**
+   * Emits an agent thought chunk.
+   */
+  async emitAgentThought(text) {
+    await this.sendUpdate({
+      sessionUpdate: "agent_thought_chunk",
+      content: { type: "text", text }
+    });
+  }
   /**
    * Emits an agent message chunk.
    */
@@ -407185,12 +407247,21 @@ var MessageEmitter = class extends BaseEmitter {
     });
   }
   /**
-   * Emits an agent thought chunk.
+   * Emits usage metadata.
    */
-  async emitAgentThought(text) {
+  async emitUsageMetadata(usageMetadata, text = "", durationMs) {
+    const usage2 = {
+      promptTokens: usageMetadata.promptTokenCount,
+      completionTokens: usageMetadata.candidatesTokenCount,
+      thoughtsTokens: usageMetadata.thoughtsTokenCount,
+      totalTokens: usageMetadata.totalTokenCount,
+      cachedTokens: usageMetadata.cachedContentTokenCount
+    };
+    const meta = typeof durationMs === "number" ? { usage: usage2, durationMs } : { usage: usage2 };
     await this.sendUpdate({
-      sessionUpdate: "agent_thought_chunk",
-      content: { type: "text", text }
+      sessionUpdate: "agent_message_chunk",
+      content: { type: "text", text },
+      _meta: meta
     });
   }
   /**
@@ -407307,7 +407378,7 @@ var ToolCallEmitter = class extends BaseEmitter {
     await this.sendUpdate({
       sessionUpdate: "tool_call",
       toolCallId: params.callId,
-      status: "in_progress",
+      status: params.status || "pending",
       title,
       content: [],
       locations,
@@ -407474,7 +407545,10 @@ var ToolCallEmitter = class extends BaseEmitter {
       }
       if ("functionResponse" in part && part.functionResponse) {
         try {
-          const responseText = JSON.stringify(part.functionResponse.response);
+          const resp = part.functionResponse.response;
+          const outputField = resp["output"];
+          const errorField = resp["error"];
+          const responseText = typeof outputField === "string" ? outputField : typeof errorField === "string" ? errorField : JSON.stringify(resp);
           result.push({
             type: "content",
             content: { type: "text", text: responseText }
@@ -407522,6 +407596,9 @@ var HistoryReplayer = class {
         if (record2.message) {
           await this.replayContent(record2.message, "assistant");
         }
+        if (record2.usageMetadata) {
+          await this.replayUsageMetadata(record2.usageMetadata);
+        }
         break;
       case "tool_result":
         await this.replayToolResult(record2);
@@ -407546,11 +407623,19 @@ var HistoryReplayer = class {
         await this.toolCallEmitter.emitStart({
           toolName: functionName,
           callId,
-          args: part.functionCall.args
+          args: part.functionCall.args,
+          status: "in_progress"
         });
       }
     }
   }
+  /**
+   * Replays usage metadata.
+   * @param usageMetadata - The usage metadata to replay
+   */
+  async replayUsageMetadata(usageMetadata) {
+    await this.messageEmitter.emitUsageMetadata(usageMetadata);
+  }
   /**
    * Replays a tool result record.
    */
@@ -407571,6 +407656,40 @@ var HistoryReplayer = class {
       // Note: args aren't stored in tool_result records by default
       args: void 0
     });
+    const { resultDisplay } = result ?? {};
+    if (!!resultDisplay && typeof resultDisplay === "object" && "type" in resultDisplay && resultDisplay.type === "task_execution") {
+      await this.emitTaskUsageFromResultDisplay(
+        resultDisplay
+      );
+    }
+  }
+  /**
+   * Emits token usage from a TaskResultDisplay execution summary, if present.
+   */
+  async emitTaskUsageFromResultDisplay(resultDisplay) {
+    const summary = resultDisplay.executionSummary;
+    if (!summary) {
+      return;
+    }
+    const usageMetadata = {};
+    if (Number.isFinite(summary.inputTokens)) {
+      usageMetadata.promptTokenCount = summary.inputTokens;
+    }
+    if (Number.isFinite(summary.outputTokens)) {
+      usageMetadata.candidatesTokenCount = summary.outputTokens;
+    }
+    if (Number.isFinite(summary.thoughtTokens)) {
+      usageMetadata.thoughtsTokenCount = summary.thoughtTokens;
+    }
+    if (Number.isFinite(summary.cachedTokens)) {
+      usageMetadata.cachedContentTokenCount = summary.cachedTokens;
+    }
+    if (Number.isFinite(summary.totalTokens)) {
+      usageMetadata.totalTokenCount = summary.totalTokens;
+    }
+    if (Object.keys(usageMetadata).length > 0) {
+      await this.messageEmitter.emitUsageMetadata(usageMetadata);
+    }
   }
   /**
    * Extracts tool name from a chat record's function response.
@@ -407608,11 +407727,13 @@ var SubAgentTracker = class {
     this.ctx = ctx;
     this.client = client;
     this.toolCallEmitter = new ToolCallEmitter(ctx);
+    this.messageEmitter = new MessageEmitter(ctx);
   }
   static {
     __name(this, "SubAgentTracker");
   }
   toolCallEmitter;
+  messageEmitter;
   toolStates = /* @__PURE__ */ new Map();
   /**
    * Sets up event listeners for a sub-agent's tool events.
@@ -407625,14 +407746,17 @@ var SubAgentTracker = class {
     const onToolCall = this.createToolCallHandler(abortSignal);
     const onToolResult = this.createToolResultHandler(abortSignal);
     const onApproval = this.createApprovalHandler(abortSignal);
+    const onUsageMetadata = this.createUsageMetadataHandler(abortSignal);
     eventEmitter.on("tool_call" /* TOOL_CALL */, onToolCall);
     eventEmitter.on("tool_result" /* TOOL_RESULT */, onToolResult);
     eventEmitter.on("tool_waiting_approval" /* TOOL_WAITING_APPROVAL */, onApproval);
+    eventEmitter.on("usage_metadata" /* USAGE_METADATA */, onUsageMetadata);
     return [
       () => {
         eventEmitter.off("tool_call" /* TOOL_CALL */, onToolCall);
         eventEmitter.off("tool_result" /* TOOL_RESULT */, onToolResult);
         eventEmitter.off("tool_waiting_approval" /* TOOL_WAITING_APPROVAL */, onApproval);
+        eventEmitter.off("usage_metadata" /* USAGE_METADATA */, onUsageMetadata);
         this.toolStates.clear();
       }
     ];
@@ -407735,6 +407859,16 @@ var SubAgentTracker = class {
       }
     };
   }
+  /**
+   * Creates a handler for usage metadata events.
+   */
+  createUsageMetadataHandler(abortSignal) {
+    return (...args) => {
+      const event = args[0];
+      if (abortSignal.aborted) return;
+      this.messageEmitter.emitUsageMetadata(event.usage, "", event.durationMs);
+    };
+  }
   /**
    * Converts confirmation details to permission options for the client.
    */
@@ -407809,6 +407943,7 @@ var Session3 = class {
     this.toolCallEmitter = new ToolCallEmitter(this);
     this.planEmitter = new PlanEmitter(this);
     this.historyReplayer = new HistoryReplayer(this);
+    this.messageEmitter = new MessageEmitter(this);
   }
   static {
     __name(this, "Session");
@@ -407819,6 +407954,7 @@ var Session3 = class {
   historyReplayer;
   toolCallEmitter;
   planEmitter;
+  messageEmitter;
   // Implement SessionContext interface
   sessionId;
   getId() {
@@ -407885,6 +408021,8 @@ var Session3 = class {
         return { stopReason: "cancelled" };
       }
       const functionCalls = [];
+      let usageMetadata = null;
+      const streamStartTime = Date.now();
       try {
         const responseStream = await chat.sendMessageStream(
           this.config.getModel(),
@@ -407907,16 +408045,16 @@ var Session3 = class {
               if (!part.text) {
                 continue;
               }
-              const content = {
-                type: "text",
-                text: part.text
-              };
-              this.sendUpdate({
-                sessionUpdate: part.thought ? "agent_thought_chunk" : "agent_message_chunk",
-                content
-              });
+              this.messageEmitter.emitMessage(
+                part.text,
+                "assistant",
+                part.thought
+              );
             }
           }
+          if (resp.type === "chunk" /* CHUNK */ && resp.value.usageMetadata) {
+            usageMetadata = resp.value.usageMetadata;
+          }
           if (resp.type === "chunk" /* CHUNK */ && resp.value.functionCalls) {
             functionCalls.push(...resp.value.functionCalls);
           }
@@ -407930,6 +408068,14 @@ var Session3 = class {
         }
         throw error2;
       }
+      if (usageMetadata) {
+        const durationMs = Date.now() - streamStartTime;
+        await this.messageEmitter.emitUsageMetadata(
+          usageMetadata,
+          "",
+          durationMs
+        );
+      }
       if (functionCalls.length > 0) {
         const toolResponseParts = [];
         for (const fc of functionCalls) {
@@ -408068,7 +408214,7 @@ var Session3 = class {
           abortSignal
         );
       }
-      const confirmationDetails = await invocation.shouldConfirmExecute(abortSignal);
+      const confirmationDetails = this.config.getApprovalMode() !== "yolo" /* YOLO */ ? await invocation.shouldConfirmExecute(abortSignal) : false;
       if (confirmationDetails) {
         const content = [];
         if (confirmationDetails.type === "edit") {
@@ -408127,7 +408273,8 @@ var Session3 = class {
         const startParams = {
           callId,
           toolName: fc.name,
-          args
+          args,
+          status: "in_progress"
         };
         await this.toolCallEmitter.emitStart(startParams);
       }
@@ -408540,7 +408687,7 @@ var GeminiAgent = class {
       name: APPROVAL_MODE_INFO[mode].name,
       description: APPROVAL_MODE_INFO[mode].description
     }));
-    const version3 = "0.1.4-alpha.5";
+    const version3 = "0.1.4-alpha.9";
     return {
       protocolVersion: PROTOCOL_VERSION,
       agentInfo: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rdmind/rdmind",
-  "version": "0.1.4-alpha.5",
+  "version": "0.1.4-alpha.9",
   "description": "RDMind - AI-powered coding assistant",
   "type": "module",
   "main": "cli.js",
@@ -20,7 +20,7 @@
     "locales"
   ],
   "config": {
-    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.1.4-alpha.5"
+    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.1.4-alpha.9"
   },
   "publishConfig": {
     "access": "public"