staklink 0.4.21 → 0.4.23

package/dist/proxy-server.cjs

@@ -60927,7 +60927,7 @@ var SSEManager = class {
 var sseManager = new SSEManager();
 
 // src/proxy/version.ts
-var VERSION = "0.4.21";
+var VERSION = "0.4.23";
 
 // node_modules/uuid/dist/esm/stringify.js
 var byteToHex = [];
@@ -137648,6 +137648,27 @@ function goose_env(apiKey, model = "sonnet") {
     PATH: `${path7.join(os.homedir(), ".local", "bin")}:${process.env.PATH}`
   };
 }
+async function extractSessionUsage(session) {
+  try {
+    const safeName = session.replaceAll(" ", "_");
+    const res = await executeCommand(
+      `goose session export --name ${safeName} --format json`,
+      process.cwd(),
+      {}
+    );
+    const data = JSON.parse(res.stdout);
+    if (typeof data.input_tokens === "number" && typeof data.output_tokens === "number") {
+      return {
+        inputTokens: data.input_tokens,
+        outputTokens: data.output_tokens,
+        totalTokens: data.total_tokens ?? data.input_tokens + data.output_tokens
+      };
+    }
+    return void 0;
+  } catch {
+    return void 0;
+  }
+}
 async function runAgent({
   prompt,
   apiKey,
@@ -137662,7 +137683,7 @@ async function runAgent({
 }) {
   createGooseConfig(searchApiKey, mcpServers);
   const env2 = goose_env(apiKey, model);
-  console.log("RUN goose with env", env2);
+  log("RUN goose with env", env2);
   const safePrompt = prompt.startsWith("-") ? `
 ${prompt}` : prompt;
   const cleanPrompt = sanitizeShellArg(safePrompt);
@@ -137670,7 +137691,7 @@ ${prompt}` : prompt;
   system += system_prompt ? sanitizeShellArg(system_prompt) + "\n\n" : "";
   system += SYSTEM_SUFFIX;
   system = sanitizeShellArg(system);
-  console.log("Using Goose CLI", cleanPrompt, system);
+  log("Using Goose CLI", cleanPrompt, system);
   let cmd = `goose run --with-builtin developer -t "${cleanPrompt}" --system "${system}"`;
   if (session) {
     session = sanitizeShellArg(session);
@@ -137682,24 +137703,38 @@ ${prompt}` : prompt;
     } catch {
     }
   }
-  let res = await executeCommand(cmd, cwd, env2, (l) => console.log(l));
+  let res = await executeCommand(cmd, cwd, env2, (l) => log(l));
   if (session && isStreamDecodeError(res.stdout)) {
     const maxRetries = 2;
     for (let attempt = 1; attempt <= maxRetries; attempt++) {
-      console.log(`Stream decode error detected, retrying (${attempt}/${maxRetries})...`);
+      log(`Stream decode error detected, retrying (${attempt}/${maxRetries})...`);
       await new Promise((r) => setTimeout(r, 2e3 * attempt));
       const retryCmd = `goose run --with-builtin developer -t "continue" --system "${system}" --name ${session} --resume`;
-      res = await executeCommand(retryCmd, cwd, env2, (l) => console.log(l));
+      res = await executeCommand(retryCmd, cwd, env2, (l) => log(l));
       if (!isStreamDecodeError(res.stdout)) break;
     }
   }
   const output = res.stdout;
+  const resolvedModel = getGooseModel(model || "sonnet");
+  const provider = resolvedModel.includes("/") ? resolvedModel.split("/")[0] : "unknown";
+  const usage = session ? await extractSessionUsage(session) : void 0;
   if (summarize && session) {
     const sessionData = exportSession(session, "assistant");
     const summary = await summarizeSession(sessionData, summaryApiKey || apiKey);
-    return { output, summary };
+    return {
+      output,
+      summary,
+      model: resolvedModel,
+      provider,
+      ...usage && { usage }
+    };
   }
-  return output;
+  return {
+    output,
+    model: resolvedModel,
+    provider,
+    ...usage && { usage }
+  };
 }
 function createGooseConfig(exaApiKey, mcpServers) {
   const configDir = path7.join(os.homedir(), ".config", "goose");
@@ -137753,9 +137788,9 @@ function createGooseConfig(exaApiKey, mcpServers) {
       fs8.mkdirSync(configDir, { recursive: true });
     }
     fs8.writeFileSync(configPath, configContent, "utf-8");
-    console.log(`Created goose config at ${configPath}`);
+    log(`Created goose config at ${configPath}`);
   } catch (error88) {
-    console.warn("Error creating goose config:", error88);
+    warn("Error creating goose config:", error88);
   }
 }
 async function runGooseWeb(apiKey, cwd, port) {
@@ -137778,7 +137813,7 @@ async function runGooseWeb(apiKey, cwd, port) {
       env: env2
     });
   } catch (error88) {
-    console.error("Error occurred while starting Goose:", error88);
+    error("Error occurred while starting Goose:", error88);
   }
 }
 
