@dan-ai-studio/dshopencodego 0.1.63 → 0.1.64

package/lib/index.js

@@ -365,17 +365,17 @@ function contentText(content, separator = "\n") {
 }
 function getSystemMessageText(message) {
   const parts = [contentText(message.content)];
-  for (const text of Object.values(message.sections ?? {})) {
-    if (text !== null)
-      parts.push(text);
+  for (const text2 of Object.values(message.sections ?? {})) {
+    if (text2 !== null)
+      parts.push(text2);
   }
   return parts.filter((part) => part.length > 0).join("\n\n");
 }
 function renderSystemMessageUpdate(message) {
   const parts = [];
-  const text = contentText(message.content);
-  if (text.length > 0)
-    parts.push(text);
+  const text2 = contentText(message.content);
+  if (text2.length > 0)
+    parts.push(text2);
   for (const [name2, value] of Object.entries(message.sections ?? {})) {
     parts.push(value === null ? `Removed system prompt section "${name2}".` : `Updated system prompt section "${name2}":
 
@@ -433,9 +433,9 @@ function getCurrentSystemMessage(messages) {
     if (!isSystemMessage(message))
       continue;
     timestamp ??= message.timestamp;
-    const text = contentText(message.content);
-    if (text.length > 0)
-      content.push(text);
+    const text2 = contentText(message.content);
+    if (text2.length > 0)
+      content.push(text2);
     for (const [name2, value] of Object.entries(message.sections ?? {})) {
       if (value === null)
         sections.delete(name2);
@@ -884,9 +884,9 @@ var init_values = __esm({
       }
       return n;
     };
-    safeJSON = (text) => {
+    safeJSON = (text2) => {
       try {
-        return JSON.parse(text);
+        return JSON.parse(text2);
       } catch (err) {
         return void 0;
       }
@@ -1616,12 +1616,12 @@ function requireSecureTokenEndpoint(baseURL) {
   throw new WorkloadIdentityError(`Refusing to send credential over non-https token endpoint "${baseURL}"`);
 }
 async function parseTokenResponse(resp, requestId) {
-  const text = await readLimitedText(resp);
+  const text2 = await readLimitedText(resp);
   let data;
   try {
-    data = JSON.parse(text);
+    data = JSON.parse(text2);
   } catch {
-    throw new WorkloadIdentityError(`Token endpoint returned non-JSON response (status ${resp.status})`, resp.status, redactSensitive(text), requestId);
+    throw new WorkloadIdentityError(`Token endpoint returned non-JSON response (status ${resp.status})`, resp.status, redactSensitive(text2), requestId);
   }
   if (!data.access_token) {
     throw new WorkloadIdentityError(`Token endpoint response missing access_token: ${JSON.stringify(redactSensitive(data))}`, resp.status, redactSensitive(data), requestId);
@@ -2315,8 +2315,8 @@ function oidcFederationProvider(config) {
     }
     const requestId = resp.headers.get("Request-Id");
     if (!resp.ok) {
-      const text = await resp.text().catch(() => "");
-      const redacted = redactSensitive(text);
+      const text2 = await resp.text().catch(() => "");
+      const redacted = redactSensitive(text2);
       let hint = "";
       if (resp.status === 401) {
         const hintMiddle = config.workspaceId ? "" : "If your federation rule is scoped to multiple workspaces, set the ANTHROPIC_WORKSPACE_ID environment variable, the 'workspace_id' config key, or the `workspaceId` option. ";
@@ -2395,8 +2395,8 @@ function userOAuthProvider(config) {
     }
     const requestId = resp.headers.get("Request-Id");
     if (!resp.ok) {
-      const text = await resp.text().catch(() => "");
-      throw new WorkloadIdentityError(`User OAuth refresh failed (HTTP ${resp.status}): ${redactSensitive(text)}`, resp.status, redactSensitive(text), requestId);
+      const text2 = await resp.text().catch(() => "");
+      throw new WorkloadIdentityError(`User OAuth refresh failed (HTTP ${resp.status}): ${redactSensitive(text2)}`, resp.status, redactSensitive(text2), requestId);
     }
     const data = await parseTokenResponse(resp, requestId);
     const expiresIn = Number(data.expires_in);
@@ -2923,8 +2923,8 @@ async function defaultParseResponse(client, props) {
       const json = await response.json();
       return addResponseIDs(json, response);
     }
-    const text = await response.text();
-    return text;
+    const text2 = await response.text();
+    return text2;
   })().finally(() => {
     if (!props.options.stream && !props.options.__binaryResponse) {
       releaseRequestSignal(props.controller);
@@ -8198,15 +8198,15 @@ function betaEditTool(ctx) {
           throw e;
         throw new ToolError(`edit: ${fsErrorMessage(e, file_path)}`);
       }
-      const count = data.split(old_string).length - 1;
-      if (count === 0)
+      const count2 = data.split(old_string).length - 1;
+      if (count2 === 0)
         throw new ToolError(`edit: old_string not found in ${file_path}`);
       let updated;
       if (replace_all) {
         updated = data.split(old_string).join(new_string);
       } else {
-        if (count > 1)
-          throw new ToolError(`edit: old_string appears ${count} times in ${file_path} (must be unique)`);
+        if (count2 > 1)
+          throw new ToolError(`edit: old_string appears ${count2} times in ${file_path} (must be unique)`);
         updated = data.replace(old_string, () => new_string);
       }
       try {
@@ -8214,7 +8214,7 @@ function betaEditTool(ctx) {
       } catch (e) {
         throw new ToolError(`edit: write: ${fsErrorMessage(e, file_path)}`);
       }
-      return `edited ${file_path} (${replace_all ? count : 1} replacement(s))`;
+      return `edited ${file_path} (${replace_all ? count2 : 1} replacement(s))`;
     }
   });
 }
@@ -18327,8 +18327,8 @@ var init_provider_retry = __esm({
 });
 
 // node_modules/@earendil-works/pi-ai/dist/utils/sanitize-unicode.js
-function sanitizeSurrogates(text) {
-  return text.replace(/[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g, "");
+function sanitizeSurrogates(text2) {
+  return text2.replace(/[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g, "");
 }
 var init_sanitize_unicode = __esm({
   "node_modules/@earendil-works/pi-ai/dist/utils/sanitize-unicode.js"() {
@@ -18613,8 +18613,8 @@ function estimateTextAndImageContentChars(content) {
     chars += block.type === "text" ? block.text.length : ESTIMATED_IMAGE_CHARS;
   return chars;
 }
-function estimateTextTokens(text) {
-  return Math.ceil(text.length / CHARS_PER_TOKEN);
+function estimateTextTokens(text2) {
+  return Math.ceil(text2.length / CHARS_PER_TOKEN);
 }
 function estimateTextAndImageContentTokens(content) {
   return Math.ceil(estimateTextAndImageContentChars(content) / CHARS_PER_TOKEN);
@@ -19094,9 +19094,9 @@ function decodeSseLine(line, state2) {
   }
   return null;
 }
-function nextLineBreakIndex(text) {
-  const carriageReturnIndex = text.indexOf("\r");
-  const newlineIndex = text.indexOf("\n");
+function nextLineBreakIndex(text2) {
+  const carriageReturnIndex = text2.indexOf("\r");
+  const newlineIndex = text2.indexOf("\n");
   if (carriageReturnIndex === -1) {
     return newlineIndex;
   }
@@ -19105,18 +19105,18 @@ function nextLineBreakIndex(text) {
   }
   return Math.min(carriageReturnIndex, newlineIndex);
 }
-function consumeLine(text) {
-  const lineBreakIndex = nextLineBreakIndex(text);
+function consumeLine(text2) {
+  const lineBreakIndex = nextLineBreakIndex(text2);
   if (lineBreakIndex === -1) {
     return null;
   }
   let nextIndex = lineBreakIndex + 1;
-  if (text[lineBreakIndex] === "\r" && text[nextIndex] === "\n") {
+  if (text2[lineBreakIndex] === "\r" && text2[nextIndex] === "\n") {
     nextIndex += 1;
   }
   return {
-    line: text.slice(0, lineBreakIndex),
-    rest: text.slice(nextIndex)
+    line: text2.slice(0, lineBreakIndex),
+    rest: text2.slice(nextIndex)
   };
 }
 async function* iterateSseMessages(body, signal) {
@@ -19448,10 +19448,10 @@ function convertMessages(transformedMessages, isOAuthToken2, cacheControl, allow
   for (let i = 0; i < transformedMessages.length; i++) {
     const msg = transformedMessages[i];
     if (msg.role === "system") {
-      const text = renderSystemMessageUpdate(msg);
+      const text2 = renderSystemMessageUpdate(msg);
       const blocks = [];
-      if (text.length > 0)
-        blocks.push({ type: "text", text: sanitizeSurrogates(text) });
+      if (text2.length > 0)
+        blocks.push({ type: "text", text: sanitizeSurrogates(text2) });
       if (convertToolDefinitions) {
         const added = msg.toolsAdded ?? [];
         const redefined = new Set(added.map((tool) => tool.name));
@@ -20378,9 +20378,9 @@ var init_values2 = __esm({
       }
       return n;
     };
-    safeJSON2 = (text) => {
+    safeJSON2 = (text2) => {
       try {
-        return JSON.parse(text);
+        return JSON.parse(text2);
       } catch (err) {
         return void 0;
       }
@@ -21539,8 +21539,8 @@ async function defaultParseResponse2(client, props) {
       jsonBodyLength = bodyText.length;
       return addRequestID(json, response);
     }
-    const text = await response.text();
-    return text;
+    const text2 = await response.text();
+    return text2;
   })().catch((error) => {
     throw asAbortError(error, props.controller.signal);
   });
@@ -21728,19 +21728,19 @@ var init_detect_platform2 = __esm({
 });
 
 // node_modules/openai/internal/request-options.mjs
-function observeJSONRequestBody(body, observer) {
+function observeJSONRequestBody(body, observer2) {
   let observers = jsonRequestBodyObservers.get(body);
   if (!observers) {
     observers = /* @__PURE__ */ new Set();
     jsonRequestBodyObservers.set(body, observers);
   }
-  observers.add(observer);
+  observers.add(observer2);
   return () => {
     const active = jsonRequestBodyObservers.get(body);
     if (!active) {
       return;
     }
-    active.delete(observer);
+    active.delete(observer2);
     if (active.size === 0) {
       jsonRequestBodyObservers.delete(body);
     }
@@ -21759,16 +21759,16 @@ var init_request_options2 = __esm({
         const active = [...observers];
         encoded = JSON.stringify(body, function(key, value) {
           let observed = value;
-          for (const observer of active) {
-            const replacement = observer.value(this, key, observed);
+          for (const observer2 of active) {
+            const replacement = observer2.value(this, key, observed);
             if (replacement !== void 0) {
               observed = replacement;
             }
           }
           return observed;
         });
-        for (const observer of active) {
-          observer.complete();
+        for (const observer2 of active) {
+          observer2.complete();
         }
       }
       return {
@@ -33412,14 +33412,14 @@ function isPrimitiveAssistantStreamArrayDelta(accumulator, delta) {
   return delta.every(isPrimitiveAssistantStreamValue) && accumulator.every(isPrimitiveAssistantStreamValue);
 }
 function countOwnAssistantStreamArrayEntries(accumulator) {
-  let count = 0;
+  let count2 = 0;
   for (const key of Object.keys(accumulator)) {
     const index = Number(key);
     if (Number.isSafeInteger(index) && index >= 0 && index < accumulator.length && String(index) === key) {
-      count += 1;
+      count2 += 1;
     }
   }
-  return count;
+  return count2;
 }
 function getAssistantStreamArrayOwnEntryCount(accumulator, enforceSparseHoleBudget, cachedState) {
   if (!enforceSparseHoleBudget) {
@@ -36481,27 +36481,27 @@ function getOutputText(context, output) {
   if (output.type !== "message") {
     return "";
   }
-  let text = "";
+  let text2 = "";
   for (const content of output.content) {
     if (content.type === "output_text") {
-      text += content.text;
+      text2 += content.text;
     }
   }
-  context.outputTextLengths.set(output, text.length);
-  return text;
+  context.outputTextLengths.set(output, text2.length);
+  return text2;
 }
 function ensureCanonicalOutputText(context, snapshot2) {
   if (context.canonicalSnapshot === snapshot2) {
     return;
   }
   const outputTextIndex = new OutputTextIndex();
-  let text = "";
+  let text2 = "";
   for (const output of snapshot2.output) {
     const outputText = getOutputText(context, output);
-    text += outputText;
+    text2 += outputText;
     outputTextIndex.append(outputText.length);
   }
-  snapshot2.output_text = text;
+  snapshot2.output_text = text2;
   context.outputTextIndex = outputTextIndex;
   context.canonicalSnapshot = snapshot2;
 }
@@ -36802,12 +36802,12 @@ function accumulateOutputItemEvent(event, snapshot2, context) {
       snapshot2.output.push(output);
       addOutputItemIdentities(identityIndex.identities, identities);
       identityIndex.length = snapshot2.output.length;
-      const text = getOutputText(context, output);
+      const text2 = getOutputText(context, output);
       if (context.canonicalSnapshot === snapshot2) {
-        context.outputTextIndex.append(text.length);
+        context.outputTextIndex.append(text2.length);
       }
-      if (text) {
-        snapshot2.output_text += text;
+      if (text2) {
+        snapshot2.output_text += text2;
       }
       return true;
     }
@@ -40289,10 +40289,10 @@ function formatProviderError(norm, prefix) {
   }
   return prefix !== void 0 ? `${prefix} (${norm.status}): ${norm.body}` : `${norm.status}: ${norm.body}`;
 }
-function truncateErrorText(text, maxChars) {
-  if (text.length <= maxChars)
-    return text;
-  return `${text.slice(0, maxChars)}... [truncated ${text.length - maxChars} chars]`;
+function truncateErrorText(text2, maxChars) {
+  if (text2.length <= maxChars)
+    return text2;
+  return `${text2.slice(0, maxChars)}... [truncated ${text2.length - maxChars} chars]`;
 }
 function safeJsonStringify2(value) {
   try {
@@ -40810,9 +40810,9 @@ function convertMessages2(model, context, compat, options) {
         };
         params.push(kimiToolMessage);
       }
-      const text = i === 0 ? getSystemMessageText(msg) : renderSystemMessageUpdate(msg);
-      if (text.length > 0) {
-        params.push({ role: instructionRole, content: sanitizeSurrogates(text) });
+      const text2 = i === 0 ? getSystemMessageText(msg) : renderSystemMessageUpdate(msg);
+      if (text2.length > 0) {
+        params.push({ role: instructionRole, content: sanitizeSurrogates(text2) });
       }
     } else if (msg.role === "user") {
       if (typeof msg.content === "string") {
@@ -41623,9 +41623,9 @@ function convertResponsesMessages(model, context, allowedToolCallProviders, opti
       if (!isLeadingSystemMessage)
         appendSystemToolAdditions(msg, `system:${msgIndex}`);
       if (!isLeadingSystemMessage || includeInitialSystemMessage) {
-        const text = isLeadingSystemMessage ? getSystemMessageText(msg) : renderSystemMessageUpdate(msg);
-        if (text.length > 0) {
-          messages.push({ role: instructionRole, content: sanitizeSurrogates(text) });
+        const text2 = isLeadingSystemMessage ? getSystemMessageText(msg) : renderSystemMessageUpdate(msg);
+        if (text2.length > 0) {
+          messages.push({ role: instructionRole, content: sanitizeSurrogates(text2) });
         }
       }
     } else if (msg.role === "user") {
@@ -63484,12 +63484,12 @@ var require_cache_handler = __commonJS({
         return void 0;
       }
       let originUrl;
-      let requestUrl;
+      let requestUrl2;
       let locationUrl;
       try {
         originUrl = new URL(cacheKey.origin);
-        requestUrl = new URL(cacheKey.path, originUrl);
-        locationUrl = new URL(location, requestUrl);
+        requestUrl2 = new URL(cacheKey.path, originUrl);
+        locationUrl = new URL(location, requestUrl2);
       } catch {
         return void 0;
       }
@@ -72962,15 +72962,15 @@ ${value}`;
           pos = 0;
         }
       }
-      discardLeadingBytes(count) {
-        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+      discardLeadingBytes(count2) {
+        while (count2 > 0 && this.lineChunkIndex < this.chunks.length) {
           const chunk = this.chunks[this.lineChunkIndex];
           const remaining = chunk.length - this.linePos;
-          if (count < remaining) {
-            this.linePos += count;
-            count = 0;
+          if (count2 < remaining) {
+            this.linePos += count2;
+            count2 = 0;
           } else {
-            count -= remaining;
+            count2 -= remaining;
             this.lineChunkIndex++;
             this.linePos = 0;
           }
@@ -73544,6 +73544,7 @@ ${captureLines}` : capture.stack;
 });
 
 // src/index.ts
+import dc from "node:diagnostics_channel";
 import { credentialRef } from "@deepseek-ai/dsh-credentials";
 import { launchEnvironmentOf } from "@deepseek-ai/dsh-launch-environment";
 import * as llm2 from "@deepseek-ai/dsh-llm";
@@ -73555,6 +73556,7 @@ init_transcript();
 import {
   attributionHeaders as attributionHeaders5,
   contentHasImage as contentHasImage2,
+  isTokenDelta,
   LlmAdapter,
   LlmError as LlmError8,
   ReasoningEffortId,
@@ -73629,16 +73631,16 @@ async function readBoundedJson(response, url, maxBytes) {
     });
     throw new LlmError(`${url} declares ${declared} bytes, over the ${maxBytes}-byte cap`, "DISCOVERY_FAILED");
   }
-  let text;
+  let text2;
   try {
-    text = await readBoundedText(response, maxBytes);
+    text2 = await readBoundedText(response, maxBytes);
   } catch (error) {
     if (error instanceof LlmError) throw error;
     const detail = error instanceof Error ? error.message : String(error);
     throw new LlmError(`could not read ${url}: ${detail}`, "DISCOVERY_FAILED", { cause: error });
   }
   try {
-    return JSON.parse(text);
+    return JSON.parse(text2);
   } catch (error) {
     throw new LlmError(`${url} did not answer with JSON`, "DISCOVERY_FAILED", { cause: error });
   }
@@ -75722,6 +75724,11 @@ var MAX_KEEP_ALIVE_TIMEOUT_SECONDS = 1800;
 var DEFAULT_KEEP_ALIVE_TIMEOUT_MS = DEFAULT_KEEP_ALIVE_TIMEOUT_SECONDS * 1e3;
 var MAX_KEEP_ALIVE_TIMEOUT_MS = MAX_KEEP_ALIVE_TIMEOUT_SECONDS * 1e3;
 
+// src/request-log/limits.ts
+var DEFAULT_REQUEST_LOG_MAX_ENTRIES = 200;
+var MIN_REQUEST_LOG_MAX_ENTRIES = 50;
+var MAX_REQUEST_LOG_MAX_ENTRIES = 500;
+
 // src/config.ts
 var DEFAULT_API_KEY_ENV = "OPENCODE_GO_API_KEY";
 var DEFAULT_REFRESH_MINUTES = 60;
@@ -75750,6 +75757,11 @@ var fields = {
     maxTokens: Schema.union([Schema.const(null), Schema.number().step(1).min(1).max(Number.MAX_SAFE_INTEGER)])
   })])).default({}),
   modelProtocols: Schema.dict(Schema.string()).default({}),
+  // Off by default: the request path must read exactly as it does without
+  // the log, so the recorder is constructed only when this is true.
+  requestLogEnabled: Schema.boolean().default(false),
+  requestLogDebug: Schema.boolean().default(false),
+  requestLogMaxEntries: Schema.number().step(1).min(MIN_REQUEST_LOG_MAX_ENTRIES).max(MAX_REQUEST_LOG_MAX_ENTRIES).default(DEFAULT_REQUEST_LOG_MAX_ENTRIES),
   pinnedAddresses: Schema.dict(Schema.string()).default({}),
   retryPolicy: RetryPolicySchema
 };
@@ -76022,8 +76034,8 @@ function splitSystemPrompt(options) {
   if (options.system !== void 0) return { systemPrompt: options.system, messages: options.messages };
   const [first, ...rest] = options.messages;
   if (first?.role !== "system") return { systemPrompt: void 0, messages: options.messages };
-  const text = flattenText(first);
-  return { systemPrompt: text.length > 0 ? text : void 0, messages: rest };
+  const text2 = flattenText(first);
+  return { systemPrompt: text2.length > 0 ? text2 : void 0, messages: rest };
 }
 function collectImageRefs(blocks, refs) {
   for (const block of blocks) {
@@ -76301,8 +76313,8 @@ function mapStopReason4(message, contextWindow) {
         failure: { message: message.errorMessage ?? "pi-ai stream aborted", code: "ABORTED" }
       };
     case "error": {
-      const text = message.errorMessage ?? "pi-ai stream error";
-      return { kind: "error", failure: { message: text, code: classifyPiAiError(text) } };
+      const text2 = message.errorMessage ?? "pi-ai stream error";
+      return { kind: "error", failure: { message: text2, code: classifyPiAiError(text2) } };
     }
   }
 }
@@ -76581,6 +76593,11 @@ function stopSequencesFor(model, stop) {
     "UNSUPPORTED_OPTION"
   );
 }
+function requestUrl(input) {
+  if (typeof input === "string") return input;
+  if (input instanceof URL) return input.toString();
+  return input.url;
+}
 async function* observingTerminalUsage(events, observe) {
   for await (const event of events) {
     if (event.type === "done") observe(event.message.usage);
@@ -76749,8 +76766,32 @@ var OpencodeGoAdapter = class extends LlmAdapter {
       const upstream = options.signal === void 0 ? consumer.signal : AbortSignal.any([options.signal, consumer.signal]);
       const watchdog = __using(_stack, idleWatchdog(upstream, config.streamIdleTimeoutMs, "LLM_STREAM_IDLE_TIMEOUT"));
       let timedOut = false;
+      const containsImage = options.messages.some((message) => contentHasImage2(message.content));
+      const headers = providerHeaders(options.sessionId === void 0 ? void 0 : String(options.sessionId));
+      const span = this.options.requestLog?.start({
+        model: options.model,
+        sessionId: options.sessionId === void 0 ? void 0 : String(options.sessionId),
+        method: "POST",
+        url: config.baseURL,
+        messageCount: options.messages.length,
+        hasImage: containsImage,
+        toolCount: options.tools?.length ?? 0,
+        headers: {
+          ...options.sessionId === void 0 ? {} : { session: String(options.sessionId) },
+          ...typeof headers["user-agent"] === "string" ? { userAgent: headers["user-agent"] } : {}
+        }
+      });
+      const fetchFactory = this.options.fetch;
+      const requestFetch = span === void 0 || fetchFactory === void 0 ? fetchFactory : () => {
+        const base = fetchFactory();
+        return (async (input, init) => {
+          const response = await base(input, init);
+          span.request(typeof init?.method === "string" ? init.method : "POST", requestUrl(input));
+          span.status(response.status);
+          return response;
+        });
+      };
       try {
-        const containsImage = options.messages.some((message) => contentHasImage2(message.content));
         if (containsImage && !model.input.includes("image")) {
           throw new LlmError8(`opencode-go model "${model.id}" does not support image input`, "UNSUPPORTED_CONTENT");
         }
@@ -76770,6 +76811,7 @@ var OpencodeGoAdapter = class extends LlmAdapter {
         }
         const context = imageRequest === void 0 ? await toPiContext(options, void 0, this.options.onReplayDegrade) : await toPiContext({ ...options, signal: watchdog.signal }, imageRequest, this.options.onReplayDegrade);
         let reportedReasoning;
+        let pendingUsage;
         const events = observingTerminalUsage(snapshot2.provider.streamSimple(model, normalizeContext(context), {
           apiKey,
           ...reasoning === void 0 || reasoning === "off" ? {} : { reasoning },
@@ -76782,12 +76824,14 @@ var OpencodeGoAdapter = class extends LlmAdapter {
           ...options.sessionId === void 0 ? {} : { sessionId: String(options.sessionId) },
           signal: watchdog.signal,
           // The gateway refuses a request without `x-opencode-session`; the
-          // attribution user-agent rides along on the same object.
-          headers: providerHeaders(options.sessionId === void 0 ? void 0 : String(options.sessionId)),
+          // attribution user-agent rides along on the same object. Computed
+          // once above so the request log can reuse the allowlisted values.
+          headers,
           // The request goes to the gateway, so it goes through the fetch that
           // honours the gateway's pin — and through the system's own resolution
-          // when the pinned address turns out to be gone.
-          ...this.options.fetch === void 0 ? {} : { fetch: this.options.fetch() },
+          // when the pinned address turns out to be gone. Invoked once per
+          // request, exactly as the factory was before.
+          ...requestFetch === void 0 ? {} : { fetch: requestFetch() },
           // The agent recovery layer owns visible attempts; one adapter call is
           // one SDK attempt.
           maxRetries: 0
@@ -76806,7 +76850,9 @@ var OpencodeGoAdapter = class extends LlmAdapter {
               exhausted = true;
               return;
             }
+            if (span !== void 0 && isTokenDelta(result.value)) span.firstToken();
             if (result.value.type === "usage") {
+              pendingUsage = result.value.usage;
               this.options.onUsage?.({
                 model: options.model,
                 usage: {
@@ -76817,6 +76863,18 @@ var OpencodeGoAdapter = class extends LlmAdapter {
                   ...rates2 === void 0 ? {} : { rates: rates2 }
                 }
               });
+            } else if (result.value.type === "finish") {
+              const reason = result.value.reason;
+              const ok = reason.kind === "stop" || reason.kind === "tool-calls" || reason.kind === "max-tokens";
+              span?.finish(
+                ok,
+                ok ? void 0 : reason.failure?.code,
+                pendingUsage === void 0 ? void 0 : {
+                  inputTokens: pendingUsage.inputTokens,
+                  outputTokens: pendingUsage.outputTokens,
+                  ...pendingUsage.cacheReadTokens === void 0 ? {} : { cacheReadTokens: pendingUsage.cacheReadTokens }
+                }
+              );
             }
             yield result.value;
           }
@@ -76833,11 +76891,14 @@ var OpencodeGoAdapter = class extends LlmAdapter {
         }
       } catch (error) {
         if (timedOut || timeoutOf(watchdog.signal, "LLM_STREAM_IDLE_TIMEOUT") !== void 0) {
+          span?.finish(false, "TIMEOUT");
           throw new LlmError8("opencode-go stream idle timeout", "TIMEOUT", { cause: error });
         }
         if (options.signal?.aborted) {
+          span?.finish(false, "ABORTED");
           throw new LlmError8("opencode-go request aborted by caller", "ABORTED", { cause: error });
         }
+        span?.finish(false, error instanceof LlmError8 ? error.code : void 0);
         throw error;
       } finally {
         consumer.abort("opencode-go stream consumer stopped");
@@ -76930,7 +76991,7 @@ function parseCatalogReading(value) {
     throw new Error("invalid catalog reading");
   }
   const numbers = counts;
-  const count = (key) => {
+  const count2 = (key) => {
     const entry = numbers[key];
     if (typeof entry !== "number" || !Number.isFinite(entry) || entry < 0) throw new Error(`invalid catalog count "${key}"`);
     return entry;
@@ -76949,11 +77010,11 @@ function parseCatalogReading(value) {
     fetchedAtMs: row["fetchedAtMs"],
     quotaSource: quotaSource ?? "seed",
     counts: {
-      total: count("total"),
-      enabled: count("enabled"),
-      deprecated: count("deprecated"),
-      unconfigured: count("unconfigured"),
-      inferred: count("inferred")
+      total: count2("total"),
+      enabled: count2("enabled"),
+      deprecated: count2("deprecated"),
+      unconfigured: count2("unconfigured"),
+      inferred: count2("inferred")
     }
   };
 }
@@ -77022,6 +77083,106 @@ var networkRemote = {
   ]
 };
 
+// src/request-log/contract.ts
+function count(key, row, optional) {
+  const entry = row[key];
+  if (entry === void 0) {
+    if (optional === true) return void 0;
+    throw new Error(`invalid request-log entry "${key}"`);
+  }
+  if (typeof entry !== "number" || !Number.isFinite(entry) || entry < 0) {
+    throw new Error(`invalid request-log entry "${key}"`);
+  }
+  return entry;
+}
+function text(key, row, optional) {
+  const entry = row[key];
+  if (entry === void 0) {
+    if (optional === true) return void 0;
+    throw new Error(`invalid request-log entry "${key}"`);
+  }
+  if (typeof entry !== "string") throw new Error(`invalid request-log entry "${key}"`);
+  return entry;
+}
+function parseEntry(value) {
+  if (value === null || typeof value !== "object") throw new Error("invalid request-log entry");
+  const row = value;
+  const shape = row["shape"];
+  const headers = row["headers"];
+  return {
+    seq: count("seq", row),
+    atMs: count("atMs", row),
+    model: text("model", row),
+    session: text("session", row),
+    method: text("method", row),
+    url: text("url", row),
+    ...row["status"] === void 0 ? {} : { status: count("status", row) },
+    ...row["inputTokens"] === void 0 ? {} : { inputTokens: count("inputTokens", row) },
+    ...row["outputTokens"] === void 0 ? {} : { outputTokens: count("outputTokens", row) },
+    ...row["cacheReadTokens"] === void 0 ? {} : { cacheReadTokens: count("cacheReadTokens", row) },
+    ...row["durationMs"] === void 0 ? {} : { durationMs: count("durationMs", row) },
+    ...row["firstTokenMs"] === void 0 ? {} : { firstTokenMs: count("firstTokenMs", row) },
+    ok: row["ok"] === true,
+    ...typeof row["code"] === "string" ? { code: row["code"] } : {},
+    ...typeof row["poolKey"] === "string" ? { poolKey: row["poolKey"] } : {},
+    ...shape !== null && typeof shape === "object" ? {
+      shape: {
+        messages: count("messages", shape),
+        hasImage: shape["hasImage"] === true,
+        tools: count("tools", shape)
+      }
+    } : {},
+    ...headers !== null && typeof headers === "object" ? {
+      headers: {
+        ...typeof headers["session"] === "string" ? { session: headers["session"] } : {},
+        ...typeof headers["userAgent"] === "string" ? { userAgent: headers["userAgent"] } : {}
+      }
+    } : {}
+  };
+}
+function parsePoolEvent(value) {
+  if (value === null || typeof value !== "object") throw new Error("invalid request-log pool event");
+  const row = value;
+  const type = row["type"];
+  if (type !== "create" && type !== "close") throw new Error("invalid request-log pool event");
+  return { atMs: count("atMs", row), type, key: text("key", row) };
+}
+function parseRequestLogSnapshot(value) {
+  if (value === null || typeof value !== "object") throw new Error("invalid request-log snapshot");
+  const row = value;
+  if (!Array.isArray(row["entries"]) || !Array.isArray(row["poolEvents"])) {
+    throw new Error("invalid request-log snapshot");
+  }
+  return {
+    entries: row["entries"].map(parseEntry),
+    poolEvents: row["poolEvents"].map(parsePoolEvent),
+    totalRecords: count("totalRecords", row),
+    droppedRecords: count("droppedRecords", row),
+    newConnections: count("newConnections", row),
+    ...typeof row["poolKey"] === "string" ? { poolKey: row["poolKey"] } : {}
+  };
+}
+var codec3 = {
+  mode: "strict",
+  typeSymbol: "@dan-ai-studio/dshopencodego#RequestLogSnapshot",
+  schema: { parse: parseRequestLogSnapshot },
+  create: () => ({ parse: parseRequestLogSnapshot })
+};
+var requestLogRemote = {
+  package: "@dan-ai-studio/dshopencodego",
+  descriptors: [
+    {
+      id: "@dan-ai-studio/dshopencodego#opencodeGoRequestLog/readLog",
+      service: "opencodeGoRequestLog",
+      namespace: "opencodeGoRequestLog",
+      method: "readLog",
+      invocation: { kind: "direct" },
+      parameters: [],
+      result: codec3
+    }
+  ]
+};
+
 // src/update/contract.ts
 function parseUpdateStatus(value) {
   if (value === null || typeof value !== "object") throw new Error("invalid update reading");
@@ -77041,7 +77202,7 @@ function parseUpdateStatus(value) {
     checked: row["checked"]
   };
 }
-var codec3 = (typeSymbol, parse) => ({
+var codec4 = (typeSymbol, parse) => ({
   mode: "strict",
   typeSymbol,
   schema: { parse },
@@ -77057,7 +77218,7 @@ var updateRemote = {
       method: "readUpdate",
       invocation: { kind: "direct" },
       parameters: [],
-      result: codec3("@dan-ai-studio/dshopencodego#UpdateStatus", parseUpdateStatus)
+      result: codec4("@dan-ai-studio/dshopencodego#UpdateStatus", parseUpdateStatus)
     },
     {
       id: "@dan-ai-studio/dshopencodego#opencodeGoUpdate/refreshUpdate",
@@ -77066,7 +77227,7 @@ var updateRemote = {
       method: "refreshUpdate",
       invocation: { kind: "direct" },
       parameters: [],
-      result: codec3("@dan-ai-studio/dshopencodego#UpdateStatus", parseUpdateStatus)
+      result: codec4("@dan-ai-studio/dshopencodego#UpdateStatus", parseUpdateStatus)
     }
   ]
 };
@@ -77093,22 +77254,22 @@ function parseUsageWindows(value) {
 function parseTotals(value) {
   if (value === null || typeof value !== "object") throw new Error("invalid meter totals");
   const row = value;
-  const count = (key) => {
+  const count2 = (key) => {
     const entry = row[key];
     if (typeof entry !== "number" || !Number.isFinite(entry) || entry < 0) throw new Error(`invalid meter field "${key}"`);
     return entry;
   };
-  const optionalCount = (key) => row[key] === void 0 ? void 0 : count(key);
+  const optionalCount = (key) => row[key] === void 0 ? void 0 : count2(key);
   const reasoningTokens = optionalCount("reasoningTokens");
   const estimatedUSD = optionalCount("estimatedUSD");
   const unpricedTokens = optionalCount("unpricedTokens");
   return {
-    calls: count("calls"),
-    inputTokens: count("inputTokens"),
-    outputTokens: count("outputTokens"),
-    cacheReadTokens: count("cacheReadTokens"),
-    cacheWriteTokens: count("cacheWriteTokens"),
-    totalTokens: count("totalTokens"),
+    calls: count2("calls"),
+    inputTokens: count2("inputTokens"),
+    outputTokens: count2("outputTokens"),
+    cacheReadTokens: count2("cacheReadTokens"),
+    cacheWriteTokens: count2("cacheWriteTokens"),
+    totalTokens: count2("totalTokens"),
     ...reasoningTokens === void 0 ? {} : { reasoningTokens },
     ...estimatedUSD === void 0 ? {} : { estimatedUSD },
     ...unpricedTokens === void 0 ? {} : { unpricedTokens }
@@ -77132,7 +77293,7 @@ function parseGoMeter(value) {
     })
   };
 }
-var codec4 = (typeSymbol, parse) => ({
+var codec5 = (typeSymbol, parse) => ({
   mode: "strict",
   typeSymbol,
   schema: { parse },
@@ -77148,7 +77309,7 @@ var usageRemote = {
       method: "readWindows",
       invocation: { kind: "direct" },
       parameters: [],
-      result: codec4("@dan-ai-studio/dshopencodego#GoUsageWindows", parseUsageWindows)
+      result: codec5("@dan-ai-studio/dshopencodego#GoUsageWindows", parseUsageWindows)
     },
     {
       id: "@dan-ai-studio/dshopencodego#opencodeGoUsage/readMeter",
@@ -77157,7 +77318,7 @@ var usageRemote = {
       method: "readMeter",
       invocation: { kind: "direct" },
       parameters: [],
-      result: codec4("@dan-ai-studio/dshopencodego#GoMeter", parseGoMeter)
+      result: codec5("@dan-ai-studio/dshopencodego#GoMeter", parseGoMeter)
     }
   ]
 };
@@ -77169,7 +77330,8 @@ var contribution = {
     ...usageRemote.descriptors,
     ...catalogRemote.descriptors,
     ...updateRemote.descriptors,
-    ...networkRemote.descriptors
+    ...networkRemote.descriptors,
+    ...requestLogRemote.descriptors
   ]
 };
 function registerRemotes(ctx) {
@@ -77339,21 +77501,30 @@ function pinnedLookup(address) {
   };
 }
 var current;
+var observer;
+function observePool(next) {
+  observer = next;
+}
 function dispatcherFor(host, address, keepAliveTimeoutMs) {
   const key = `${host}@${address}@${String(keepAliveTimeoutMs)}`;
   if (current?.key === key) return current.agent;
-  void current?.agent.close();
+  const previous = current;
+  void previous?.agent.close();
+  if (previous !== void 0) observer?.close(previous.key);
   const agent = new import_undici.Agent({
     connect: { lookup: pinnedLookup(address) },
     keepAliveTimeout: keepAliveTimeoutMs,
     keepAliveMaxTimeout: keepAliveTimeoutMs
   });
   current = { key, agent };
+  observer?.create(key);
   return agent;
 }
 async function closeDispatcher() {
   const agent = current?.agent;
+  const key = current?.key;
   current = void 0;
+  if (key !== void 0) observer?.close(key);
   if (agent !== void 0) await agent.close();
 }
 var SPENT_ADDRESS_CODES = /* @__PURE__ */ new Set([
@@ -77469,6 +77640,148 @@ var OpencodeGoNetworkService = class extends TypertRemoteService2 {
   }
 };
 
+// src/request-log/service.ts
+import { TypertRemoteService as TypertRemoteService3 } from "@deepseek-ai/dsh-typert-protocol";
+var OpencodeGoRequestLogService = class extends TypertRemoteService3 {
+  options;
+  constructor(ctx, options) {
+    super(ctx, "opencodeGoRequestLog");
+    this.options = options;
+  }
+  /** The current reading, trimmed to the configured bound first. */
+  readLog() {
+    this.options.log.setMaxEntries(this.options.maxEntries());
+    return this.options.log.snapshot();
+  }
+};
+
+// src/request-log/store.ts
+var SESSION_PREFIX_LENGTH = 8;
+var MAX_POOL_EVENTS = 20;
+var RequestLog = class {
+  gates;
+  entries = [];
+  poolEvents = [];
+  seq = 0;
+  totalRecords = 0;
+  droppedRecords = 0;
+  newConnections = 0;
+  poolKey;
+  constructor(gates) {
+    this.gates = gates;
+  }
+  /**
+   * Count one accepted socket. Called from the diagnostics channel, not the
+   * request path, so its cost never lands on a request.
+   */
+  connectionOpened() {
+    this.newConnections += 1;
+  }
+  /**
+   * Record one pool lifecycle event. Pools live for minutes, so this is rare
+   * by construction; still gated on debug so the common log stays request-only.
+   */
+  poolEvent(type, key) {
+    if (!this.gates.enabled() || !this.gates.debug()) return;
+    this.poolKey = type === "create" ? key : this.poolKey;
+    if (type === "close" && this.poolKey === key) this.poolKey = void 0;
+    this.poolEvents = [{ atMs: Date.now(), type, key }, ...this.poolEvents].slice(0, MAX_POOL_EVENTS);
+  }
+  /**
+   * Begin one request's span, or nothing when the log is disabled.
+   *
+   * This is the single gate on the request path: a disabled log costs one
+   * method call and one boolean read, and constructs nothing.
+   */
+  start(detail) {
+    if (!this.gates.enabled()) return void 0;
+    const debug = this.gates.debug();
+    const startedAt = Date.now();
+    const full = detail.sessionId ?? "";
+    const session = debug || full.length === 0 ? full : full.slice(0, SESSION_PREFIX_LENGTH);
+    let firstTokenAt;
+    let method;
+    let url;
+    let status;
+    let finished = false;
+    return {
+      firstToken: () => {
+        if (firstTokenAt === void 0) firstTokenAt = Date.now();
+      },
+      request: (nextMethod, nextUrl) => {
+        if (method === void 0) {
+          method = nextMethod;
+          url = nextUrl;
+        }
+      },
+      status: (value) => {
+        status = value;
+      },
+      finish: (ok, code, usage) => {
+        if (finished) return;
+        finished = true;
+        const endedAt = Date.now();
+        const entry = {
+          seq: ++this.seq,
+          atMs: startedAt,
+          model: detail.model,
+          session,
+          method: method ?? detail.method ?? "POST",
+          url: url ?? detail.url ?? "",
+          ...status === void 0 ? {} : { status },
+          ...usage === void 0 ? {} : {
+            inputTokens: usage.inputTokens,
+            outputTokens: usage.outputTokens,
+            ...usage.cacheReadTokens === void 0 || usage.cacheReadTokens <= 0 ? {} : { cacheReadTokens: usage.cacheReadTokens }
+          },
+          durationMs: Math.max(0, endedAt - startedAt),
+          ...firstTokenAt === void 0 ? {} : { firstTokenMs: Math.max(0, firstTokenAt - startedAt) },
+          ok,
+          ...code === void 0 ? {} : { code },
+          // The pool in force when the request finished. Pool switches are
+          // rare enough that attributing the finishing pool is honest; the
+          // create/close events carry the exact history.
+          ...this.poolKey === void 0 ? {} : { poolKey: this.poolKey },
+          shape: { messages: detail.messageCount, hasImage: detail.hasImage, tools: detail.toolCount },
+          ...!debug ? {} : {
+            headers: {
+              ...detail.headers.session === void 0 ? {} : { session: detail.headers.session },
+              ...detail.headers.userAgent === void 0 ? {} : { userAgent: detail.headers.userAgent }
+            }
+          }
+        };
+        this.append(entry);
+      }
+    };
+  }
+  append(entry) {
+    this.totalRecords += 1;
+    const bound = Math.max(1, Math.floor(this.gates.maxEntries()));
+    const next = [entry, ...this.entries].slice(0, bound);
+    this.droppedRecords += this.entries.length + 1 - next.length;
+    this.entries = next;
+  }
+  /** Shrink the ring to a new bound immediately; growing backfills nothing. */
+  setMaxEntries(bound) {
+    if (!Number.isSafeInteger(bound) || bound < 1) return;
+    if (this.entries.length > bound) {
+      this.droppedRecords += this.entries.length - bound;
+      this.entries = this.entries.slice(0, bound);
+    }
+  }
+  /** The current reading, newest first. Computed lazily: nothing on the hot path. */
+  snapshot() {
+    return {
+      entries: this.entries,
+      poolEvents: this.poolEvents,
+      totalRecords: this.totalRecords,
+      droppedRecords: this.droppedRecords,
+      newConnections: this.newConnections,
+      ...this.poolKey === void 0 ? {} : { poolKey: this.poolKey }
+    };
+  }
+};
+
 // src/update/check.ts
 var PACKAGE_NAME = "@dan-ai-studio/dshopencodego";
 var REGISTRY_LATEST_URL = `https://registry.npmjs.org/${encodeURIComponent(PACKAGE_NAME)}/latest`;
@@ -77562,11 +77875,11 @@ function createUpdateChecker(deps) {
 }
 
 // src/update/version.ts
-var PLUGIN_VERSION = true ? "0.1.63" : "0.0.0-dev";
+var PLUGIN_VERSION = true ? "0.1.64" : "0.0.0-dev";
 
 // src/update/service.ts
-import { TypertRemoteService as TypertRemoteService3 } from "@deepseek-ai/dsh-typert-protocol";
-var OpencodeGoUpdateService = class extends TypertRemoteService3 {
+import { TypertRemoteService as TypertRemoteService4 } from "@deepseek-ai/dsh-typert-protocol";
+var OpencodeGoUpdateService = class extends TypertRemoteService4 {
   check;
   constructor(ctx, options) {
     super(ctx, "opencodeGoUpdate");
@@ -77646,7 +77959,7 @@ async function readUsageWindows(options) {
 
 // src/usage/service.ts
 import { randomUUID as randomUUID3 } from "node:crypto";
-import { RemoteError as RemoteError2, TypertRemoteService as TypertRemoteService4 } from "@deepseek-ai/dsh-typert-protocol";
+import { RemoteError as RemoteError2, TypertRemoteService as TypertRemoteService5 } from "@deepseek-ai/dsh-typert-protocol";
 import { LlmError as LlmError11 } from "@deepseek-ai/dsh-llm";
 function usageFailure(error, source) {
   const missing = error instanceof LlmError11 && error.code === "MISSING_CREDENTIAL";
@@ -77657,7 +77970,7 @@ function usageFailure(error, source) {
     { cause: error }
   );
 }
-var OpencodeGoUsageService = class extends TypertRemoteService4 {
+var OpencodeGoUsageService = class extends TypertRemoteService5 {
   identity;
   options;
   constructor(ctx, options) {
@@ -77732,6 +78045,29 @@ function apply(ctx, raw) {
   };
   const meter = new UsageMeter();
   const cacheDir = resolveCacheDir(ctx);
+  const requestLog = new RequestLog({
+    enabled: () => current2().requestLogEnabled,
+    debug: () => current2().requestLogDebug,
+    maxEntries: () => current2().requestLogMaxEntries
+  });
+  observePool({
+    create: (key) => {
+      requestLog.poolEvent("create", key);
+    },
+    close: (key) => {
+      requestLog.poolEvent("close", key);
+    }
+  });
+  ctx.effect(() => {
+    const channel = dc.channel("undici:client:connected");
+    const onConnect = () => {
+      requestLog.connectionOpened();
+    };
+    channel.subscribe(onConnect);
+    return () => {
+      channel.unsubscribe(onConnect);
+    };
+  }, "dshopencodego: connection counter");
   const gatewayRequest = () => gatewayFetch(
     resolveGatewayPin(current2().pinnedAddresses, current2().baseURL),
     current2().keepAliveTimeoutMs
@@ -77760,7 +78096,8 @@ function apply(ctx, raw) {
     },
     onUsage: ({ model, usage }) => {
       meter.record(model, usage);
-    }
+    },
+    requestLog
   });
   registerRemotes(ctx);
   ctx.plugin(OpencodeGoUsageService, {
@@ -77769,6 +78106,10 @@ function apply(ctx, raw) {
     meter,
     fetch: gatewayRequest
   });
+  ctx.plugin(OpencodeGoRequestLogService, {
+    log: requestLog,
+    maxEntries: () => current2().requestLogMaxEntries
+  });
   ctx.plugin(OpencodeGoNetworkService, {
     baseURL: () => current2().baseURL,
     pinnedAddresses: () => current2().pinnedAddresses