nolo-cli 0.212.0-alpha.1 → 0.222.0-alpha.2

package/{chunk-VL5KOY2C.js → chunk-MK2Q7ZJD.js}

@@ -607,7 +607,52 @@ function supportsModel(provider) {
   return provider !== "codex";
 }
 function supportsReasoningEffort(provider) {
-  return provider === "claude" || provider === "copilot" || provider === "qoder" || provider === "opencode" || provider === "grok";
+  return provider === "claude" || provider === "copilot" || provider === "qoder" || provider === "opencode" || provider === "grok" || // agy 1.5.9 支持 --effort low|medium|high|xhigh|max（无 ultra，见 mapAgyEffort）
+  provider === "agy";
+}
+function mapAgyEffort(effort) {
+  return effort === "ultra" ? "max" : effort;
+}
+function normalizeAgyUsage(raw) {
+  if (!raw || typeof raw !== "object") return void 0;
+  const u = raw;
+  const num = (value) => typeof value === "number" && Number.isFinite(value) ? value : void 0;
+  const input = num(u.input_tokens);
+  const output = num(u.output_tokens);
+  const total = num(u.total_tokens);
+  const cacheRead = num(u.cache_read_tokens);
+  if (input === void 0 && output === void 0 && total === void 0 && cacheRead === void 0) {
+    return void 0;
+  }
+  return {
+    ...input !== void 0 ? { input_tokens: input } : {},
+    ...output !== void 0 ? { output_tokens: output } : {},
+    ...total !== void 0 ? { total_tokens: total } : {},
+    ...cacheRead !== void 0 ? { cache_read_input_tokens: cacheRead } : {}
+  };
+}
+function parseAgyJsonResult(raw) {
+  let last;
+  for (const line of raw.split("\n")) {
+    const trimmed = line.trim();
+    if (!trimmed.startsWith("{")) continue;
+    let parsed;
+    try {
+      parsed = JSON.parse(trimmed);
+    } catch {
+      continue;
+    }
+    if (!parsed || typeof parsed !== "object") continue;
+    const obj = parsed;
+    const response = typeof obj.response === "string" ? obj.response : void 0;
+    const usage = normalizeAgyUsage(obj.usage);
+    if (response === void 0 && usage === void 0) continue;
+    last = {
+      ...response !== void 0 ? { response } : {},
+      ...usage ? { usage } : {}
+    };
+  }
+  return last;
 }
 function shouldPassClaudeModel(options) {
   return (options.env?.NOLO_CLAUDE_CLI_ALLOW_MODEL ?? process.env.NOLO_CLAUDE_CLI_ALLOW_MODEL) === "1";
@@ -1155,7 +1200,8 @@ function executeAgy(prompt, options) {
   const {
     timeout = DEFAULT_AGY_TIMEOUT_MS,
     cwd = process.cwd(),
-    yolo = true
+    yolo = true,
+    reasoningEffort
   } = options;
   return new Promise((resolve2, reject) => {
     const args = [
@@ -1163,10 +1209,13 @@ function executeAgy(prompt, options) {
       cwd,
       "--print",
       prompt,
+      "--output-format",
+      "json",
       "--print-timeout",
       formatCliTimeout(timeout)
     ];
     if (options.model) args.push("--model", options.model);
+    if (reasoningEffort) args.push("--effort", mapAgyEffort(reasoningEffort));
     if (yolo) {
       args.push("--dangerously-skip-permissions");
     }
@@ -1224,10 +1273,12 @@ function executeAgy(prompt, options) {
 stderr: ${stderrText}`));
         return;
       }
+      const parsed = parseAgyJsonResult(stdoutText);
       resolve2({
-        text: stdoutText.trim(),
+        text: (parsed?.response ?? stdoutText).trim(),
         raw: stdoutText,
-        elapsed: Date.now() - start
+        elapsed: Date.now() - start,
+        ...parsed?.usage ? { usage: parsed.usage } : {}
       });
     });
     proc.on("error", (err) => {
@@ -1245,6 +1296,7 @@ function executeAgyStreaming(prompt, options) {
     timeout = DEFAULT_AGY_TIMEOUT_MS,
     yolo = true,
     model,
+    reasoningEffort,
     onChunk
   } = options;
   return new Promise((resolve2, reject) => {
@@ -1258,6 +1310,7 @@ function executeAgyStreaming(prompt, options) {
       formatCliTimeout(timeout)
     ];
     if (model) args.push("--model", model);
+    if (reasoningEffort) args.push("--effort", mapAgyEffort(reasoningEffort));
     if (yolo) args.push("--dangerously-skip-permissions");
     const start = Date.now();
     const proc = spawnCliProcess("agy", args, {
@@ -1271,6 +1324,7 @@ function executeAgyStreaming(prompt, options) {
     const stderr = createUtf8Collector();
     let pending = "";
     let answer = "";
+    let agyUsage;
     let settled = false;
     let timer;
     let detachAbort = () => {
@@ -1303,6 +1357,9 @@ function executeAgyStreaming(prompt, options) {
       } catch {
         return;
       }
+      const usageSource = event?.event === "result" ? event.result?.usage : event?.event === "step_update" ? event.step_update?.usage : void 0;
+      const normalizedUsage = normalizeAgyUsage(usageSource);
+      if (normalizedUsage) agyUsage = normalizedUsage;
       if (event?.event !== "step_update" || event.step_update?.step_type !== "agent_response" || typeof event.step_update.text_delta !== "string") return;
       const delta = event.step_update.text_delta;
       if (!delta) return;
@@ -1336,7 +1393,12 @@ function executeAgyStreaming(prompt, options) {
 stderr: ${stderrText}`)));
         return;
       }
-      finish(() => resolve2({ text: answer.trim(), raw, elapsed: Date.now() - start }));
+      finish(() => resolve2({
+        text: answer.trim(),
+        raw,
+        elapsed: Date.now() - start,
+        ...agyUsage ? { usage: agyUsage } : {}
+      }));
     });
     proc.on("error", (error) => fail(error));
   });

