@linxiraos/pi-tui 1.4.6 → 1.4.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (278) hide show
  1. package/CHANGELOG.md +194 -195
  2. package/README.md +34 -34
  3. package/dist/types/app-keybindings.d.ts +15 -0
  4. package/dist/types/apps/session-picker.d.ts +5 -0
  5. package/dist/types/charts/chart-plan.d.ts +9 -7
  6. package/dist/types/chat/assistant-message.d.ts +15 -3
  7. package/dist/types/chat/bash-execution.d.ts +2 -0
  8. package/dist/types/chat/display-preferences.d.ts +2 -0
  9. package/dist/types/chat/extension-types.d.ts +31 -0
  10. package/dist/types/chat/reply-write.d.ts +48 -0
  11. package/dist/types/chat/table-chart.d.ts +4 -3
  12. package/dist/types/chat/tool-execution.d.ts +1 -2
  13. package/dist/types/chat/transcript-outline.d.ts +7 -0
  14. package/dist/types/chat/transcript-render-helpers.d.ts +2 -0
  15. package/dist/types/chrome/index.d.ts +1 -0
  16. package/dist/types/chrome/transcript-notice.d.ts +35 -0
  17. package/dist/types/chrome/transcript-status.d.ts +20 -8
  18. package/dist/types/components/editor.d.ts +8 -0
  19. package/dist/types/components/markdown.d.ts +7 -0
  20. package/dist/types/native/blobs.d.ts +2 -1
  21. package/dist/types/native/picker.d.ts +4 -4
  22. package/dist/types/overlays/annotation-overlay.d.ts +7 -1
  23. package/dist/types/overlays/annotation-types.d.ts +28 -0
  24. package/dist/types/overlays/login-dialog.d.ts +5 -1
  25. package/dist/types/overlays/model-browser.d.ts +10 -1
  26. package/dist/types/overlays/oauth-selector.d.ts +23 -0
  27. package/dist/types/overlays/plan-review-overlay.d.ts +2 -0
  28. package/dist/types/overlays/rewind-selector.d.ts +1 -1
  29. package/dist/types/overlays/session-selector.d.ts +22 -2
  30. package/dist/types/prompt/composer.d.ts +43 -0
  31. package/dist/types/prompt/interactive-context-helpers.d.ts +10 -3
  32. package/dist/types/render/extension-links.d.ts +65 -0
  33. package/dist/types/render/hyperlink.d.ts +25 -7
  34. package/dist/types/render/index.d.ts +1 -0
  35. package/dist/types/setup/scenes/glyph.d.ts +1 -1
  36. package/dist/types/setup/scenes/model.d.ts +1 -1
  37. package/dist/types/setup/scenes/outro.d.ts +5 -4
  38. package/dist/types/setup/scenes/sign-in.d.ts +13 -8
  39. package/dist/types/setup/scenes/types.d.ts +16 -1
  40. package/dist/types/setup/startup-splash.d.ts +1 -1
  41. package/dist/types/setup/wizard-overlay.d.ts +11 -7
  42. package/dist/types/setup/wizard.d.ts +5 -1
  43. package/dist/types/status-line/component.d.ts +1 -1
  44. package/dist/types/status-line/context-usage.d.ts +28 -6
  45. package/dist/types/status-line/host.d.ts +6 -2
  46. package/dist/types/theme/theme.d.ts +0 -23
  47. package/dist/types/tools/bash-interactive.d.ts +6 -0
  48. package/dist/types/tools/bash.d.ts +2 -0
  49. package/dist/types/tools/default-renderer.d.ts +6 -4
  50. package/dist/types/tools/irc.d.ts +6 -0
  51. package/dist/types/tools/json-tree.d.ts +23 -4
  52. package/dist/types/tools/lsp.d.ts +2 -0
  53. package/dist/types/tools/mcp.d.ts +6 -5
  54. package/dist/types/tools/native-view.d.ts +1 -1
  55. package/dist/types/tools/renderer.d.ts +2 -0
  56. package/dist/types/tools/streaming-output.d.ts +11 -0
  57. package/dist/types/tools/task.d.ts +9 -1
  58. package/dist/types/tools/url-scheme-host.d.ts +17 -0
  59. package/dist/types/tools/yield.d.ts +1 -1
  60. package/dist/types/tui.d.ts +7 -2
  61. package/package.json +10 -14
  62. package/src/app-keybindings.d.ts +15 -0
  63. package/src/app-keybindings.ts +15 -0
  64. package/src/apps/session-picker.ts +7 -0
  65. package/src/charts/chart-plan.d.ts +9 -7
  66. package/src/charts/chart-plan.ts +20 -50
  67. package/src/chat/advisor-message.ts +2 -0
  68. package/src/chat/assistant-message.d.ts +15 -3
  69. package/src/chat/assistant-message.ts +137 -19
  70. package/src/chat/background-tan-message.ts +4 -0
  71. package/src/chat/bash-execution.d.ts +2 -0
  72. package/src/chat/bash-execution.ts +6 -0
  73. package/src/chat/chat-transcript-builder.ts +58 -28
  74. package/src/chat/compaction-summary-message.ts +2 -1
  75. package/src/chat/display-preferences.d.ts +2 -0
  76. package/src/chat/display-preferences.ts +3 -0
  77. package/src/chat/extension-types.d.ts +31 -0
  78. package/src/chat/extension-types.ts +34 -0
  79. package/src/chat/reply-write.d.ts +48 -0
  80. package/src/chat/reply-write.ts +127 -0
  81. package/src/chat/table-chart.d.ts +4 -3
  82. package/src/chat/table-chart.ts +10 -4
  83. package/src/chat/tool-execution.d.ts +1 -2
  84. package/src/chat/tool-execution.ts +20 -13
  85. package/src/chat/transcript-outline.d.ts +7 -0
  86. package/src/chat/transcript-outline.ts +27 -0
  87. package/src/chat/transcript-render-helpers.d.ts +2 -0
  88. package/src/chat/transcript-render-helpers.ts +66 -24
  89. package/src/chrome/index.ts +1 -0
  90. package/src/chrome/transcript-notice.d.ts +35 -0
  91. package/src/chrome/transcript-notice.ts +83 -0
  92. package/src/chrome/transcript-status.d.ts +20 -8
  93. package/src/chrome/transcript-status.ts +29 -29
  94. package/src/components/editor.d.ts +8 -0
  95. package/src/components/editor.ts +10 -1
  96. package/src/components/markdown.d.ts +7 -0
  97. package/src/components/markdown.ts +116 -6
  98. package/src/hotkeys-markdown.ts +1 -0
  99. package/src/native/backend.ts +5 -66
  100. package/src/native/blobs.d.ts +2 -1
  101. package/src/native/blobs.ts +3 -2
  102. package/src/native/picker.d.ts +4 -4
  103. package/src/native/picker.ts +4 -4
  104. package/src/overlays/advisor-config.ts +1 -10
  105. package/src/overlays/annotation-overlay.ts +125 -37
  106. package/src/overlays/annotation-types.ts +24 -0
  107. package/src/overlays/hook-selector.ts +2 -2
  108. package/src/overlays/login-dialog.ts +31 -5
  109. package/src/overlays/mcp-add-wizard.ts +1 -1
  110. package/src/overlays/model-browser.ts +37 -0
  111. package/src/overlays/model-hub.ts +1 -7
  112. package/src/overlays/model-picker.ts +1 -10
  113. package/src/overlays/oauth-selector.ts +44 -6
  114. package/src/overlays/plan-review-overlay.ts +13 -2
  115. package/src/overlays/rewind-selector.ts +29 -12
  116. package/src/overlays/session-selector.ts +313 -42
  117. package/src/overlays/usage-dashboard.ts +5 -12
  118. package/src/prompt/composer.ts +216 -1
  119. package/src/prompt/custom-editor.ts +6 -1
  120. package/src/prompt/emoji-autocomplete.ts +0 -2
  121. package/src/prompt/interactive-context-helpers.ts +29 -4
  122. package/src/render/extension-links.d.ts +65 -0
  123. package/src/render/extension-links.ts +214 -0
  124. package/src/render/hyperlink.d.ts +25 -7
  125. package/src/render/hyperlink.ts +65 -9
  126. package/src/render/index.d.ts +1 -0
  127. package/src/render/index.ts +1 -0
  128. package/src/setup/scenes/composer.ts +2 -0
  129. package/src/setup/scenes/glyph.ts +3 -1
  130. package/src/setup/scenes/model.ts +192 -29
  131. package/src/setup/scenes/outro.ts +33 -15
  132. package/src/setup/scenes/sign-in.ts +196 -400
  133. package/src/setup/scenes/theme.ts +2 -0
  134. package/src/setup/scenes/types.ts +18 -1
  135. package/src/setup/startup-splash.ts +8 -7
  136. package/src/setup/wizard-overlay.ts +164 -35
  137. package/src/setup/wizard.ts +11 -2
  138. package/src/status-line/component.ts +4 -10
  139. package/src/status-line/context-usage.ts +72 -21
  140. package/src/status-line/host.ts +6 -2
  141. package/src/terminal.ts +24 -2
  142. package/src/theme/defaults.json +1 -0
  143. package/src/theme/loader.ts +1 -1
  144. package/src/theme/theme.d.ts +0 -23
  145. package/src/theme/theme.ts +2 -75
  146. package/src/tools/bash-interactive.d.ts +49 -0
  147. package/src/tools/bash-interactive.ts +6 -1
  148. package/src/tools/bash.d.ts +2 -0
  149. package/src/tools/bash.ts +2 -0
  150. package/src/tools/default-renderer.d.ts +6 -4
  151. package/src/tools/default-renderer.ts +9 -6
  152. package/src/tools/eval.ts +14 -4
  153. package/src/tools/irc.d.ts +6 -0
  154. package/src/tools/irc.ts +6 -0
  155. package/src/tools/job-widget.ts +13 -1
  156. package/src/tools/json-tree.d.ts +23 -4
  157. package/src/tools/json-tree.ts +132 -42
  158. package/src/tools/lsp.d.ts +2 -0
  159. package/src/tools/lsp.ts +36 -15
  160. package/src/tools/mcp.d.ts +6 -5
  161. package/src/tools/mcp.ts +20 -12
  162. package/src/tools/native-view.d.ts +1 -1
  163. package/src/tools/native-view.ts +1 -1
  164. package/src/tools/renderer.d.ts +2 -0
  165. package/src/tools/renderer.ts +2 -0
  166. package/src/tools/streaming-output.d.ts +11 -0
  167. package/src/tools/streaming-output.ts +41 -0
  168. package/src/tools/task.d.ts +9 -1
  169. package/src/tools/task.ts +59 -16
  170. package/src/tools/url-scheme-host.d.ts +17 -0
  171. package/src/tools/url-scheme-host.ts +21 -0
  172. package/src/tools/yield.d.ts +1 -1
  173. package/src/tools/yield.ts +18 -9
  174. package/src/tui.d.ts +7 -2
  175. package/src/tui.ts +43 -15
  176. package/dist/types/theme/defaults/index.d.ts +0 -10289
  177. package/src/theme/defaults/alabaster.json +0 -103
  178. package/src/theme/defaults/amethyst.json +0 -106
  179. package/src/theme/defaults/anthracite.json +0 -103
  180. package/src/theme/defaults/basalt.json +0 -101
  181. package/src/theme/defaults/birch.json +0 -105
  182. package/src/theme/defaults/dark-abyss.json +0 -101
  183. package/src/theme/defaults/dark-arctic.json +0 -114
  184. package/src/theme/defaults/dark-aurora.json +0 -105
  185. package/src/theme/defaults/dark-catppuccin.json +0 -117
  186. package/src/theme/defaults/dark-cavern.json +0 -101
  187. package/src/theme/defaults/dark-celestial.json +0 -116
  188. package/src/theme/defaults/dark-copper.json +0 -105
  189. package/src/theme/defaults/dark-cosmos.json +0 -100
  190. package/src/theme/defaults/dark-cyberpunk.json +0 -112
  191. package/src/theme/defaults/dark-dracula.json +0 -108
  192. package/src/theme/defaults/dark-eclipse.json +0 -101
  193. package/src/theme/defaults/dark-ember.json +0 -105
  194. package/src/theme/defaults/dark-equinox.json +0 -100
  195. package/src/theme/defaults/dark-forest.json +0 -106
  196. package/src/theme/defaults/dark-github.json +0 -115
  197. package/src/theme/defaults/dark-gruvbox.json +0 -122
  198. package/src/theme/defaults/dark-lavender.json +0 -105
  199. package/src/theme/defaults/dark-lunar.json +0 -99
  200. package/src/theme/defaults/dark-midnight.json +0 -105
  201. package/src/theme/defaults/dark-monochrome.json +0 -104
  202. package/src/theme/defaults/dark-monokai.json +0 -108
  203. package/src/theme/defaults/dark-nebula.json +0 -100
  204. package/src/theme/defaults/dark-neon-noir.json +0 -110
  205. package/src/theme/defaults/dark-nord.json +0 -108
  206. package/src/theme/defaults/dark-ocean.json +0 -111
  207. package/src/theme/defaults/dark-one.json +0 -110
  208. package/src/theme/defaults/dark-poimandres.json +0 -125
  209. package/src/theme/defaults/dark-rainforest.json +0 -101
  210. package/src/theme/defaults/dark-reef.json +0 -101
  211. package/src/theme/defaults/dark-retro.json +0 -102
  212. package/src/theme/defaults/dark-rose-pine.json +0 -106
  213. package/src/theme/defaults/dark-sakura.json +0 -105
  214. package/src/theme/defaults/dark-slate.json +0 -105
  215. package/src/theme/defaults/dark-solarized.json +0 -107
  216. package/src/theme/defaults/dark-solstice.json +0 -100
  217. package/src/theme/defaults/dark-starfall.json +0 -101
  218. package/src/theme/defaults/dark-sunset.json +0 -109
  219. package/src/theme/defaults/dark-swamp.json +0 -100
  220. package/src/theme/defaults/dark-synthwave.json +0 -113
  221. package/src/theme/defaults/dark-taiga.json +0 -101
  222. package/src/theme/defaults/dark-terminal.json +0 -105
  223. package/src/theme/defaults/dark-tokyo-night.json +0 -111
  224. package/src/theme/defaults/dark-tundra.json +0 -101
  225. package/src/theme/defaults/dark-twilight.json +0 -101
  226. package/src/theme/defaults/dark-volcanic.json +0 -101
  227. package/src/theme/defaults/graphite.json +0 -102
  228. package/src/theme/defaults/index.d.ts +0 -10289
  229. package/src/theme/defaults/index.ts +0 -203
  230. package/src/theme/defaults/light-arctic.json +0 -117
  231. package/src/theme/defaults/light-aurora-day.json +0 -101
  232. package/src/theme/defaults/light-canyon.json +0 -101
  233. package/src/theme/defaults/light-catppuccin.json +0 -116
  234. package/src/theme/defaults/light-cirrus.json +0 -100
  235. package/src/theme/defaults/light-coral.json +0 -105
  236. package/src/theme/defaults/light-cyberpunk.json +0 -106
  237. package/src/theme/defaults/light-dawn.json +0 -100
  238. package/src/theme/defaults/light-dunes.json +0 -101
  239. package/src/theme/defaults/light-eucalyptus.json +0 -105
  240. package/src/theme/defaults/light-forest.json +0 -110
  241. package/src/theme/defaults/light-frost.json +0 -105
  242. package/src/theme/defaults/light-github.json +0 -125
  243. package/src/theme/defaults/light-glacier.json +0 -101
  244. package/src/theme/defaults/light-gruvbox.json +0 -118
  245. package/src/theme/defaults/light-haze.json +0 -100
  246. package/src/theme/defaults/light-honeycomb.json +0 -105
  247. package/src/theme/defaults/light-lagoon.json +0 -101
  248. package/src/theme/defaults/light-lavender.json +0 -105
  249. package/src/theme/defaults/light-meadow.json +0 -101
  250. package/src/theme/defaults/light-mint.json +0 -105
  251. package/src/theme/defaults/light-monochrome.json +0 -111
  252. package/src/theme/defaults/light-ocean.json +0 -109
  253. package/src/theme/defaults/light-one.json +0 -109
  254. package/src/theme/defaults/light-opal.json +0 -101
  255. package/src/theme/defaults/light-orchard.json +0 -101
  256. package/src/theme/defaults/light-paper.json +0 -105
  257. package/src/theme/defaults/light-poimandres.json +0 -125
  258. package/src/theme/defaults/light-prism.json +0 -100
  259. package/src/theme/defaults/light-retro.json +0 -108
  260. package/src/theme/defaults/light-sand.json +0 -105
  261. package/src/theme/defaults/light-savanna.json +0 -101
  262. package/src/theme/defaults/light-solarized.json +0 -112
  263. package/src/theme/defaults/light-soleil.json +0 -100
  264. package/src/theme/defaults/light-sunset.json +0 -109
  265. package/src/theme/defaults/light-synthwave.json +0 -108
  266. package/src/theme/defaults/light-tokyo-night.json +0 -121
  267. package/src/theme/defaults/light-wetland.json +0 -101
  268. package/src/theme/defaults/light-zenith.json +0 -99
  269. package/src/theme/defaults/limestone.json +0 -104
  270. package/src/theme/defaults/mahogany.json +0 -107
  271. package/src/theme/defaults/marble.json +0 -103
  272. package/src/theme/defaults/obsidian.json +0 -101
  273. package/src/theme/defaults/onyx.json +0 -101
  274. package/src/theme/defaults/pearl.json +0 -103
  275. package/src/theme/defaults/porcelain.json +0 -101
  276. package/src/theme/defaults/quartz.json +0 -106
  277. package/src/theme/defaults/sandstone.json +0 -105
  278. package/src/theme/defaults/titanium.json +0 -100
