duclaw-cli 1.9.14 → 1.9.15

package/dist/bundle.js

@@ -30242,7 +30242,7 @@ function printHelp() {
 `);
 }
 function printVersion() {
-  console.log(`duclaw-cli v${true ? "1.9.14" : "unknown"}`);
+  console.log(`duclaw-cli v${true ? "1.9.15" : "unknown"}`);
 }
 function getDuclawTemplate() {
   return {
@@ -41823,6 +41823,7 @@ var controlPlaneBaseUrl = () => {
   return process.env.DUCLAW_CONTROL_PLANE_BASE_URL?.replace(/\/$/, "");
 };
 var USER_IMAGE_REUPLOAD_MESSAGE = `\u8FD9\u5F20\u56FE\u7247\u6682\u65F6\u65E0\u6CD5\u6309\u56FE\u7247\u683C\u5F0F\u89E3\u6790\u3002\u8BF7\u91CD\u65B0\u53D1\u9001 JPG/PNG/WebP \u56FE\u7247\uFF0C\u6216\u8005\u5728\u624B\u673A\u4E0A\u622A\u56FE\u540E\u518D\u53D1\u4E00\u6B21\u3002`;
+var USER_IMAGE_UNDERSTAND_CREDIT_EXHAUSTED_MESSAGE = `Credit \u4F59\u989D\u4E0D\u8DB3\uFF0C\u65E0\u6CD5\u5B8C\u6210\u672C\u6B21\u56FE\u7247\u7406\u89E3\u3002\u8BF7\u5148\u5145\u503C\u6216\u4F7F\u7528\u6FC0\u6D3B\u7801\u589E\u52A0 Credit\u3002`;
 var normalizeRuntimeAttachmentUrl = (input) => {
   return input.replace("/api/mobile/attachments/", "/internal/runtime/mobile/attachments/");
 };
@@ -41958,6 +41959,15 @@ var imageUnderstand = {
       providerResponseId: response.providerResponseId,
       authStyle,
       userRequest
+    }).catch((error) => {
+      if (error instanceof ImageUnderstandMeteringError && (error.meteringStatus === "credit_exhausted" || error.statusCode === 402)) {
+        throw new UserRecoverableToolError(
+          "credit_exhausted",
+          USER_IMAGE_UNDERSTAND_CREDIT_EXHAUSTED_MESSAGE,
+          error.message
+        );
+      }
+      throw error;
     });
     return resultText;
   }
@@ -45366,12 +45376,11 @@ var createSaasCreditToolHookPlugin = () => ({
         toolCallId: ctx.toolCallId,
         requestId: ctx.userRequest?.requestId ?? null,
         occurredAt: (/* @__PURE__ */ new Date()).toISOString(),
-        ...usage,
-        metadata: {
-          platform: ctx.userRequest?.platform ?? null,
-          departmentAgentId: ctx.userRequest?.departmentAgentId ?? null,
-          input: sanitizedWebSearchInput(ctx.input)
-        }
+        meterType: usage.meterType,
+        provider: usage.provider,
+        unit: usage.unit,
+        quantity: usage.quantity,
+        metadata: usage.metadata
       })
     });
     const body = await parseJson2(response);
@@ -45379,7 +45388,7 @@ var createSaasCreditToolHookPlugin = () => ({
     if (response.status === 402 || status === "credit_exhausted") {
       throw new UserRecoverableToolError(
         "credit_exhausted",
-        "Credit \u4F59\u989D\u4E0D\u8DB3\uFF0C\u65E0\u6CD5\u5B8C\u6210\u672C\u6B21\u7F51\u9875\u641C\u7D22\u3002\u8BF7\u5148\u5145\u503C\u6216\u4F7F\u7528\u6FC0\u6D3B\u7801\u589E\u52A0 Credit\u3002",
+        usage.userMessage,
         `[saas-credit] ${ctx.toolName} credit exhausted`
       );
     }
@@ -45389,14 +45398,27 @@ var createSaasCreditToolHookPlugin = () => ({
   }
 });
 function meteredToolUsage(ctx) {
-  if (ctx.toolName !== "websearch") return null;
-  if (isWebSearchErrorResult(ctx.resultText)) return null;
-  return {
-    meterType: "web.content_retrieval",
-    provider: "exa",
-    unit: "content",
-    quantity: normalizeNumResults(ctx.input.numResults)
-  };
+  if (ctx.toolName === "websearch") {
+    if (isWebSearchErrorResult(ctx.resultText)) return null;
+    return {
+      meterType: "web.content_retrieval",
+      provider: "exa",
+      unit: "content",
+      quantity: normalizeNumResults(ctx.input.numResults),
+      userMessage: "Credit \u4F59\u989D\u4E0D\u8DB3\uFF0C\u65E0\u6CD5\u5B8C\u6210\u672C\u6B21\u7F51\u9875\u641C\u7D22\u3002\u8BF7\u5148\u5145\u503C\u6216\u4F7F\u7528\u6FC0\u6D3B\u7801\u589E\u52A0 Credit\u3002",
+      metadata: {
+        platform: ctx.userRequest?.platform ?? null,
+        departmentAgentId: ctx.userRequest?.departmentAgentId ?? null,
+        input: sanitizedWebSearchInput(ctx.input)
+      }
+    };
+  }
+  if (ctx.toolName === "image_generate") {
+    const usage = imageGenerateUsage(ctx);
+    if (!usage) return null;
+    return usage;
+  }
+  return null;
 }
 function normalizeNumResults(value) {
   if (typeof value !== "number" || !Number.isFinite(value)) return DEFAULT_WEB_SEARCH_NUM_RESULTS;
@@ -45415,6 +45437,37 @@ function sanitizedWebSearchInput(input) {
     contextMaxCharacters: typeof input.contextMaxCharacters === "number" ? input.contextMaxCharacters : null
   };
 }
+function imageGenerateUsage(ctx) {
+  const result = parseResultJson(ctx.resultText);
+  if (!result || result.ok !== true) return null;
+  const savedFiles = Array.isArray(result.savedFiles) ? result.savedFiles : [];
+  const quantity = savedFiles.length > 0 ? savedFiles.length : 1;
+  return {
+    meterType: "image.generate",
+    provider: "shanyi",
+    unit: "image",
+    quantity,
+    userMessage: "Credit \u4F59\u989D\u4E0D\u8DB3\uFF0C\u65E0\u6CD5\u751F\u6210\u56FE\u7247\u3002\u751F\u6210\u56FE\u7247\u6BCF\u5F20\u9700\u8981 20 Credit\uFF08\u7EA6 0.2 \u5143\uFF09\uFF0C\u8BF7\u5148\u5145\u503C\u6216\u4F7F\u7528\u6FC0\u6D3B\u7801\u589E\u52A0 Credit\u3002",
+    metadata: {
+      platform: ctx.userRequest?.platform ?? null,
+      departmentAgentId: ctx.userRequest?.departmentAgentId ?? null,
+      model: typeof result.model === "string" ? result.model : null,
+      size: typeof result.size === "string" ? result.size : null,
+      resolution: typeof result.resolution === "string" ? result.resolution : null,
+      requestId: typeof result.requestId === "string" ? result.requestId : null,
+      prompt: typeof ctx.input.prompt === "string" ? ctx.input.prompt.slice(0, 500) : null
+    }
+  };
+}
+function parseResultJson(value) {
+  if (!value) return null;
+  try {
+    const parsed = JSON.parse(value);
+    return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : null;
+  } catch {
+    return null;
+  }
+}
 async function parseJson2(response) {
   try {
     return await response.json();
@@ -54054,7 +54107,7 @@ var systemRoutes = new Hono2();
 var startTime = Date.now();
 systemRoutes.get("/system/info", (c) => {
   return c.json({
-    version: true ? "1.9.14" : "unknown",
+    version: true ? "1.9.15" : "unknown",
     uptime: Math.floor((Date.now() - startTime) / 1e3),
     env: process.env.NODE_ENV || "development",
     nodeVersion: process.version