package/{chunk-B7NJ3T4A.js → chunk-MS4NZNKI.js}

@@ -1,9 +1,6 @@
 import {
   markdownToSlate
-} from "./chunk-KSTEXKL6.js";
-import {
-  buildSkillSummaryMarker
-} from "./chunk-VF4K2QE6.js";
+} from "./chunk-FJ23FZXF.js";
 import {
   createEmptyParagraph,
   splitSlateTitleAndBody
@@ -11,28 +8,31 @@ import {
 import {
   slateToRenderMarkdown
 } from "./chunk-63W5N6P3.js";
+import {
+  buildSkillSummaryMarker
+} from "./chunk-VF4K2QE6.js";
 import {
   addContentToSpace,
   resolveCreationSpaceId
-} from "./chunk-NJR3WKVP.js";
+} from "./chunk-YWWDC3O7.js";
 import {
   runtime_default
-} from "./chunk-VZKUKCA6.js";
+} from "./chunk-MZLE5HQ3.js";
 import {
   getCurrentSpaceId
-} from "./chunk-5XBUWM6I.js";
+} from "./chunk-MBG66ZBH.js";
 import {
   write
-} from "./chunk-BFM34N54.js";
+} from "./chunk-44X52WOJ.js";
 import {
   selectIdentityUserId
 } from "./chunk-PXYBUFDB.js";
 import {
   parseSkillDocProtocol
-} from "./chunk-AETZ7AD6.js";
+} from "./chunk-W6RFEDN4.js";
 import {
   createPageKey
-} from "./chunk-JY5NGFFH.js";
+} from "./chunk-SYTHYBMI.js";
 import {
   asOptionalTrimmedString
 } from "./chunk-G3SUCT4W.js";

package/{chunk-3AKFVZ2I.js → chunk-MYHNBEXD.js}

@@ -2,13 +2,13 @@ import {
   deleteDbRecord,
   queryUserRecords,
   readDbRecord
-} from "./chunk-IF45XG7K.js";
+} from "./chunk-6WU5572L.js";
 import {
   mergeAndDedupUserData
-} from "./chunk-OXME3PEE.js";
+} from "./chunk-GBWGPTA7.js";
 import {
   isTombstoneRecord
-} from "./chunk-D2MDMY2M.js";
+} from "./chunk-BV3FLP2L.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";