@toddzheng024/dscode-bundle 0.7.2 → 0.7.3

package/plugins/session-metrics/index.mjs

@@ -1,9 +1,14 @@
 import { randomUUID } from 'node:crypto';
 import { appendMetric } from './store.mjs';
-import { estimateCost, PRICE_VERSION } from './pricing.mjs';
+import { estimateCost, priceVersionFor } from './pricing.mjs';
 import { setMetricSource } from './view.mjs';
-import { refreshBalance } from './balance.mjs';
+import { BALANCE_PROVIDERS, refreshBalance } from './balance.mjs';
+import { providerSpec } from '../providers/catalog.mjs';
 import { createWindowRate } from './rate.mjs';
+import { currentCharge } from './attribution.mjs';
+
+// Chunks that carry generated output; the first one marks time to first token.
+const OUTPUT_CHUNKS = new Set(['text-delta', 'reasoning-delta', 'tool-call-delta']);
 export const name = 'dscode-session-metrics';
 export const inject = ['llm', 'agents', 'tokenMeter', 'sessionProjections'];
 export function apply(ctx) {
@@ -26,42 +31,49 @@ export function apply(ctx) {
   // inject the credentials service, so a missing one cannot fail startup), keep
   // the request on a five-minute cache, and never let it reach the render path.
   const credentials = ctx.get?.('credentials');
-  const refresh = async () => {
+  const refresh = () => Promise.all(BALANCE_PROVIDERS.map(async provider => {
     try {
-      const resolved = await credentials?.resolve?.('DEEPSEEK_API_KEY');
+      const ref = providerSpec(provider).credentialRef;
+      const resolved = await credentials?.resolve?.(ref);
       const key = typeof resolved === 'string' ? resolved : resolved?.value;
-      await refreshBalance({ key: key ?? process.env.DEEPSEEK_API_KEY });
+      await refreshBalance({ provider, key: key ?? process.env[ref] });
     } catch {
       /* balance stays unknown */
     }
-  };
+  }));
   refresh();
   const balanceTimer = setInterval(refresh, 5 * 60 * 1000);
   if (typeof balanceTimer.unref === 'function') balanceTimer.unref();
   ctx.effect(() => () => clearInterval(balanceTimer));
   const record = (id, entry) => { try { appendMetric(home, id, entry); } catch { ctx.logger.warn('Session cost telemetry could not be saved.'); } };
   ctx.on('llm/stream', async function* (options, next) {
-    if (!options.sessionId || !home) { yield* next(); return; }
+    // Plugin calls made for a session carry no sessionId on the wire; they are charged through the async context.
+    const charge = options.sessionId ? undefined : currentCharge();
+    const sessionId = options.sessionId ?? charge?.sessionId;
+    if (!sessionId || !home) { yield* next(); return; }
     const id = randomUUID(), time = Date.now();
-    const recipients = new Set([options.sessionId]);
-    let child = ctx.agents.get(options.sessionId);
+    const purpose = options.purpose ?? charge?.purpose ?? 'agent';
+    const recipients = new Set([sessionId]);
+    let child = ctx.agents.get(sessionId);
     while (child?.session.header.origin === 'subagent' && child.session.header.parentSession && !recipients.has(child.session.header.parentSession)) {
       recipients.add(child.session.header.parentSession);
       child = ctx.agents.get(child.session.header.parentSession);
     }
-    const save = entry => { for (const recipient of recipients) record(recipient, { ...entry, sessionId: options.sessionId }); };
-    save( { kind: 'start', id, time, provider: options.provider, model: options.model, purpose: options.purpose ?? 'agent' });
-    let usage;
-    const liveSession = !options.purpose || options.purpose === 'agent' ? ctx.agents.get(options.sessionId)?.session : undefined;
+    const save = entry => { for (const recipient of recipients) record(recipient, { ...entry, sessionId }); };
+    save({ kind: 'start', id, time, provider: options.provider, model: options.model, purpose });
+    let usage, firstTokenTime;
+    const liveSession = purpose === 'agent' ? ctx.agents.get(sessionId)?.session : undefined;
     try {
       for await (const chunk of next()) {
         if (chunk.type === 'usage') usage = chunk.usage;
+        else if (firstTokenTime === undefined && OUTPUT_CHUNKS.has(chunk.type)) firstTokenTime = Date.now();
         if (liveSession) liveRate.add(liveSession, chunk);
         yield chunk;
       }
     } finally {
       if (liveSession) liveRate.calibrate(liveSession, usage?.outputTokens);
-      save({ kind: 'end', id, time, usage: usage ?? null, cost: estimateCost(options.provider, options.model, usage, time), priceVersion: PRICE_VERSION });
+      // `time` stays the start (it prices the call); `endTime` and `firstTokenTime` time it.
+      save({ kind: 'end', id, time, endTime: Date.now(), ...(firstTokenTime === undefined ? {} : { firstTokenTime }), usage: usage ?? null, cost: estimateCost(options.provider, options.model, usage, time), priceVersion: priceVersionFor(options.provider) });
     }
   });
 }

package/plugins/session-metrics/pricing.mjs

@@ -2,18 +2,38 @@
 // https://api-docs.deepseek.com/quick_start/pricing/
 export const PRICE_SOURCE = 'https://api-docs.deepseek.com/quick_start/pricing/';
 export const PRICE_VERSION = 'deepseek-2026-09-11';
+// OpenRouter list prices for the DeepSeek models `/provider openrouter` declares,
+// from the pinned pi-ai 0.85.1 catalog (its OpenRouter /models snapshot).
+// OpenRouter bills no peak window. [cache read, input, output].
+export const OPENROUTER_PRICE_VERSION = 'openrouter-pi-ai-0.85.1';
+const OPENROUTER_PRICES = {
+  'deepseek/deepseek-v4-flash': [0.017052, 0.08526, 0.17052],
+  'deepseek/deepseek-v4-pro': [0.074196, 0.890358, 1.780716],
+  'deepseek/deepseek-v4-flash-vision-exp': [0.007, 0.22, 0.66],
+};
+
+/** The price table a provider's ledger entries are estimated with. */
+export function priceVersionFor(provider) {
+  return provider === 'openrouter' ? OPENROUTER_PRICE_VERSION : PRICE_VERSION;
+}
+
 export function estimateCost(provider, model, usage, time) {
-  if (provider !== 'deepseek-official' || !usage || !Number.isFinite(time)) return null;
+  if (!usage || !Number.isFinite(time)) return null;
+  if (provider === 'openrouter') return OPENROUTER_PRICES[model] ? charge(usage, OPENROUTER_PRICES[model]) : null;
+  if (provider !== 'deepseek-official') return null;
   // Earlier requests require an older price table; never back-price them at today's rate.
   if (time < Date.UTC(2026, 8, 11)) return null;
   const flash = ['deepseek-flash', 'deepseek-v4-flash', 'deepseek-v4-flash-vision-exp'].includes(model)
     || model === 'deepseek-v4-pro' && time >= Date.UTC(2026, 8, 14, 4);
   if (!flash && model !== 'deepseek-v4-pro') return null;
-  const peak = isPeak(time);
-  const [read, input, output] = flash ? [0.003, 0.15, 0.6] : [0.022, 0.66, 1.98];
+  const cost = charge(usage, flash ? [0.003, 0.15, 0.6] : [0.022, 0.66, 1.98]);
+  return cost === null ? null : cost * (isPeak(time) ? 2 : 1);
+}
+
+function charge(usage, [read, input, output]) {
   const values = [usage.inputTokens, usage.outputTokens, usage.cacheReadTokens ?? 0, usage.cacheWriteTokens ?? 0];
   if (!values.every(n => Number.isFinite(n) && n >= 0) || values[3] !== 0) return null;
-  return (values[0] * input + values[1] * output + values[2] * read) * (peak ? 2 : 1) / 1e6;
+  return (values[0] * input + values[1] * output + values[2] * read) / 1e6;
 }
 
 /**

package/plugins/session-metrics/view.mjs

@@ -3,6 +3,7 @@ import { t } from '../i18n/messages.mjs';
 import { estimateCost, peakEmoji } from './pricing.mjs';
 import { balanceNow, trustedNow } from './balance.mjs';
 import { sessionAverageTps } from './rate.mjs';
+import { providerOfHeader } from '../providers/catalog.mjs';
 let source;
 export function setMetricSource(next) { source = next; return () => { if (source === next) source = undefined; }; }
 export function summarize(rows, events = [], corrupt = false) {
@@ -44,13 +45,14 @@ export function displayWidth(text) {
   for (const char of text) width += /[\u1100-\u115f\u2e80-\ua4cf\uac00-\ud7a3\uf900-\ufaff\ufe30-\ufe4f\uff00-\uff60\uffe0-\uffe6\u2600-\u27bf\u{1f300}-\u{1faff}]/u.test(char) ? 2 : 1;
   return width;
 }
-export function formatFooter(metrics, context, columns = 80, rates, locale = 'en', header = '') {
+export function formatFooter(metrics, context, columns = 80, rates, locale = 'en', header = '', provider = providerOfHeader(header) ?? 'deepseek-official') {
   const label = key => t(locale, key);
   const ctx = Number.isFinite(context) ? `${Math.round(context)}%` : '--';
   const cache = metrics.cache === null ? '--' : `${metrics.cache.toFixed(1)}%`;
-  const balance = balanceNow();
+  // The balance belongs to the provider the header names; only DeepSeek's official route bills by a peak window.
+  const balance = balanceNow(provider);
   const spend = metrics.unknown && metrics.cost === 0 ? '--' : `$${metrics.cost.toFixed(2)}${metrics.unknown ? '+' : ''}${metrics.pending ? '…' : ''}`;
-  const dollars = `${spend} / ${balance === null ? '$--' : '$' + balance.toFixed(2)} ${peakEmoji(trustedNow())}`;
+  const dollars = `${spend} / ${balance === null ? '$--' : '$' + balance.toFixed(2)}${provider === 'deepseek-official' ? ' ' + peakEmoji(trustedNow()) : ''}`;
   const base = rates ? [
     `${label('footer.current')}: ${Number.isFinite(rates.current) ? '~' + rates.current.toFixed(1) : '--'} tps`,
     `${label('footer.average')}: ${Number.isFinite(rates.average) ? rates.average.toFixed(1) : '--'} tps`,

package/plugins/tui-tools/doctor.mjs

@@ -4,6 +4,7 @@ import { Logger } from '@deepseek-ai/cordis';
 import { BlockAssembler, createUserMessage } from '@deepseek-ai/dsh-llm';
 import { redact } from '../auto-review/policy.mjs';
 import { t, readLanguage } from '../i18n/messages.mjs';
+import { chargeTo } from '../session-metrics/attribution.mjs';
 const L = (key, params) => t(readLanguage(), key, params);
 
 const MAX_LOG_BYTES = 1024 * 1024;
@@ -118,7 +119,7 @@ export function localDoctorReport(evidence) {
   return `${L('doctor.evidence', { traces: evidence.traces.length, logs: evidence.logs.length })}${evidence.logs.length ? '' : evidence.logCoverage ?? ''}\n${local.length ? local.slice(-8).join('\n') : L('doctor.noFindings')}\n${near300.length >= 2 ? `${L('doctor.nearTimeout', { count: near300.length })}\n` : ''}${evidence.logs.slice(-5).map(l => `${time(l.time)} ${l.level} ${l.source}: ${l.detail}`).join('\n')}`;
 }
 
-export async function analyzeDoctorEvidence(ctx, evidence, route, signal, { model = true } = {}) {
+export async function analyzeDoctorEvidence(ctx, evidence, route, signal, { model = true, sessionId } = {}) {
   const fallback = localDoctorReport(evidence);
   if (!model) return fallback;
   if (!route?.provider || !route?.model) return `${fallback}\n${L('doctor.noRoute')}`;
@@ -126,11 +127,13 @@ export async function analyzeDoctorEvidence(ctx, evidence, route, signal, { mode
   const deadline = AbortSignal.any([signal ?? new AbortController().signal, AbortSignal.timeout(45000)]);
   try {
     let finished = false;
-    for await (const chunk of ctx.llm.stream({ provider: route.provider, model: route.model, reasoningEffort: 'low', maxTokens: 4096, system: SYSTEM,
-      messages: [createUserMessage({ content: [{ type: 'text', text: JSON.stringify(evidence) }], source: { kind: 'plugin', plugin: 'dscode-doctor' } })], signal: deadline })) {
-      deadline.throwIfAborted(); assembler.push(chunk);
-      if (chunk.type === 'finish') finished = true;
-    }
+    await chargeTo(sessionId, 'doctor', async () => {
+      for await (const chunk of ctx.llm.stream({ provider: route.provider, model: route.model, reasoningEffort: 'low', maxTokens: 4096, system: SYSTEM,
+        messages: [createUserMessage({ content: [{ type: 'text', text: JSON.stringify(evidence) }], source: { kind: 'plugin', plugin: 'dscode-doctor' } })], signal: deadline })) {
+        deadline.throwIfAborted(); assembler.push(chunk);
+        if (chunk.type === 'finish') finished = true;
+      }
+    });
     if (!finished || assembler.finish.kind !== 'stop') throw Error(`model response was incomplete (${safe(JSON.stringify(assembler.finish ?? { kind: 'no finish' }))})`);
     const blocks = assembler.blocks();
     if (blocks.some(b => !['text', 'reasoning'].includes(b.type))) throw Error('model returned unexpected tool output');

package/plugins/tui-tools/index.mjs

@@ -92,7 +92,7 @@ export function apply(ctx) {
       `Session: ${session.id}`, `Workspace: ${session.header.cwd ?? process.cwd()}`,
       `Agent: ${agent.status} | preset: ${session.header.agentPreset ?? 'standard'}`,
       `Model: ${route?.provider ?? 'default'} / ${route?.model ?? 'default'}`,
-      `Effort: ${route?.reasoningEffort ?? 'model default'}${route?.reasoningEffort === 'ultra' ? ' (DeepSeek wire: max; collaboration enabled)' : ''}`,
+      `Effort: ${route?.reasoningEffort ?? 'model default'}${route?.reasoningEffort === 'ultra' ? ` (${route.provider === 'openrouter' ? 'OpenRouter wire: xhigh' : 'DeepSeek wire: max'}; collaboration enabled)` : ''}`,
       `Permission: ${show(ctx.permissionPresets.current(session))}`,
       `Tokens: ${show(usage ?? 'no provider usage yet')}`,
       `Context: ${pressure?.pressureTokens ?? pressure?.surfaceTokens ?? '?'} / ${pressure?.contextWindow ?? '?'} tokens`,
@@ -120,7 +120,7 @@ export function apply(ctx) {
     const evidence = await collectDoctorEvidence(ctx, { agent, signal });
     if (action === 'preview') return ok(JSON.stringify(evidence, null, 2));
     const route = agent.session.requestHeader()?.config ?? agent.options;
-    return ok(`${health}\n\n${await analyzeDoctorEvidence(ctx, evidence, route, signal, { model: action !== 'local' })}`);
+    return ok(`${health}\n\n${await analyzeDoctorEvidence(ctx, evidence, route, signal, { model: action !== 'local', sessionId: agent.session.id })}`);
   });
   register('mcp', 'MCP list, tools <id>, enable/disable/reconnect <id>', async ({ agent, rawInput }) => {
     const [action = 'list', id, extra] = rawInput.trim().split(/\s+/).filter(Boolean);

package/plugins/ultra/policy.mjs

@@ -16,6 +16,22 @@ export function flashRequest(options, messages) {
   return copy;
 }
 
+/**
+ * The same shaping for pi-ai routes (OpenRouter), on harness-format options:
+ * Ultra sends max and adds the collaboration policy; below Ultra the delegation
+ * tools are not offered. Returns a copy; the logged input is never mutated.
+ */
+export function piAiRequest(options) {
+  const ultra = options.reasoningEffort === 'ultra';
+  const hidden = ultra ? ['workflow', 'ralph'] : ['subagent', 'subagent_fork', 'workflow', 'ralph'];
+  const next = { ...options, ...(options.tools ? { tools: options.tools.filter(tool => !hidden.includes(tool.name)) } : {}), ...(ultra ? { reasoningEffort: 'max' } : {}) };
+  if (!ultra || options.purpose || !options.tools?.some(t => t.name === 'subagent' || t.name === 'subagent_fork')) return next;
+  if (typeof next.system === 'string') return { ...next, system: next.system + '\n\n' + ULTRA_POLICY };
+  const [first, ...rest] = next.messages ?? [];
+  if (first?.role === 'system' && Array.isArray(first.content)) return { ...next, messages: [{ ...first, content: [...first.content, { type: 'text', text: '\n\n' + ULTRA_POLICY }] }, ...rest] };
+  return { ...next, messages: [{ role: 'system', content: [{ type: 'text', text: ULTRA_POLICY }] }, ...(next.messages ?? [])] };
+}
+
 export function ultraRequest(options, messages) {
   if (options.reasoningEffort !== 'ultra' || options.purpose || !options.tools?.some(t => t.name === 'subagent' || t.name === 'subagent_fork')) return messages;
   const copy = messages.map(m => ({ ...m }));

package/vendor/pi-ai/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 DeepSeek
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.