@@ -3,7 +3,7 @@ import type { CompactionSettings } from "@linxiraos/pi-agent-core/compaction";
3
3
  import { effectiveReserveTokens, resolveThresholdTokens } from "@linxiraos/pi-agent-core/compaction";
4
4
  import type { Tool as AiTool, Model } from "@linxiraos/pi-ai";
5
5
  import { renderToolExamples } from "@linxiraos/pi-ai/dialect";
6
- import { toolWireSchema } from "@linxiraos/pi-ai/utils/schema";
6
+ import { stripSchemaDescriptions, toolWireSchema } from "@linxiraos/pi-ai/utils/schema";
7
7
 
8
8
  interface ContextSkill {
9
9
  readonly name: string;
@@ -128,6 +128,11 @@ export interface NonMessageTokenSource {
128
128
  readonly state?: {
129
129
  readonly tools?: readonly ContextTool[];
130
130
  };
131
+ /**
132
+ * Whether requests to `model` ship description-stripped tool specs because
133
+ * the catalog rides in the system prompt (`Agent.prunesToolDescriptions`).
134
+ */
135
+ prunesToolDescriptions?(model: Model | undefined): boolean;
131
136
  };
132
137
  readonly skills?: readonly ContextSkill[];
133
138
  /** Provider-facing, session-frozen descriptions when available. */
@@ -166,7 +171,10 @@ type ToolSchemaSource = readonly ContextTool[];
166
171
 
167
172
  interface ToolSchemaTokenCache {
168
173
  revision: number;
169
- byTokenizer: WeakMap<Tokenizer, { revision: number; sourceRevision: number; tokens: number }>;
174
+ byTokenizer: WeakMap<
175
+ Tokenizer,
176
+ { revision: number; sourceRevision: number; pruneDescriptions: boolean; tokens: number }
177
+ >;
170
178
  }
171
179
 
172
180
  /**
@@ -216,12 +224,24 @@ export interface ToolSchemaFragments {
216
224
  readonly schemaError?: string;
217
225
  }
218
226
 
227
+ /** How {@link toolSchemaFragments} renders one tool definition. */
228
+ export interface ToolSchemaFragmentOptions {
229
+ /** Also return `display`: the same fragments with the schema JSON indented by this many spaces. */
230
+ displayIndent?: number;
231
+ /**
232
+ * Mirror `normalizeTools({ pruneDescriptions: true })`: the wire spec is the
233
+ * name plus the description-stripped schema, with no description or examples.
234
+ */
235
+ pruneDescriptions?: boolean;
236
+ }
237
+
219
238
  /**
220
239
  * Provider-visible text of one tool definition. `displayIndent` additionally
221
240
  * returns `display`, the same fragments with the schema JSON indented, from
222
241
  * the same schema conversion.
223
242
  */
224
- export function toolSchemaFragments(tool: ContextTool, displayIndent?: number): ToolSchemaFragments {
243
+ export function toolSchemaFragments(tool: ContextTool, options: ToolSchemaFragmentOptions = {}): ToolSchemaFragments {
244
+ const { displayIndent, pruneDescriptions = false } = options;
225
245
  // Extension-supplied tools may carry a non-string name/description or a
226
246
  // parameters value whose wire schema stringifies to `undefined` (e.g. a
227
247
  // callable schema that escaped normalization). A non-string fragment is
@@ -234,7 +254,7 @@ export function toolSchemaFragments(tool: ContextTool, displayIndent?: number):
234
254
  display?.push(shown);
235
255
  };
236
256
  if (typeof name === "string") push(name);
237
- if (typeof description === "string") push(description);
257
+ if (!pruneDescriptions && typeof description === "string") push(description);
238
258
  try {
239
259
  const wireTool: AiTool = {
240
260
  name,
@@ -242,12 +262,14 @@ export function toolSchemaFragments(tool: ContextTool, displayIndent?: number):
242
262
  parameters: parameters as AiTool["parameters"],
243
263
  examples: tool.examples,
244
264
  };
245
- const wireSchema = toolWireSchema(wireTool) ?? {};
265
+ const fullSchema = toolWireSchema(wireTool) ?? {};
266
+ const wireSchema = pruneDescriptions ? stripSchemaDescriptions(fullSchema) : fullSchema;
246
267
  const wireJson = JSON.stringify(wireSchema);
247
268
  if (typeof wireJson === "string")
248
269
  push(wireJson, display ? JSON.stringify(wireSchema, null, displayIndent) : wireJson);
249
- // The agent loop appends rendered examples to the wire description.
250
- const examplesBlock = renderToolExamples(wireTool);
270
+ // The agent loop appends rendered examples to the wire description,
271
+ // which pruning empties.
272
+ const examplesBlock = pruneDescriptions ? undefined : renderToolExamples(wireTool);
251
273
  if (examplesBlock) push(examplesBlock);
252
274
  } catch (error) {
253
275
  // Schema may contain functions or cycles.
@@ -256,23 +278,41 @@ export function toolSchemaFragments(tool: ContextTool, displayIndent?: number):
256
278
  return { fragments, display };
257
279
  }
258
280
 
281
+ /** Inputs that select which tool-schema estimate applies, beyond the roster and tokenizer. */
282
+ export interface ToolSchemaEstimateOptions {
283
+ /** Caller settings/source revision; a change invalidates the cached estimate. */
284
+ sourceRevision?: number;
285
+ /** Count the description-stripped specs sent when the catalog rides in the system prompt. */
286
+ pruneDescriptions?: boolean;
287
+ }
288
+
259
289
  /**
260
290
  * Estimate provider-visible tool-schema tokens.
261
291
  *
262
292
  * Results are cached by roster-array identity, tokenizer identity, the
263
- * caller-supplied settings/source revision, and the roster's explicit dynamic
264
- * metadata revision. Callers whose descriptions or schemas are live getters
265
- * must either advance `sourceRevision` or call
293
+ * caller-supplied settings/source revision, the prune mode, and the roster's
294
+ * explicit dynamic metadata revision. Callers whose descriptions or schemas are
295
+ * live getters must either advance `sourceRevision` or call
266
296
  * {@link invalidateToolSchemaMetadata} when those inputs change.
267
297
  */
268
- export function estimateToolSchemaTokens(tools: ToolSchemaSource, tokenizer: Tokenizer, sourceRevision = 0): number {
298
+ export function estimateToolSchemaTokens(
299
+ tools: ToolSchemaSource,
300
+ tokenizer: Tokenizer,
301
+ options: ToolSchemaEstimateOptions = {},
302
+ ): number {
303
+ const { sourceRevision = 0, pruneDescriptions = false } = options;
269
304
  const cache = toolSchemaTokenCache(tools);
270
305
  const cached = cache.byTokenizer.get(tokenizer);
271
- if (cached?.revision === cache.revision && cached.sourceRevision === sourceRevision) return cached.tokens;
306
+ if (
307
+ cached?.revision === cache.revision &&
308
+ cached.sourceRevision === sourceRevision &&
309
+ cached.pruneDescriptions === pruneDescriptions
310
+ )
311
+ return cached.tokens;
272
312
 
273
- const fragments = tools.flatMap(tool => toolSchemaFragments(tool).fragments);
313
+ const fragments = tools.flatMap(tool => toolSchemaFragments(tool, { pruneDescriptions }).fragments);
274
314
  const tokens = tokenizer.countTokens(fragments);
275
- cache.byTokenizer.set(tokenizer, { revision: cache.revision, sourceRevision, tokens });
315
+ cache.byTokenizer.set(tokenizer, { revision: cache.revision, sourceRevision, pruneDescriptions, tokens });
276
316
  return tokens;
277
317
  }
278
318
 
@@ -281,9 +321,9 @@ export function estimateContextToolSchemaTokens(
281
321
  tools: ToolSchemaSource,
282
322
  tokenizer: Tokenizer,
283
323
  model: Model | undefined,
284
- sourceRevision = 0,
324
+ options: ToolSchemaEstimateOptions = {},
285
325
  ): number {
286
- return model?.toolSchemasInContext === false ? 0 : estimateToolSchemaTokens(tools, tokenizer, sourceRevision);
326
+ return model?.toolSchemasInContext === false ? 0 : estimateToolSchemaTokens(tools, tokenizer, options);
287
327
  }
288
328
 
289
329
  /**
@@ -293,15 +333,17 @@ export function estimateContextToolSchemaTokens(
293
333
  *
294
334
  * Exposed so callers like `StatusLineComponent` can cache the non-message
295
335
  * total separately from the growing message total. A model switch can change
296
- * which tool schemas occupy context without changing the roster.
336
+ * which tool schemas occupy context without changing the roster; a prune-mode
337
+ * change (`Agent.prunesToolDescriptions`) changes how much of each spec ships.
297
338
  */
298
339
  // The per-turn threshold and compaction paths call these helpers repeatedly.
299
- // Cache by prompt, roster, skills, tokenizer, revision, and model schema policy;
300
- // setSystemPrompt/setTools replace their arrays rather than mutating them.
340
+ // Cache by prompt, roster, skills, tokenizer, revision, model schema policy, and
341
+ // prune mode; setSystemPrompt/setTools replace their arrays rather than mutating them.
301
342
  interface NonMessageTokenCache {
302
343
  systemPromptRef: readonly string[];
303
344
  toolsRef: ToolSchemaSource;
304
345
  toolSchemasInContext: boolean;
346
+ pruneToolDescriptions: boolean;
305
347
  toolsRevision: number;
306
348
  sourceRevision: number;
307
349
  skillful: boolean;
@@ -335,6 +377,7 @@ function nonMessageTokenCacheEntry(
335
377
  const systemPromptRef = session.systemPrompt ?? EMPTY_STRING_PARTS;
336
378
  const toolsRef = session.agent?.state?.tools ?? EMPTY_TOOLS;
337
379
  const toolSchemasInContext = session.model?.toolSchemasInContext !== false;
380
+ const pruneToolDescriptions = session.agent?.prunesToolDescriptions?.(session.model) === true;
338
381
  const toolsRevision = getToolSchemaMetadataRevision(toolsRef);
339
382
  const skillsRef = session.renderedSkills ?? session.skills ?? EMPTY_SKILLS;
340
383
  let entry = cachedSession[NON_MESSAGE_TOKEN_CACHE];
@@ -343,6 +386,7 @@ function nonMessageTokenCacheEntry(
343
386
  entry.systemPromptRef === systemPromptRef &&
344
387
  entry.toolsRef === toolsRef &&
345
388
  entry.toolSchemasInContext === toolSchemasInContext &&
389
+ entry.pruneToolDescriptions === pruneToolDescriptions &&
346
390
  entry.toolsRevision === toolsRevision &&
347
391
  entry.sourceRevision === sourceRevision &&
348
392
  entry.skillsRef === skillsRef &&
@@ -354,6 +398,7 @@ function nonMessageTokenCacheEntry(
354
398
  systemPromptRef,
355
399
  toolsRef,
356
400
  toolSchemasInContext,
401
+ pruneToolDescriptions,
357
402
  toolsRevision,
358
403
  sourceRevision,
359
404
  skillful: true,
@@ -377,7 +422,10 @@ export function computeNonMessageTokens(
377
422
  const tools = session.agent?.state?.tools ?? EMPTY_TOOLS;
378
423
  const tokens =
379
424
  tokenizer.countTokens(Array.from(systemPromptParts, part => part ?? "")) +
380
- estimateContextToolSchemaTokens(tools, tokenizer, session.model, sourceRevision);
425
+ estimateContextToolSchemaTokens(tools, tokenizer, session.model, {
426
+ sourceRevision,
427
+ pruneDescriptions: entry.pruneToolDescriptions,
428
+ });
381
429
  entry.tokens = tokens;
382
430
  return tokens;
383
431
  }
@@ -409,7 +457,10 @@ export function computeNonMessageBreakdown(
409
457
  renderedSkills(session.renderedSkills ?? session.skills ?? EMPTY_SKILLS, tools),
410
458
  tokenizer,
411
459
  );
412
- const toolsTokens = estimateContextToolSchemaTokens(tools, tokenizer, session.model, sourceRevision);
460
+ const toolsTokens = estimateContextToolSchemaTokens(tools, tokenizer, session.model, {
461
+ sourceRevision,
462
+ pruneDescriptions: entry.pruneToolDescriptions,
463
+ });
413
464
  const systemPromptParts = session.systemPrompt ?? EMPTY_STRING_PARTS;
414
465
  const systemContextTokens = tokenizer.countTokens(Array.from(systemPromptParts.slice(1), part => part ?? ""));
415
466
  const systemPromptTokens = Math.max(0, tokenizer.countTokens(systemPromptParts[0] ?? "") - skillsTokens);
@@ -102,8 +102,12 @@ export interface StatusLineHost<TSession extends StatusLineSession = StatusLineS
102
102
  calculateTokensPerSecond(messages: readonly AgentMessage[], isStreaming: boolean): number | null;
103
103
  limitMatchesActiveAccount(report: UsageReport, limit: UsageLimit, identity: StatusAccountIdentity): boolean;
104
104
  classifyResetExpiry?(report: UsageReport, nowMs: number): StatusResetExpiry | undefined;
105
- /** One-line warning for saved resets anywhere in the pool that expire within 24 hours. */
106
- resetExpiryNotice?(reports: readonly UsageReport[], nowMs: number): string | undefined;
105
+ /**
106
+ * One-line warning for saved resets anywhere in the pool that are about to expire.
107
+ * The host owns deduplication: a returned warning counts as shown, so each saved
108
+ * reset is warned about once, not once per refresh or conversation.
109
+ */
110
+ resetExpiryNotice?(session: TSession, reports: readonly UsageReport[], nowMs: number): string | undefined;
107
111
  computeCompactionBoundaries(session: TSession, contextWindow: number, model?: Model): CompactionBoundaries | null;
108
112
  }
109
113
 
package/src/terminal.ts CHANGED
@@ -774,7 +774,8 @@ type Da1SentinelOwner =
774
774
  | { kind: "privateMode"; mode: number }
775
775
  | { kind: "osc99Probe"; id: string }
776
776
  | { kind: "glyphProtocol"; phase: "support" | "confirm" }
777
- | { kind: "tsp" };
777
+ | { kind: "tsp" }
778
+ | { kind: "drain"; answered: () => void };
778
779
 
779
780
  let nextOsc99ProbeId = 1;
780
781
 
@@ -1607,6 +1608,10 @@ export class ProcessTerminal implements Terminal {
1607
1608
  if (owner.phase === this.#glyphProtocolPhase) this.#resolveGlyphProtocolSupport(false);
1608
1609
  break;
1609
1610
  }
1611
+ case "drain": {
1612
+ owner.answered();
1613
+ break;
1614
+ }
1610
1615
  case "tsp": {
1611
1616
  // DA1 before any `tsp;r` reply: the terminal doesn't speak TSP.
1612
1617
  this.#resolveTspSupport(
@@ -2314,12 +2319,29 @@ export class ProcessTerminal implements Terminal {
2314
2319
  process.stdin.on("data", onData);
2315
2320
  const endTime = Date.now() + maxMs;
2316
2321
 
2322
+ // A terminal that answers DA1 (`#sixelSupport` is set from its first
2323
+ // reply) answers this one after everything it sent before reading it:
2324
+ // replies to output already written (TSP acks for the last frames, which
2325
+ // a terminal may send well after the idle window) are read here instead
2326
+ // of reaching the shell as typed text.
2327
+ let sentinelAnswered = true;
2328
+ if (this.#sixelSupport !== undefined && !this.#dead) {
2329
+ sentinelAnswered = false;
2330
+ this.#da1SentinelOwners.push({
2331
+ kind: "drain",
2332
+ answered: () => {
2333
+ sentinelAnswered = true;
2334
+ },
2335
+ });
2336
+ this.#safeWrite("\x1b[c");
2337
+ }
2338
+
2317
2339
  try {
2318
2340
  while (true) {
2319
2341
  const now = Date.now();
2320
2342
  const timeLeft = endTime - now;
2321
2343
  if (timeLeft <= 0) break;
2322
- if (now - lastDataTime >= idleMs) break;
2344
+ if (sentinelAnswered && now - lastDataTime >= idleMs) break;
2323
2345
  await new Promise(resolve => setTimeout(resolve, Math.min(idleMs, timeLeft)));
2324
2346
  }
2325
2347
  } finally {