@psnext/slingcli 2.5.20260722-2 → 2.5.20260722-3

package/node_modules/@earendil-works/pi-agent-core/dist/harness/session/jsonl-storage.js

@@ -1,6 +1,6 @@
+import { uuidv7 } from "@earendil-works/pi-ai";
 import { SessionError, toError } from "../types.js";
 import { getFileSystemResultOrThrow } from "./repo-utils.js";
-import { uuidv7 } from "./uuid.js";
 function updateLabelCache(labelsById, entry) {
     if (entry.type !== "label")
         return;
@@ -216,15 +216,65 @@ export class JsonlSessionStorage {
     async getLabel(id) {
         return this.labelsById.get(id);
     }
-    async getPathToRoot(leafId) {
+    async getSessionName() {
+        const entries = await this.findEntries("session_info");
+        return entries[entries.length - 1]?.name?.trim() || undefined;
+    }
+    async getSessionStats() {
+        let messageCount = 0;
+        let cachedTokens = 0;
+        let uncachedTokens = 0;
+        let totalTokens = 0;
+        let costTotal = 0;
+        for (const entry of this.entries) {
+            if (entry.type === "message") {
+                messageCount += 1;
+            }
+            const usage = entry.type === "message"
+                ? entry.message.role === "assistant"
+                    ? entry.message.usage
+                    : undefined
+                : entry.type === "compaction" || entry.type === "branch_summary"
+                    ? entry.usage
+                    : undefined;
+            if (!usage ||
+                typeof usage.input !== "number" ||
+                typeof usage.output !== "number" ||
+                typeof usage.cacheRead !== "number" ||
+                typeof usage.cacheWrite !== "number" ||
+                typeof usage.cost?.total !== "number") {
+                continue;
+            }
+            cachedTokens += usage.cacheRead;
+            uncachedTokens += usage.input + usage.cacheWrite;
+            totalTokens += usage.input + usage.output + usage.cacheRead + usage.cacheWrite;
+            costTotal += usage.cost.total;
+        }
+        return {
+            messageCount,
+            cachedTokens,
+            uncachedTokens,
+            totalTokens,
+            costTotal,
+        };
+    }
+    async getPathToRootOrCompaction(leafId) {
         if (leafId === null)
             return [];
         const path = [];
+        let stopAtEntryId = null;
         let current = this.byId.get(leafId);
         if (!current)
             throw new SessionError("not_found", `Entry ${leafId} not found`);
         while (current) {
             path.unshift(current);
+            if (stopAtEntryId !== null && current.id === stopAtEntryId)
+                break;
+            if (current.type === "compaction") {
+                if (current.retainedTail)
+                    break;
+                stopAtEntryId = current.firstKeptEntryId ?? null;
+            }
             if (!current.parentId)
                 break;
             const parent = this.byId.get(current.parentId);
@@ -234,8 +284,10 @@ export class JsonlSessionStorage {
         }
         return path;
     }
-    async getEntries() {
-        return [...this.entries];
+    async getEntries(options) {
+        const start = options?.afterEntrySeq ?? 0;
+        const end = options?.limit === undefined ? undefined : start + options.limit;
+        return this.entries.slice(start, end);
     }
 }
 //# sourceMappingURL=jsonl-storage.js.map

package/node_modules/@earendil-works/pi-agent-core/dist/harness/session/memory-storage.js

@@ -1,5 +1,5 @@
+import { uuidv7 } from "@earendil-works/pi-ai";
 import { SessionError, } from "../types.js";
-import { uuidv7 } from "./uuid.js";
 function updateLabelCache(labelsById, entry) {
     if (entry.type !== "label")
         return;
@@ -91,15 +91,65 @@ export class InMemorySessionStorage {
     async getLabel(id) {
         return this.labelsById.get(id);
     }
-    async getPathToRoot(leafId) {
+    async getSessionName() {
+        const entries = await this.findEntries("session_info");
+        return entries[entries.length - 1]?.name?.trim() || undefined;
+    }
+    async getSessionStats() {
+        let messageCount = 0;
+        let cachedTokens = 0;
+        let uncachedTokens = 0;
+        let totalTokens = 0;
+        let costTotal = 0;
+        for (const entry of this.entries) {
+            if (entry.type === "message") {
+                messageCount += 1;
+            }
+            const usage = entry.type === "message"
+                ? entry.message.role === "assistant"
+                    ? entry.message.usage
+                    : undefined
+                : entry.type === "compaction" || entry.type === "branch_summary"
+                    ? entry.usage
+                    : undefined;
+            if (!usage ||
+                typeof usage.input !== "number" ||
+                typeof usage.output !== "number" ||
+                typeof usage.cacheRead !== "number" ||
+                typeof usage.cacheWrite !== "number" ||
+                typeof usage.cost?.total !== "number") {
+                continue;
+            }
+            cachedTokens += usage.cacheRead;
+            uncachedTokens += usage.input + usage.cacheWrite;
+            totalTokens += usage.input + usage.output + usage.cacheRead + usage.cacheWrite;
+            costTotal += usage.cost.total;
+        }
+        return {
+            messageCount,
+            cachedTokens,
+            uncachedTokens,
+            totalTokens,
+            costTotal,
+        };
+    }
+    async getPathToRootOrCompaction(leafId) {
         if (leafId === null)
             return [];
         const path = [];
+        let stopAtEntryId = null;
         let current = this.byId.get(leafId);
         if (!current)
             throw new SessionError("not_found", `Entry ${leafId} not found`);
         while (current) {
             path.unshift(current);
+            if (stopAtEntryId !== null && current.id === stopAtEntryId)
+                break;
+            if (current.type === "compaction") {
+                if (current.retainedTail)
+                    break;
+                stopAtEntryId = current.firstKeptEntryId ?? null;
+            }
             if (!current.parentId)
                 break;
             const parent = this.byId.get(current.parentId);
@@ -109,8 +159,10 @@ export class InMemorySessionStorage {
         }
         return path;
     }
-    async getEntries() {
-        return [...this.entries];
+    async getEntries(options) {
+        const start = options?.afterEntrySeq ?? 0;
+        const end = options?.limit === undefined ? undefined : start + options.limit;
+        return this.entries.slice(start, end);
     }
 }
 //# sourceMappingURL=memory-storage.js.map

package/node_modules/@earendil-works/pi-agent-core/dist/harness/session/repo-utils.js

@@ -1,6 +1,6 @@
+import { uuidv7 } from "@earendil-works/pi-ai";
 import { SessionError, } from "../types.js";
 import { Session } from "./session.js";
-import { uuidv7 } from "./uuid.js";
 export function createSessionId() {
     return uuidv7();
 }
@@ -34,6 +34,6 @@ export async function getEntriesToFork(storage, options) {
         }
         effectiveLeafId = target.parentId;
     }
-    return storage.getPathToRoot(effectiveLeafId);
+    return storage.getPathToRootOrCompaction(effectiveLeafId);
 }
 //# sourceMappingURL=repo-utils.js.map

package/node_modules/@earendil-works/pi-agent-core/dist/harness/session/session.js

@@ -32,13 +32,21 @@ export function defaultContextEntryTransform(pathEntries) {
     }
     const entries = [compaction];
     const compactionIdx = pathEntries.findIndex((entry) => entry.type === "compaction" && entry.id === compaction.id);
-    let foundFirstKept = false;
-    for (let i = 0; i < compactionIdx; i++) {
-        const entry = pathEntries[i];
-        if (entry.id === compaction.firstKeptEntryId)
-            foundFirstKept = true;
-        if (foundFirstKept)
-            entries.push(entry);
+    if (compaction.retainedTail) {
+        for (let i = compactionIdx + 1; i < pathEntries.length; i++) {
+            entries.push(pathEntries[i]);
+        }
+        return entries;
+    }
+    if (compaction.firstKeptEntryId) {
+        let foundFirstKept = false;
+        for (let i = 0; i < compactionIdx; i++) {
+            const entry = pathEntries[i];
+            if (entry.id === compaction.firstKeptEntryId)
+                foundFirstKept = true;
+            if (foundFirstKept)
+                entries.push(entry);
+        }
     }
     for (let i = compactionIdx + 1; i < pathEntries.length; i++) {
         entries.push(pathEntries[i]);
@@ -62,7 +70,10 @@ export function sessionEntryToContextMessages(entry, index, entries, options = {
         ];
     }
     if (entry.type === "compaction") {
-        return [createCompactionSummaryMessage(entry.summary, entry.tokensBefore, entry.timestamp)];
+        return [
+            createCompactionSummaryMessage(entry.summary, entry.tokensBefore, entry.timestamp),
+            ...(entry.retainedTail ?? []),
+        ];
     }
     if (entry.type === "branch_summary" && entry.summary) {
         return [createBranchSummaryMessage(entry.summary, entry.fromId, entry.timestamp)];
@@ -97,12 +108,12 @@ export class Session {
     getEntry(id) {
         return this.storage.getEntry(id);
     }
-    getEntries() {
-        return this.storage.getEntries();
+    getEntries(options) {
+        return this.storage.getEntries(options);
     }
     async getBranch(fromId) {
         const leafId = fromId ?? (await this.storage.getLeafId());
-        return this.storage.getPathToRoot(leafId);
+        return this.storage.getPathToRootOrCompaction(leafId);
     }
     async buildContextEntries(options = {}) {
         return buildContextEntries(await this.getBranch(), this.mergeContextBuildOptions(options));
@@ -122,9 +133,11 @@ export class Session {
     getLabel(id) {
         return this.storage.getLabel(id);
     }
+    getSessionStats() {
+        return this.storage.getSessionStats();
+    }
     async getSessionName() {
-        const entries = await this.storage.findEntries("session_info");
-        return entries[entries.length - 1]?.name?.trim() || undefined;
+        return this.storage.getSessionName();
     }
     async appendTypedEntry(entry) {
         await this.storage.appendEntry(entry);
@@ -167,7 +180,7 @@ export class Session {
             activeToolNames: [...activeToolNames],
         });
     }
-    async appendCompaction(summary, firstKeptEntryId, tokensBefore, details, fromHook) {
+    async appendCompaction(summary, firstKeptEntryId, tokensBefore, details, fromHook, usage, retainedTail) {
         return this.appendTypedEntry({
             type: "compaction",
             id: await this.storage.createEntryId(),
@@ -176,7 +189,9 @@ export class Session {
             summary,
             firstKeptEntryId,
             tokensBefore,
+            retainedTail,
             details,
+            usage,
             fromHook,
         });
     }
@@ -240,6 +255,7 @@ export class Session {
             fromId: entryId ?? "root",
             summary: summary.summary,
             details: summary.details,
+            usage: summary.usage,
             fromHook: summary.fromHook,
         });
     }

package/node_modules/@earendil-works/pi-agent-core/dist/index.js

@@ -1,10 +1,11 @@
 // Core Agent
+export { uuidv7 } from "@earendil-works/pi-ai";
 export * from "./agent.js";
 // Loop functions
 export * from "./agent-loop.js";
 export * from "./harness/agent-harness.js";
 export { collectEntriesForBranchSummary, generateBranchSummary, prepareBranchEntries, } from "./harness/compaction/branch-summarization.js";
-export { calculateContextTokens, compact, DEFAULT_COMPACTION_SETTINGS, estimateContextTokens, estimateTokens, findCutPoint, findTurnStartIndex, generateSummary, getLastAssistantUsage, prepareCompaction, serializeConversation, shouldCompact, } from "./harness/compaction/compaction.js";
+export { calculateContextTokens, compact, DEFAULT_COMPACTION_SETTINGS, estimateContextTokens, estimateTokens, findCutPoint, findTurnStartIndex, generateSummary, generateSummaryWithUsage, getLastAssistantUsage, prepareCompaction, serializeConversation, shouldCompact, } from "./harness/compaction/compaction.js";
 export * from "./harness/messages.js";
 export * from "./harness/prompt-templates.js";
 export * from "./harness/session/jsonl-repo.js";
@@ -13,7 +14,6 @@ export * from "./harness/session/memory-repo.js";
 export * from "./harness/session/memory-storage.js";
 export * from "./harness/session/repo-utils.js";
 export * from "./harness/session/session.js";
-export { uuidv7 } from "./harness/session/uuid.js";
 export * from "./harness/skills.js";
 export * from "./harness/system-prompt.js";
 // Harness
@@ -22,6 +22,8 @@ export * from "./harness/utils/shell-output.js";
 export * from "./harness/utils/truncate.js";
 // Proxy utilities
 export * from "./proxy.js";
+// Stream defaults
+export { setDefaultStreamFn } from "./stream-fn.js";
 // Types
 export * from "./types.js";
 //# sourceMappingURL=index.js.map

package/node_modules/@earendil-works/pi-agent-core/dist/stream-fn.js

@@ -0,0 +1,17 @@
+let defaultStreamFn;
+/**
+ * Configure the fallback used by Agent and low-level loops when callers omit streamFn.
+ *
+ * Hosts that provide a default model runtime can install its stream function here
+ * without making pi-agent-core depend on a provider catalog or compatibility layer.
+ */
+export function setDefaultStreamFn(streamFn) {
+    defaultStreamFn = streamFn;
+}
+export function getDefaultStreamFn() {
+    if (!defaultStreamFn) {
+        throw new Error("No default stream function configured. Pass streamFn explicitly or call setDefaultStreamFn().");
+    }
+    return defaultStreamFn;
+}
+//# sourceMappingURL=stream-fn.js.map

package/node_modules/@earendil-works/pi-agent-core/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@earendil-works/pi-agent-core",
-	"version": "0.80.10",
+	"version": "0.81.1",
 	"description": "General-purpose agent with transport abstraction, state management, and attachment support",
 	"type": "module",
 	"main": "./dist/index.js",
@@ -26,10 +26,10 @@
 		"test": "vitest --run",
 		"test:harness": "vitest --run --config vitest.harness.config.ts",
 		"coverage:harness": "vitest --run --config vitest.harness.config.ts --coverage",
-		"prepublishOnly": "npm run clean && npm run build"
+		"prepublishOnly": "npm run build"
 	},
 	"dependencies": {
-		"@earendil-works/pi-ai": "^0.80.10",
+		"@earendil-works/pi-ai": "^0.81.1",
 		"ignore": "7.0.5",
 		"typebox": "1.1.38",
 		"yaml": "2.9.0"

package/node_modules/@earendil-works/pi-ai/dist/api/openai-codex-responses.js

@@ -15,6 +15,7 @@ import { formatProviderError, normalizeProviderError } from "../utils/error-body
 import { AssistantMessageEventStream } from "../utils/event-stream.js";
 import { headersToRecord } from "../utils/headers.js";
 import { resolveHttpProxyUrlForTarget } from "../utils/node-http-proxy.js";
+import { uuidv7 } from "../utils/uuid.js";
 import { clampOpenAIPromptCacheKey } from "./openai-prompt-cache.js";
 import { convertResponsesMessages, convertResponsesTools, processResponsesStream } from "./openai-responses-shared.js";
 import { buildBaseOptions } from "./simple-options.js";
@@ -162,7 +163,7 @@ export const stream = (model, context, options) => {
                 body = nextBody;
             }
             const codexSessionId = clampOpenAIPromptCacheKey(options?.sessionId);
-            const websocketRequestId = codexSessionId || createCodexRequestId();
+            const websocketRequestId = codexSessionId || uuidv7();
             const sseHeaders = buildSSEHeaders(model.headers, options?.headers, accountId, apiKey, codexSessionId);
             const websocketHeaders = buildWebSocketHeaders(model.headers, options?.headers, accountId, apiKey, websocketRequestId);
             const bodyJson = JSON.stringify(body);
@@ -1179,12 +1180,6 @@ function extractAccountId(token) {
         throw new Error("Failed to extract accountId from token");
     }
 }
-function createCodexRequestId() {
-    if (typeof globalThis.crypto?.randomUUID === "function") {
-        return globalThis.crypto.randomUUID();
-    }
-    return `codex_${Date.now()}_${Math.random().toString(36).slice(2, 10)}`;
-}
 function buildBaseCodexHeaders(initHeaders, additionalHeaders, accountId, token) {
     const headers = new Headers(initHeaders);
     for (const [key, value] of Object.entries(additionalHeaders || {})) {

package/node_modules/@earendil-works/pi-ai/dist/api/openai-completions.js

@@ -2,6 +2,7 @@ import OpenAI from "openai";
 import { calculateCost, clampThinkingLevel } from "../models.js";
 import { formatProviderError, normalizeProviderError } from "../utils/error-body.js";
 import { AssistantMessageEventStream } from "../utils/event-stream.js";
+import { shortHash } from "../utils/hash.js";
 import { headersToRecord } from "../utils/headers.js";
 import { parseStreamingJson } from "../utils/json-parse.js";
 import { getProviderEnvValue } from "../utils/provider-env.js";
@@ -699,10 +700,21 @@ export function convertMessages(model, context, compat) {
         // Format: {call_id}|{id} where {id} can be 400+ chars with special chars (+, /, =)
         // These come from providers like github-copilot, openai-codex, opencode
         // Extract just the call_id part and normalize it
+        // Multiple tool calls in the same turn can share call_id but differ by item_id.
+        // Preserve item-level uniqueness when replaying into Chat Completions, which
+        // requires distinct tool call ids.
         if (id.includes("|")) {
-            const [callId] = id.split("|");
             // Sanitize to allowed chars and truncate to 40 chars (OpenAI limit)
-            return callId.replace(/[^a-zA-Z0-9_-]/g, "_").slice(0, 40);
+            const separatorIndex = id.indexOf("|");
+            const callId = id.slice(0, separatorIndex).replace(/[^a-zA-Z0-9_-]/g, "_");
+            const itemId = id.slice(separatorIndex + 1).replace(/[^a-zA-Z0-9_-]/g, "_");
+            const combinedId = itemId.length > 0 ? `${callId}_${itemId}` : callId;
+            if (combinedId.length <= 40) {
+                return combinedId;
+            }
+            const hash = shortHash(id).slice(0, 8);
+            const prefix = callId.slice(0, Math.max(1, 40 - hash.length - 1));
+            return `${prefix}_${hash}`;
         }
         if (model.provider === "openai")
             return id.length > 40 ? id.slice(0, 40) : id;

package/node_modules/@earendil-works/pi-ai/dist/api/pi-messages.js

@@ -23,13 +23,11 @@ export class PiMessagesResponseError extends Error {
         this.diagnosticDetails = diagnosticDetails;
     }
 }
-function isRecord(value) {
-    return typeof value === "object" && value !== null && !Array.isArray(value);
-}
 function parsePiMessagesErrorBody(body) {
     try {
         const parsed = JSON.parse(body);
-        return isRecord(parsed) && isRecord(parsed.error) ? parsed : undefined;
+        const error = parsed?.error;
+        return parsed && typeof error === "object" && error !== null && !Array.isArray(error) ? parsed : undefined;
     }
     catch {
         return undefined;

package/node_modules/@earendil-works/pi-ai/dist/auth/helpers.js

@@ -12,8 +12,9 @@ export function envApiKeyAuth(name, envVars) {
             return { type: "api_key", key };
         },
         resolve: async ({ ctx, credential }) => {
-            if (credential?.key)
-                return { auth: { apiKey: credential.key }, source: "stored credential" };
+            if (credential?.key) {
+                return { auth: { apiKey: credential.key }, env: credential.env, source: "stored credential" };
+            }
             for (const envVar of envVars) {
                 const value = await ctx.env(envVar);
                 if (value)