@@ -137798,7 +137833,7 @@ async function runAgent2({
   if (!prompt) {
     throw new Error("Missing prompt");
   }
-  console.log("runAgent called with:", {
+  log("runAgent called with:", {
     prompt,
     apiKey: apiKey ? "***" : "undefined",
     cwd
@@ -137817,9 +137852,20 @@ async function runAgent2({
       cwd,
       executablePath: findClaudePath()
     });
-    return res.text;
+    return {
+      output: res.text,
+      model: "claude_code",
+      provider: "anthropic",
+      ...res.usage && {
+        usage: {
+          inputTokens: res.usage.inputTokens,
+          outputTokens: res.usage.outputTokens,
+          totalTokens: res.usage.totalTokens
+        }
+      }
+    };
   } catch (error88) {
-    console.log("Model error:", error88);
+    log("Model error:", error88);
     throw error88;
   }
 }
@@ -137829,7 +137875,7 @@ function findClaudePath() {
     if (!claudePath) {
       throw new Error("Claude CLI not found in PATH");
     }
-    console.log("Found Claude CLI at:", claudePath);
+    log("Found Claude CLI at:", claudePath);
     return claudePath;
   } catch (error88) {
     throw new Error(`Could not find Claude CLI: ${error88}`);
@@ -139311,7 +139357,7 @@ async function runAgent3({
   let system = SYSTEM_CORE;
   system += system_prompt ? system_prompt + "\n\n" : "";
   system += SYSTEM_SUFFIX;
-  console.log("Codex agent using API key:", apiKey ? `${apiKey.substring(0, 8)}...` : "MISSING");
+  log("Codex agent using API key:", apiKey ? `${apiKey.substring(0, 8)}...` : "MISSING");
   if (apiKey) {
     writeCodexAuth(apiKey);
   }
@@ -139324,15 +139370,20 @@ async function runAgent3({
     };
   }
   const model = codexCli(MODEL, settings);
-  const { text: text3 } = await generateText({
+  const { text: text3, usage } = await generateText({
     model,
     prompt,
     system
   });
+  const agentUsage = {
+    inputTokens: usage.inputTokens ?? 0,
+    outputTokens: usage.outputTokens ?? 0,
+    totalTokens: usage.totalTokens ?? 0
+  };
   if (summarize) {
-    return text3;
+    return { output: text3, model: MODEL, provider: "openai", usage: agentUsage };
   }
-  return text3;
+  return { output: text3, model: MODEL, provider: "openai", usage: agentUsage };
 }
 
 // src/agent/repair.ts
@@ -139515,13 +139566,13 @@ var parseValidationResponse = (rawResponse) => {
 async function streamGooseToSSE(sessionId, prompt, apiKey, res, options) {
   let resume = false;
   try {
-    console.log("Exporting session", sessionId);
+    log("Exporting session", sessionId);
     exportSession(sessionId, "assistant");
     resume = true;
-    console.log("Session exists, resume");
+    log("Session exists, resume");
   } catch (error88) {
-    console.log("Error exporting session", error88);
-    console.log("Session doesn't exist, don't resume");
+    log("Error exporting session", error88);
+    log("Session doesn't exist, don't resume");
   }
   log("Streaming Goose to SSE", { sessionId, prompt, apiKey, resume, model: options?.model });
   createGooseConfig(options?.searchApiKey);
@@ -139700,7 +139751,7 @@ async function streamCodexToSSE(sessionId, prompt, apiKey, res, options) {
   ensureSessionsDir();
   const sessionPath = getSessionPath(sessionId);
   log("Streaming Codex to SSE", { sessionId, prompt, sessionPath });
-  console.log("Codex streaming using API key:", apiKey ? `${apiKey.substring(0, 8)}...` : "MISSING");
+  log("Codex streaming using API key:", apiKey ? `${apiKey.substring(0, 8)}...` : "MISSING");
   if (apiKey) {
     writeCodexAuth(apiKey);
   }
@@ -139998,7 +140049,11 @@ var createAsyncAgentHandler = (getParams, transformResult) => {
         const recordings = await collectRecordings(startTime);
         finishReq(request_id, {
           success: true,
-          result: finalResult,
+          result: finalResult.output ?? finalResult,
+          ...finalResult.summary && { summary: finalResult.summary },
+          ...finalResult.usage && { usage: finalResult.usage },
+          ...finalResult.model && { model: finalResult.model },
+          ...finalResult.provider && { provider: finalResult.provider },
           ...screenshots.length > 0 && { screenshots },
           ...recordings.length > 0 && { recordings }
         });
@@ -142704,7 +142759,7 @@ async function startProxyServer() {
           system: repair_exports.SYSTEM
         };
       },
-      (result) => repair_exports.parseXML(result)
+      (result) => repair_exports.parseXML(result.output)
     )
   );
   app.post(

package/dist/staklink-cli.cjs

@@ -11004,7 +11004,7 @@ var glob = Object.assign(glob_, {
 glob.glob = glob;
 
 // src/proxy/version.ts
-var VERSION = "0.4.21";
+var VERSION = "0.4.23";
 
 // src/deps.ts
 var import_child_process = require("child_process");

package/package.json

@@ -2,7 +2,7 @@
   "name": "staklink",
   "displayName": "staklink",
   "description": "staklink process manager",
-  "version": "0.4.21",
+  "version": "0.4.23",
   "type": "module",
   "publisher": "stakwork",
   "engines": {