@qduc/term2 0.19.0 → 0.21.0

package/dist/utils/output/trim-tool-output.js.map

@@ -1 +1 @@
-{"version":3,"file":"trim-tool-output.js","sourceRoot":"","sources":["../../../source/utils/output/trim-tool-output.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,MAAM,YAAY,GAAG,CAAC,KAAa,EAAkB,EAAE;IACrD,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,KAAa,EAAE,QAAiB,EAAE,aAAsB,EAAU,EAAE;IAC3F,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,UAAU,CAAC,KAAK,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;AACpD,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,KAAc,EAAE,QAAiB,EAAE,aAAsB,EAAW,EAAE;IAC7F,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,eAAe,CAAC,KAAK,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;IACzD,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC;IAC/E,CAAC;IAED,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACvC,MAAM,MAAM,GAAG,KAAgC,CAAC;QAChD,MAAM,IAAI,GAA4B,EAAE,CAAC;QACzC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAClD,IAAI,CAAC,GAAG,CAAC,GAAG,eAAe,CAAC,KAAK,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;QAC9D,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,MAAe,EAAE,QAAiB,EAAE,aAAsB,EAAU,EAAE;IACnG,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC/B,OAAO,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACpC,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QACpB,MAAM,OAAO,GAAG,eAAe,CAAC,MAAM,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;QACjE,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACjC,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,eAAe,CAAC,MAAM,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;IAED,OAAO,eAAe,CAAC,MAAM,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;AAC1D,CAAC,CAAC"}
+{"version":3,"file":"trim-tool-output.js","sourceRoot":"","sources":["../../../source/utils/output/trim-tool-output.ts"],"names":[],"mappings":"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"}

package/dist/utils/resume-list.d.ts

@@ -1,10 +1,12 @@
 import type { SavedAppMode } from '../services/conversation/conversation-persistence-types.js';
 interface ConversationListEntry {
     id: string;
+    shortRef?: string;
     updatedAt: string;
     projectPath?: string;
     sshHost?: string;
     firstUserMessage?: string;
+    activeProfileId?: string;
     appMode?: SavedAppMode;
     model?: string;
     provider?: string;

package/dist/utils/resume-list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resume-list.d.ts","sourceRoot":"","sources":["../../source/utils/resume-list.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4DAA4D,CAAC;AAE/F,UAAU,qBAAqB;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAWD,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,qBAAqB,EAAE,EAChC,OAAO,GAAE;IAAE,aAAa,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,MAAM,CAAA;CAAO,GACvD,MAAM,CA4DR"}
+{"version":3,"file":"resume-list.d.ts","sourceRoot":"","sources":["../../source/utils/resume-list.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4DAA4D,CAAC;AAI/F,UAAU,qBAAqB;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAMD,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,qBAAqB,EAAE,EAChC,OAAO,GAAE;IAAE,aAAa,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,MAAM,CAAA;CAAO,GACvD,MAAM,CA6DR"}

package/dist/utils/resume-list.js

@@ -1,17 +1,9 @@
 import chalk from 'chalk';
 import { getResumeCommand } from '../services/conversation/conversation-persistence.js';
-function getActiveMode(appMode) {
-    if (!appMode)
-        return 'standard';
-    if (appMode.orchestratorMode)
-        return 'orchestrator';
-    if (appMode.liteMode)
-        return 'lite';
-    if (appMode.planMode)
-        return 'plan';
-    if (appMode.mentorMode)
-        return 'mentor';
-    return 'standard';
+import { profileIdFromLegacyMode } from '../services/profiles/legacy-adapter.js';
+import { getProfileLabel } from '../services/profiles/labels.js';
+function getActiveMode(activeProfileId, appMode) {
+    return getProfileLabel(activeProfileId ?? profileIdFromLegacyMode(appMode));
 }
 export function formatResumeList(entries, options = {}) {
     if (entries.length === 0) {
@@ -22,7 +14,8 @@ export function formatResumeList(entries, options = {}) {
     lines.push('');
     entries.forEach((entry, index) => {
         const num = `${index + 1}.`;
-        const idStr = chalk.cyan.bold(entry.id);
+        const reference = entry.shortRef ?? entry.id;
+        const idStr = chalk.cyan.bold(reference === entry.id ? reference : `${reference} (${entry.id})`);
         let dateStr = entry.updatedAt;
         try {
             const d = new Date(entry.updatedAt);
@@ -48,7 +41,7 @@ export function formatResumeList(entries, options = {}) {
         if (entry.model) {
             metaParts.push(`model: ${entry.model}`);
         }
-        const activeMode = getActiveMode(entry.appMode);
+        const activeMode = getActiveMode(entry.activeProfileId, entry.appMode);
         if (activeMode !== 'standard') {
             metaParts.push(`mode: ${activeMode}`);
         }

package/dist/utils/resume-list.js.map

@@ -1 +1 @@
-{"version":3,"file":"resume-list.js","sourceRoot":"","sources":["../../source/utils/resume-list.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resume-list.js","sourceRoot":"","sources":["../../source/utils/resume-list.ts"],"names":[],"mappings":"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"}

package/dist/utils/settings-command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings-command.d.ts","sourceRoot":"","sources":["../../source/utils/settings-command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,KAAK,EACV,eAAe,EACf,mBAAmB,EAEpB,MAAM,0CAA0C,CAAC;AAgClD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAqBlD;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,mBAAmB,GAAG,MAAM,CAuO3E;AAED,UAAU,yBAAyB;IACjC,eAAe,EAAE,eAAe,CAAC;IACjC,gBAAgB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,mBAAmB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IACxD,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACvC;AAED,wBAAgB,qBAAqB,CAAC,EACpC,eAAe,EACf,gBAAgB,EAChB,mBAAmB,EACnB,YAAY,GACb,EAAE,yBAAyB,GAAG,YAAY,CA2I1C"}
+{"version":3,"file":"settings-command.d.ts","sourceRoot":"","sources":["../../source/utils/settings-command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,KAAK,EACV,eAAe,EACf,mBAAmB,EAEpB,MAAM,0CAA0C,CAAC;AA4ClD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAqBlD;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,mBAAmB,GAAG,MAAM,CA8R3E;AAED,UAAU,yBAAyB;IACjC,eAAe,EAAE,eAAe,CAAC;IACjC,gBAAgB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,mBAAmB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IACxD,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACvC;AAED,wBAAgB,qBAAqB,CAAC,EACpC,eAAe,EACf,gBAAgB,EAChB,mBAAmB,EACnB,YAAY,GACb,EAAE,yBAAyB,GAAG,YAAY,CAiK1C"}

package/dist/utils/settings-command.js

@@ -3,6 +3,8 @@ import { SETTING_KEYS } from '../services/settings/settings-service.js';
 import { getProvider } from '../providers/index.js';
 import { parseModelProviderArg } from './ai/model-provider-arg.js';
 import { getModelSettingConfig } from './ai/model-settings.js';
+import { profileIdFromLegacyModeSetting } from '../services/profiles/legacy-adapter.js';
+import { isLegacyModeSettingKey } from '../services/profiles/legacy-adapter.js';
 /**
  * Render the durable settlement of a mutation truthfully. Only a `saved`
  * result (or a caller that provided no settlement evidence) reports the
@@ -27,6 +29,12 @@ function formatDurableResetMessage(result, key) {
     }
     return `Reset ${key} to default`;
 }
+function canonicalProfileSetting(settingsService, key, value) {
+    if (!isLegacyModeSettingKey(key))
+        return { key, value };
+    const profileId = profileIdFromLegacyModeSetting(key, value, String(settingsService.get('app.activeProfileId')));
+    return profileId ? { key: 'app.activeProfileId', value: profileId } : { key, value };
+}
 export function parseSettingValue(raw) {
     const value = raw.trim();
     if (value.toLowerCase() === 'true')
@@ -222,11 +230,6 @@ export function formatSettingsSummary(settings) {
             value: settings.agent.backgroundCheckIn.intervalMs.value,
             source: settings.agent.backgroundCheckIn.intervalMs.source,
         },
-        {
-            key: SETTING_KEYS.AGENT_BACKGROUND_CHECK_IN_MAX_PER_TASK,
-            value: settings.agent.backgroundCheckIn.maxCheckInsPerTask.value,
-            source: settings.agent.backgroundCheckIn.maxCheckInsPerTask.source,
-        },
         {
             key: SETTING_KEYS.SHELL_TIMEOUT,
             value: settings.shell.timeout.value,
@@ -267,6 +270,66 @@ export function formatSettingsSummary(settings) {
             value: settings.subagent.asyncMessageCap.value,
             source: settings.subagent.asyncMessageCap.source,
         },
+        {
+            key: SETTING_KEYS.TOOLS_SHELL_ENABLED,
+            value: settings.tools.shell.enabled.value,
+            source: settings.tools.shell.enabled.source,
+        },
+        {
+            key: SETTING_KEYS.TOOLS_WEB_ENABLED,
+            value: settings.tools.web.enabled.value,
+            source: settings.tools.web.enabled.source,
+        },
+        {
+            key: SETTING_KEYS.TOOLS_FILE_READ_ENABLED,
+            value: settings.tools.fileRead.enabled.value,
+            source: settings.tools.fileRead.enabled.source,
+        },
+        {
+            key: SETTING_KEYS.TOOLS_FILE_WRITE_ENABLED,
+            value: settings.tools.fileWrite.enabled.value,
+            source: settings.tools.fileWrite.enabled.source,
+        },
+        {
+            key: SETTING_KEYS.TOOLS_MEMORY_ENABLED,
+            value: settings.tools.memory.enabled.value,
+            source: settings.tools.memory.enabled.source,
+        },
+        {
+            key: SETTING_KEYS.TOOLS_SESSIONS_ENABLED,
+            value: settings.tools.sessions.enabled.value,
+            source: settings.tools.sessions.enabled.source,
+        },
+        {
+            key: SETTING_KEYS.TOOLS_SKILLS_ENABLED,
+            value: settings.tools.skills.enabled.value,
+            source: settings.tools.skills.enabled.source,
+        },
+        {
+            key: SETTING_KEYS.TOOLS_MENTOR_ENABLED,
+            value: settings.tools.mentor.enabled.value,
+            source: settings.tools.mentor.enabled.source,
+        },
+        {
+            key: SETTING_KEYS.TOOLS_SUBAGENTS_ENABLED,
+            value: settings.tools.subagents.enabled.value,
+            source: settings.tools.subagents.enabled.source,
+        },
+        {
+            key: SETTING_KEYS.TOOLS_BACKGROUND_TASKS_ENABLED,
+            value: settings.tools.backgroundTasks.enabled.value,
+            source: settings.tools.backgroundTasks.enabled.source,
+        },
+        {
+            key: SETTING_KEYS.TOOLS_USER_INTERACTION_ENABLED,
+            value: settings.tools.userInteraction.enabled.value,
+            source: settings.tools.userInteraction.enabled.source,
+        },
+        {
+            key: SETTING_KEYS.TOOLS_CODE_CONTEXT_ENABLED,
+            value: settings.tools.codeContext.enabled.value,
+            source: settings.tools.codeContext.enabled.source,
+        },
         {
             key: SETTING_KEYS.MEMORY_ENABLED,
             value: settings.memory.enabled.value,
@@ -301,12 +364,20 @@ export function createSettingsCommand({ settingsService, addSystemMessage, apply
             }
             if (parts[0] === 'reset' && parts[1]) {
                 const keyToReset = parts.slice(1).join(' ');
+                const resetCanonical = keyToReset === 'app.activeProfileId'
+                    ? { key: keyToReset, value: 'builtin:standard' }
+                    : canonicalProfileSetting(settingsService, keyToReset, false);
+                const profileTransitionBeforeReset = applyRuntimeSetting &&
+                    resetCanonical.key === 'app.activeProfileId' &&
+                    settingsService.get('app.activeProfileId') !== resetCanonical.value;
+                if (profileTransitionBeforeReset)
+                    applyRuntimeSetting(resetCanonical.key, resetCanonical.value);
                 const durableResult = settingsService.reset(keyToReset);
                 addSystemMessage(formatDurableResetMessage(durableResult, keyToReset));
                 // Apply runtime effects if applicable after reset
                 const resetValue = settingsService.getDynamic(keyToReset);
-                if (applyRuntimeSetting && settingsService.isRuntimeModifiable(keyToReset)) {
-                    applyRuntimeSetting(keyToReset, resetValue);
+                if (applyRuntimeSetting && settingsService.isRuntimeModifiable(keyToReset) && !profileTransitionBeforeReset) {
+                    applyRuntimeSetting(resetCanonical.key, resetCanonical.key === 'app.activeProfileId' ? resetCanonical.value : resetValue);
                 }
                 if (keyToReset === SETTING_KEYS.AGENT_MAX_PARALLEL_TOOL_CALLS) {
                     addSystemMessage('agent.maxParallelToolCalls takes effect on the next request.');
@@ -382,14 +453,24 @@ export function createSettingsCommand({ settingsService, addSystemMessage, apply
                 addSystemMessage(`Cannot modify '${key}' at runtime. Restart required.`);
                 return true;
             }
-            const planWas = Boolean(settingsService.get(SETTING_KEYS.APP_PLAN_MODE));
-            const durableResult = settingsService.setDynamic(key, parsedValue);
-            if (applyRuntimeSetting) {
-                applyRuntimeSetting(key, parsedValue);
+            const canonical = canonicalProfileSetting(settingsService, key, parsedValue);
+            let durableResult;
+            const profileTransitionAlreadyApplied = applyRuntimeSetting &&
+                canonical.key === 'app.activeProfileId' &&
+                settingsService.get('app.activeProfileId') !== canonical.value;
+            if (profileTransitionAlreadyApplied) {
+                // Profile activation owns validation, canonical publication, runtime
+                // composition, and its single coherent notice. Fall back to the
+                // ordinary setter for lightweight test adapters that do not publish.
+                applyRuntimeSetting(canonical.key, canonical.value);
+                if (settingsService.get('app.activeProfileId') === canonical.value) {
+                    durableResult = settingsService.getLastDurableWrite?.();
+                }
             }
-            const planIs = Boolean(settingsService.get(SETTING_KEYS.APP_PLAN_MODE));
-            if (applyRuntimeSetting && key !== SETTING_KEYS.APP_PLAN_MODE && planWas !== planIs) {
-                applyRuntimeSetting(SETTING_KEYS.APP_PLAN_MODE, planIs);
+            if (!profileTransitionAlreadyApplied || settingsService.get('app.activeProfileId') !== canonical.value) {
+                durableResult = settingsService.setDynamic(key, parsedValue);
+                if (applyRuntimeSetting)
+                    applyRuntimeSetting(canonical.key, canonical.value);
             }
             addSystemMessage(formatDurableSetMessage(durableResult, key, parsedValue));
             if (key === SETTING_KEYS.AGENT_MAX_PARALLEL_TOOL_CALLS) {

package/dist/utils/settings-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"settings-command.js","sourceRoot":"","sources":["../../source/utils/settings-command.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"settings-command.js","sourceRoot":"","sources":["../../source/utils/settings-command.ts"],"names":[],"mappings":"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"}

package/dist/utils/streaming/streaming-session-factory.d.ts

@@ -22,6 +22,9 @@ export interface StreamingSessionFactoryDeps {
         tps: number;
         ttftMs?: number;
     } | null) => void;
+    /** Seed for live char/token estimates; typically the last calibrated ratio for this conversation. */
+    charsPerToken?: number;
+    onCharsPerTokenCalibrated?: (charsPerToken: number) => void;
     /**
      * Budget evidence that did not stop the run.
      *

package/dist/utils/streaming/streaming-session-factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"streaming-session-factory.d.ts","sourceRoot":"","sources":["../../../source/utils/streaming/streaming-session-factory.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oDAAoD,CAAC;AAC5F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AACjF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EACL,8BAA8B,EAC9B,KAAK,4BAA4B,EAClC,MAAM,+CAA+C,CAAC;AAEvD,OAAO,EAAwB,KAAK,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAClG,OAAO,EAAE,gCAAgC,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oDAAoD,CAAC;AAI7F,MAAM,WAAW,2BAA2B;IAC1C,cAAc,EAAE,4BAA4B,CAAC,gBAAgB,CAAC,CAAC;IAC/D,WAAW,EAAE,4BAA4B,CAAC,aAAa,CAAC,CAAC;IACzD,YAAY,EAAE,4BAA4B,CAAC,cAAc,CAAC,CAAC;IAC3D,sBAAsB,EAAE,4BAA4B,CAAC,wBAAwB,CAAC,CAAC;IAC/E,cAAc,EAAE,eAAe,CAAC;IAChC,YAAY,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;IAC/C,iBAAiB,CAAC,EAAE,CAAC,SAAS,EAAE,kBAAkB,KAAK,IAAI,CAAC;IAC5D,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,KAAK,IAAI,CAAC;IAC7E;;;;;OAKG;IACH,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC;IACrD,mBAAmB,EAAE,MAAM,CAAC;IAC5B,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,oBAAoB,CAAC,EAAE,MAAM,cAAc,CAAC;IAC5C,gCAAgC,CAAC,EAAE,OAAO,gCAAgC,CAAC;IAC3E,8BAA8B,CAAC,EAAE,OAAO,8BAA8B,CAAC;CACxE;AAED,MAAM,WAAW,gBAAgB;IAC/B,kBAAkB,EAAE,4BAA4B,CAAC,oBAAoB,CAAC,CAAC;IACvE,gBAAgB,EAAE,4BAA4B,CAAC,kBAAkB,CAAC,CAAC;IACnE,cAAc,EAAE,cAAc,CAAC;IAC/B,sBAAsB,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;CAC5D;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,2BAA2B,EAAE,KAAK,EAAE,MAAM,GAAG,gBAAgB,CAkKzG"}
+{"version":3,"file":"streaming-session-factory.d.ts","sourceRoot":"","sources":["../../../source/utils/streaming/streaming-session-factory.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oDAAoD,CAAC;AAC5F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AACjF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EACL,8BAA8B,EAC9B,KAAK,4BAA4B,EAClC,MAAM,+CAA+C,CAAC;AAEvD,OAAO,EAAwB,KAAK,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAClG,OAAO,EAAE,gCAAgC,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oDAAoD,CAAC;AAiC7F,MAAM,WAAW,2BAA2B;IAC1C,cAAc,EAAE,4BAA4B,CAAC,gBAAgB,CAAC,CAAC;IAC/D,WAAW,EAAE,4BAA4B,CAAC,aAAa,CAAC,CAAC;IACzD,YAAY,EAAE,4BAA4B,CAAC,cAAc,CAAC,CAAC;IAC3D,sBAAsB,EAAE,4BAA4B,CAAC,wBAAwB,CAAC,CAAC;IAC/E,cAAc,EAAE,eAAe,CAAC;IAChC,YAAY,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;IAC/C,iBAAiB,CAAC,EAAE,CAAC,SAAS,EAAE,kBAAkB,KAAK,IAAI,CAAC;IAC5D,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,KAAK,IAAI,CAAC;IAC7E,qGAAqG;IACrG,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,yBAAyB,CAAC,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5D;;;;;OAKG;IACH,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC;IACrD,mBAAmB,EAAE,MAAM,CAAC;IAC5B,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,oBAAoB,CAAC,EAAE,MAAM,cAAc,CAAC;IAC5C,gCAAgC,CAAC,EAAE,OAAO,gCAAgC,CAAC;IAC3E,8BAA8B,CAAC,EAAE,OAAO,8BAA8B,CAAC;CACxE;AAED,MAAM,WAAW,gBAAgB;IAC/B,kBAAkB,EAAE,4BAA4B,CAAC,oBAAoB,CAAC,CAAC;IACvE,gBAAgB,EAAE,4BAA4B,CAAC,kBAAkB,CAAC,CAAC;IACnE,cAAc,EAAE,cAAc,CAAC;IAC/B,sBAAsB,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;CAC5D;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,2BAA2B,EAAE,KAAK,EAAE,MAAM,GAAG,gBAAgB,CAqJzG"}

package/dist/utils/streaming/streaming-session-factory.js

@@ -7,6 +7,37 @@ import { createStreamingState } from '../conversation/conversation-utils.js';
 import { createStreamingUpdateCoordinator } from './streaming-updater.js';
 import { createMessageIdFactory } from '../message-id-factory.js';
 import { StreamingSpeedTracker } from './streaming-speed-tracker.js';
+function attachSettledSpeed(usage, tracker, now) {
+    const settled = tracker.getSettledTps({
+        completionTokens: usage.completion_tokens,
+        reasoningTokens: usage.reasoning_tokens,
+        completionMs: usage.completion_ms,
+        endTime: now,
+    });
+    if (settled) {
+        usage.tokens_per_second = settled.tps;
+        if (settled.approximate)
+            usage.tokens_per_second_estimated = true;
+        else
+            delete usage.tokens_per_second_estimated;
+        // Burst-inflated decode rate: pair it with its coverage fraction (decode
+        // window ÷ turn wall-clock). Wall-clock is TTFT + decode window, both
+        // measured from request start by the same tracker clock. Without TTFT
+        // there is no wall to cover, so the window is dropped rather than shown
+        // against nothing.
+        const ttftMs = tracker.getTtftMs();
+        if (settled.decodeWindowMs != null && ttftMs != null && ttftMs > 0) {
+            usage.tokens_per_second_coverage = settled.decodeWindowMs / (ttftMs + settled.decodeWindowMs);
+        }
+        else {
+            delete usage.tokens_per_second_coverage;
+        }
+    }
+    const ttftMs = tracker.getTtftMs();
+    if (ttftMs != null) {
+        usage.ttft_ms = ttftMs;
+    }
+}
 export function createStreamingSession(deps, label) {
     const now = deps.now ?? Date.now;
     const createState = deps.createStreamingState ?? createStreamingState;
@@ -73,7 +104,7 @@ export function createStreamingSession(deps, label) {
         trimMessages: deps.trimMessages,
         annotateCommandMessage: deps.annotateCommandMessage,
     }, streamingState);
-    const speedTracker = new StreamingSpeedTracker({ startTime: now() });
+    const speedTracker = new StreamingSpeedTracker({ startTime: now(), charsPerToken: deps.charsPerToken });
     const notifySpeed = () => {
         if (!deps.setStreamingSpeed)
             return;
@@ -107,16 +138,10 @@ export function createStreamingSession(deps, label) {
         else if (event.type === 'usage_update') {
             if (event.usage.completion_tokens) {
                 speedTracker.recordUsageTokens(event.usage.completion_tokens, now());
+                deps.onCharsPerTokenCalibrated?.(speedTracker.getCharsPerToken());
             }
             notifySpeed();
-            const currentTps = speedTracker.getSettledTps(event.usage.completion_tokens, now());
-            const ttftMs = speedTracker.getTtftMs();
-            if (currentTps != null) {
-                event.usage.tokens_per_second = currentTps;
-            }
-            if (ttftMs != null) {
-                event.usage.ttft_ms = ttftMs;
-            }
+            attachSettledSpeed(event.usage, speedTracker, now());
             deps.loggingService.debug(`UI received streaming usage (${label})`, { usage: event.usage });
             streamingState.latestUsage = event.usage;
             deps.setLastUsage(event.usage);
@@ -126,14 +151,7 @@ export function createStreamingSession(deps, label) {
             if (event.usage && !streamingState.latestUsage) {
                 // No usage_update happened during this turn (e.g. a single non-tool-call request), so
                 // this is the only chance to compute settled TPS for it.
-                const finalTps = speedTracker.getSettledTps(event.usage.completion_tokens, now());
-                const ttftMs = speedTracker.getTtftMs();
-                if (finalTps != null) {
-                    event.usage.tokens_per_second = finalTps;
-                }
-                if (ttftMs != null) {
-                    event.usage.ttft_ms = ttftMs;
-                }
+                attachSettledSpeed(event.usage, speedTracker, now());
                 deps.loggingService.debug(`UI received final usage (${label})`, { usage: event.usage });
                 streamingState.latestUsage = event.usage;
                 deps.setLastUsage(event.usage);

package/dist/utils/streaming/streaming-session-factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"streaming-session-factory.js","sourceRoot":"","sources":["../../../source/utils/streaming/streaming-session-factory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"streaming-session-factory.js","sourceRoot":"","sources":["../../../source/utils/streaming/streaming-session-factory.ts"],"names":[],"mappings":"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"}

package/dist/utils/streaming/streaming-speed-tracker.d.ts

@@ -17,12 +17,39 @@ export interface StreamingSpeedSnapshot {
     elapsedMs: number;
     estimatedTokens: number;
 }
+export interface SettledStreamingSpeed {
+    tps: number;
+    approximate: boolean;
+    /**
+     * Decode-window duration in ms when the settled rate exceeds what one
+     * sequence plausibly sustains (MAX_PLAUSIBLE_DECODE_TPS). Lets the footer
+     * show what fraction of the turn the rate actually describes.
+     */
+    decodeWindowMs?: number;
+}
+/** Average characters per token heuristic for English/code text when provider does not stream token counts. */
+export declare const DEFAULT_CHARS_PER_TOKEN = 3.8;
+/**
+ * Single-sequence decode rates above this are not plausible production
+ * throughput — the numerator/denominator pair describes a burst or a tail
+ * window, not sustained decode. Calibrated against a day of OpenRouter
+ * muse-spark traffic (n=1410, honest full-request p99 ≈ 670 tok/s): a 500
+ * cutoff marks 81% of settled figures as burst-inflated while clearing
+ * genuine sustained rates (median honest ≈ 60 tok/s) by a wide margin.
+ */
+export declare const MAX_PLAUSIBLE_DECODE_TPS = 500;
+export declare function formatTokensPerSecond(tps: number, approximate?: boolean): string;
 export declare class StreamingSpeedTracker {
     private startTime;
     private firstTokenTime;
     private lastUpdateTime;
+    private streamedTextChars;
+    private toolArgChars;
+    private committedToolArgChars;
     private accumulatedChars;
     private exactTokens;
+    /** Character count at the last `recordUsageTokens` sample, so later deltas can be added on top. */
+    private charsAtExactTokens;
     /**
      * Chars-per-token used for live estimates before exact usage arrives. Starts at
      * `DEFAULT_CHARS_PER_TOKEN` and is recalibrated from each request's real usage in
@@ -46,6 +73,8 @@ export declare class StreamingSpeedTracker {
      * forward to seed the next request's live estimate.
      */
     reset(now?: number): void;
+    getCharsPerToken(): number;
+    private refreshAccumulatedChars;
     private recordSample;
     /**
      * Record arrival of a text or reasoning delta string.
@@ -53,16 +82,21 @@ export declare class StreamingSpeedTracker {
     recordDelta(text?: string | null, now?: number): void;
     /**
      * Record cumulative characters streamed (e.g. from tool call argument streaming).
+     * Argument counts are cumulative per tool call, so a drop commits the previous
+     * tool's chars and starts a new one. Text and tool-arg chars are summed: both
+     * count toward completion tokens.
      */
     recordCumulativeChars(cumulativeChars: number, now?: number): void;
     /**
      * Record exact token counts if the provider streams usage updates.
+     * Calibrates the live chars-per-token ratio for this request's remaining
+     * deltas, not only the next request.
      */
     recordUsageTokens(completionTokens: number, now?: number): void;
     /**
      * Recalibrate the chars-per-token ratio from this request's real accumulated chars vs. its
-     * exact token count, so the NEXT request's live estimate (before its own usage arrives) starts
-     * from an observed ratio instead of the generic default. Ignored if there isn't enough
+     * exact token count, so later deltas of this request and the next request after `reset()`
+     * start from an observed ratio instead of the generic default. Ignored if there isn't enough
      * accumulated text to trust the sample (e.g. a tool-only request with no generated text).
      */
     private calibrateCharsPerToken;
@@ -85,12 +119,19 @@ export declare class StreamingSpeedTracker {
      */
     getLiveTps(now?: number): number | null;
     /**
-     * Calculate exact settled tokens per second when generation finishes.
+     * Calculate settled tokens per second when generation finishes.
      *
-     * @param finalCompletionTokens Exact completion tokens from provider's final usage.
-     * @param endTime Generation end timestamp.
+     * Prefers the provider's `completion_ms` when present. Otherwise measures
+     * wall-clock from the first visible token. Returns null rather than silently
+     * falling back to request start (which would mix TTFT into decode speed).
      */
-    getSettledTps(finalCompletionTokens?: number, endTime?: number): number | null;
+    getSettledTps(options?: {
+        completionTokens?: number;
+        reasoningTokens?: number;
+        completionMs?: number;
+        endTime?: number;
+    }): SettledStreamingSpeed | null;
+    private isHiddenReasoningInflated;
     /**
      * Returns a complete snapshot of current speed metrics.
      */

package/dist/utils/streaming/streaming-speed-tracker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"streaming-speed-tracker.d.ts","sourceRoot":"","sources":["../../../source/utils/streaming/streaming-speed-tracker.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,MAAM,WAAW,sBAAsB;IACrC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;CACzB;AAmBD,qBAAa,qBAAqB;IAChC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,WAAW,CAAuB;IAC1C;;;;;OAKG;IACH,OAAO,CAAC,aAAa,CAAS;IAC9B,2GAA2G;IAC3G,OAAO,CAAC,OAAO,CAAqB;IAEpC,YAAY,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,EAGnE;IAED;;;;;;;;OAQG;IACI,KAAK,CAAC,GAAG,GAAE,MAAmB,GAAG,IAAI,CAO3C;IAED,OAAO,CAAC,YAAY;IASpB;;OAEG;IACI,WAAW,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,GAAG,GAAE,MAAmB,GAAG,IAAI,CASvE;IAED;;OAEG;IACI,qBAAqB,CAAC,eAAe,EAAE,MAAM,EAAE,GAAG,GAAE,MAAmB,GAAG,IAAI,CAQpF;IAED;;OAEG;IACI,iBAAiB,CAAC,gBAAgB,EAAE,MAAM,EAAE,GAAG,GAAE,MAAmB,GAAG,IAAI,CAQjF;IAED;;;;;OAKG;IACH,OAAO,CAAC,sBAAsB;IAO9B;;OAEG;IACI,SAAS,IAAI,MAAM,GAAG,IAAI,CAGhC;IAED;;OAEG;IACI,kBAAkB,IAAI,MAAM,CAKlC;IAED;;;;;;;;OAQG;IACI,UAAU,CAAC,GAAG,GAAE,MAAmB,GAAG,MAAM,GAAG,IAAI,CAkCzD;IAED;;;;;OAKG;IACI,aAAa,CAAC,qBAAqB,CAAC,EAAE,MAAM,EAAE,OAAO,GAAE,MAAmB,GAAG,MAAM,GAAG,IAAI,CAahG;IAED;;OAEG;IACI,WAAW,CAAC,GAAG,GAAE,MAAmB,GAAG,sBAAsB,GAAG,IAAI,CAU1E;CACF"}
+{"version":3,"file":"streaming-speed-tracker.d.ts","sourceRoot":"","sources":["../../../source/utils/streaming/streaming-speed-tracker.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,MAAM,WAAW,sBAAsB;IACrC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,qBAAqB;IACpC,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,OAAO,CAAC;IACrB;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,+GAA+G;AAC/G,eAAO,MAAM,uBAAuB,MAAM,CAAC;AAa3C;;;;;;;GAOG;AACH,eAAO,MAAM,wBAAwB,MAAM,CAAC;AAE5C,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,UAAQ,GAAG,MAAM,CAG9E;AAOD,qBAAa,qBAAqB;IAChC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,iBAAiB,CAAK;IAC9B,OAAO,CAAC,YAAY,CAAK;IACzB,OAAO,CAAC,qBAAqB,CAAK;IAClC,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,WAAW,CAAuB;IAC1C,mGAAmG;IACnG,OAAO,CAAC,kBAAkB,CAAK;IAC/B;;;;;OAKG;IACH,OAAO,CAAC,aAAa,CAAS;IAC9B,2GAA2G;IAC3G,OAAO,CAAC,OAAO,CAAqB;IAEpC,YAAY,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,EAGnE;IAED;;;;;;;;OAQG;IACI,KAAK,CAAC,GAAG,GAAE,MAAmB,GAAG,IAAI,CAW3C;IAEM,gBAAgB,IAAI,MAAM,CAEhC;IAED,OAAO,CAAC,uBAAuB;IAI/B,OAAO,CAAC,YAAY;IASpB;;OAEG;IACI,WAAW,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,GAAG,GAAE,MAAmB,GAAG,IAAI,CAUvE;IAED;;;;;OAKG;IACI,qBAAqB,CAAC,eAAe,EAAE,MAAM,EAAE,GAAG,GAAE,MAAmB,GAAG,IAAI,CAYpF;IAED;;;;OAIG;IACI,iBAAiB,CAAC,gBAAgB,EAAE,MAAM,EAAE,GAAG,GAAE,MAAmB,GAAG,IAAI,CAMjF;IAED;;;;;OAKG;IACH,OAAO,CAAC,sBAAsB;IAO9B;;OAEG;IACI,SAAS,IAAI,MAAM,GAAG,IAAI,CAGhC;IAED;;OAEG;IACI,kBAAkB,IAAI,MAAM,CAMlC;IAED;;;;;;;;OAQG;IACI,UAAU,CAAC,GAAG,GAAE,MAAmB,GAAG,MAAM,GAAG,IAAI,CAkCzD;IAED;;;;;;OAMG;IACI,aAAa,CAAC,OAAO,CAAC,EAAE;QAC7B,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,GAAG,qBAAqB,GAAG,IAAI,CAkC/B;IAED,OAAO,CAAC,yBAAyB;IAOjC;;OAEG;IACI,WAAW,CAAC,GAAG,GAAE,MAAmB,GAAG,sBAAsB,GAAG,IAAI,CAU1E;CACF"}