@pikaa-ai/pikaa 0.2.2 → 0.2.3

package/dist/index.js

@@ -152,6 +152,7 @@ class DefaultModelClientSession {
       model,
       messages,
       stream: true,
+      stream_options: { include_usage: true },
       temperature: params.temperature ?? 0.2
     };
     if (toolsPayload && toolsPayload.length > 0) {
@@ -200,6 +201,7 @@ class DefaultModelClientSession {
     const reader = response.body.getReader();
     const decoder = new TextDecoder;
     let buffer = "";
+    let usageMetrics = {};
     const pendingToolCalls = new Map;
     try {
       while (true) {
@@ -229,11 +231,23 @@ class DefaultModelClientSession {
               };
             }
             pendingToolCalls.clear();
-            yield { type: "done" };
+            yield {
+              type: "done",
+              inputTokens: usageMetrics.inputTokens,
+              outputTokens: usageMetrics.outputTokens,
+              totalTokens: usageMetrics.totalTokens
+            };
             return;
           }
           try {
             const data = JSON.parse(dataStr);
+            if (data.usage) {
+              usageMetrics = {
+                inputTokens: data.usage.prompt_tokens,
+                outputTokens: data.usage.completion_tokens,
+                totalTokens: data.usage.total_tokens
+              };
+            }
             const choice = data.choices?.[0];
             if (!choice)
               continue;
@@ -489,7 +503,8 @@ function createShellTool(policy = new ExecPolicy) {
       if (!command) {
         return { output: "Error: 'command' argument cannot be empty", isError: true };
       }
-      const policyDecision = policy.evaluate(command);
+      const activePolicy = ctx.execPolicy || policy;
+      const policyDecision = activePolicy.evaluate(command);
       if (policyDecision.decision === "deny") {
         return {
           output: `Error: Command execution denied by policy: ${policyDecision.reason}`,
@@ -1550,6 +1565,8 @@ async function runTurn(session, turnContext, input) {
     skillsPrompt
   });
   let iteration = 0;
+  let accumulatedInputTokens = 0;
+  let accumulatedOutputTokens = 0;
   const clientSession = session.modelClient.newSession();
   try {
     while (iteration < turnContext.maxIterations) {
@@ -1559,6 +1576,8 @@ async function runTurn(session, turnContext, input) {
       iteration++;
       let currentAgentText = "";
       const toolCallRequests = [];
+      let iterInputTokens = Math.ceil((effectiveSystemPrompt.length + JSON.stringify(session.getHistory()).length) / 4);
+      let iterOutputTokens = 0;
       const stream = clientSession.stream({
         model: turnContext.model,
         systemPrompt: effectiveSystemPrompt,
@@ -1585,10 +1604,20 @@ async function runTurn(session, turnContext, input) {
           });
         } else if (chunk.type === "tool_call") {
           toolCallRequests.push(chunk);
+        } else if (chunk.type === "done") {
+          if (chunk.inputTokens !== undefined)
+            iterInputTokens = chunk.inputTokens;
+          if (chunk.outputTokens !== undefined)
+            iterOutputTokens = chunk.outputTokens;
         } else if (chunk.type === "error") {
           throw chunk.error;
         }
       }
+      if (iterOutputTokens === 0) {
+        iterOutputTokens = Math.ceil((currentAgentText.length + JSON.stringify(toolCallRequests).length) / 4);
+      }
+      accumulatedInputTokens += iterInputTokens;
+      accumulatedOutputTokens += iterOutputTokens;
       if (currentAgentText.trim()) {
         const agentItem = {
           id: `msg_agent_${Date.now()}`,
@@ -1629,6 +1658,7 @@ async function runTurn(session, turnContext, input) {
             cwd: turnContext.environment.cwd,
             turnId,
             signal,
+            execPolicy: session.execPolicy,
             requestApproval: async (description, command) => {
               const approvalId = `appr_${Date.now()}_${Math.random().toString(36).slice(2, 6)}`;
               return session.requestApproval({
@@ -1666,9 +1696,16 @@ async function runTurn(session, turnContext, input) {
       }
       break;
     }
+    const totalContextTokens = estimateTotalTokens(session.getHistory()) + Math.ceil(effectiveSystemPrompt.length / 4);
+    const maxContextTokens = 128000;
     session.emitEvent({
       type: "TurnCompleted",
-      turnId
+      turnId,
+      inputTokens: accumulatedInputTokens,
+      outputTokens: accumulatedOutputTokens,
+      totalTokens: accumulatedInputTokens + accumulatedOutputTokens,
+      contextTokens: totalContextTokens,
+      maxContextTokens
     });
   } catch (error) {
     const isAborted = error instanceof TurnAbortedError || signal.aborted;
@@ -1762,6 +1799,7 @@ class Session {
   tools;
   skillsLoader;
   memoryStore;
+  execPolicy;
   history = [];
   activeTurn = null;
   status = "idle";
@@ -1779,6 +1817,7 @@ class Session {
     this.tools = options.tools || new ToolRouter;
     this.skillsLoader = options.skillsLoader;
     this.memoryStore = options.memoryStore;
+    this.execPolicy = options.execPolicy || new ExecPolicy;
     this.history = options.initialHistory ? [...options.initialHistory] : [];
     if (options.onEvent) {
       this.eventListeners.push(options.onEvent);
@@ -3987,7 +4026,7 @@ class AuthClient {
                 </head>
                 <body>
                   <div class="box">
-                    <h1>\u26A1 Authentication Successful!</h1>
+                    <h1>Authentication Successful!</h1>
                     <p>You have successfully logged in to Groupy CLI. You can close this window and return to your terminal.</p>
                   </div>
                 </body>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pikaa-ai/pikaa",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "PIKAA CLI - AI coding agent that runs locally in your terminal.",
   "main": "./dist/index.js",
   "module": "./dist/index.js",