zidane-ui 9.1.1 → 9.1.4

package/dist/chat/headless/index.js

@@ -12,10 +12,18 @@ import { beginChipWork, chipWorkBusy, resetChipWorkForTests, whenChipsSettle } f
 import { createPathResolver } from "./path-resolver.js";
 import { REFERENCES_STORAGE_KEY, createReferenceStore } from "./reference-store.js";
 import { CHUNK_THRESHOLD, openFenceOf, splitMarkdown, withoutPartialFence } from "./markdown-chunks.js";
-import { hostReachable, hostStatusLabel } from "./hosts.js";
-import { firstRowId, parseBashExitMeta } from "./transcript/rows.js";
 import { pairToolEvents } from "./transcript/pairing.js";
+import { firstRowId, parseBashExitMeta } from "./transcript/rows.js";
 import { collapseEvents, inheritRowIdentity, refusedSpawn, toolFailed } from "./transcript/collapse.js";
+import { mergeLiveTail } from "./streams/merge.js";
+import { mergePromptPreviews, missingPreviewData } from "./streams/prompt-previews.js";
+import { defaultFrameScheduler } from "./streams/scheduler.js";
+import { SessionStreamStore } from "./streams/store.js";
+import { LIVE_BLOCK_RUN_LINES, createChatBlockRuns } from "./block-runs.js";
+import { DEFAULT_MODEL_PICKER_PREFS, MODEL_PICKER_STORAGE_KEY, createModelPickerPrefs, parseModelPickerPrefs } from "./composer/model-picker-prefs.js";
+import { EMPTY_RUN_METER, createRunMeter } from "./composer/run-meter.js";
+import { SMOOTH_TICK_MS, drainBucket, safeSurrogateSlice, tickBucket } from "./smooth-stream.js";
+import { hostReachable, hostStatusLabel } from "./hosts.js";
 import { batchThinkingRuns, batchToolRuns, clusterByOwner } from "./transcript/batch.js";
 import { foldActionItems, toolAction } from "./transcript/fold-actions.js";
 import { dockRunReceipts, dotVariantFor, findLastStreamingRow, foldExchanges, foldWorkerRows } from "./transcript/fold.js";
@@ -23,20 +31,13 @@ import { nestToolCalls, nestedCallVisible } from "./transcript/nesting.js";
 import { failureTooltip, markRunFailures } from "./transcript/run-failures.js";
 import { computeSelectStops, rowTurnIds, stopForRow } from "./transcript/select-stops.js";
 import { createRunEstimates, pickRunEstimate } from "./sidebar/estimates.js";
-import { SMOOTH_TICK_MS, drainBucket, safeSurrogateSlice, tickBucket } from "./smooth-stream.js";
-import { defaultFrameScheduler } from "./streams/scheduler.js";
-import { mergeLiveTail } from "./streams/merge.js";
-import { mergePromptPreviews, missingPreviewData } from "./streams/prompt-previews.js";
-import { SessionStreamStore } from "./streams/store.js";
 import { createSessionStreams } from "./streams/session-streams.js";
 import { createSessionStreamActions } from "./streams/actions.js";
 import { selectEditEvents, stableSelection } from "./streams/selectors.js";
 import { composeLiveCost, formatSessionCostLabel } from "./composer/live-cost.js";
 import { createModelKnobs, modelKnobsOf } from "./composer/model-knobs.js";
 import { createModelNames, modelNamesOf, namerFor } from "./composer/model-names.js";
-import { DEFAULT_MODEL_PICKER_PREFS, MODEL_PICKER_STORAGE_KEY, createModelPickerPrefs, parseModelPickerPrefs } from "./composer/model-picker-prefs.js";
 import { commitModelPick, lastModelChainOf, rememberableChain, rememberedPick, settledResource } from "./composer/remember-model-pick.js";
-import { EMPTY_RUN_METER, createRunMeter } from "./composer/run-meter.js";
 import { MAX_EXTENSION_COMPOSER_BADGES, conversationBadges, resolveBadgePanel } from "./composer/conversation-badges.js";
 import { draftFolderPath, draftLocalFolder, recentHostFolders, recentLocalFolders } from "./draft-target.js";
 import { NO_PROVIDER_ERROR, newSessionRequest, promptAttachments, promptRefs, sendPrompt, shellCommandOf } from "./send-flow.js";
@@ -61,4 +62,4 @@ import { availableProjectsOf, createSessionDirectory, filterDirectorySessions, p
 import { deriveDotState } from "./sidebar/dot-state.js";
 import { deleteSessionPrompt, environmentKindLabel, environmentSummaryText, runsInRemoteSandbox } from "./sidebar/environment.js";
 import { createComposerLists } from "./composer/composer-sources.js";
-export { AGENT_GROUPING, CHATS_BUCKET, CHUNK_THRESHOLD, COMMON_EMOJI, DEFAULT_CHAT_LABELS, DEFAULT_COMPOSER_CHROME_LABELS, DEFAULT_COMPOSER_LABELS, DEFAULT_MODEL_PICKER_PREFS, DEFAULT_SIDEBAR_LABELS, DEFAULT_SIDEBAR_VIEW, DEFAULT_SWITCHER_PREFS, EMPTY_RUN_METER, MAIN_SESSION_ICON_KEY, MAX_EXTENSION_COMPOSER_BADGES, MAX_ROW_CHIPS, MODEL_PICKER_STORAGE_KEY, NO_PROVIDER_ERROR, NO_SIDEBAR_CONTRIBUTIONS, PINNED_PROJECTS_KEY, PROJECT_GROUP_CAP, PROJECT_ICONS_KEY, REFERENCES_STORAGE_KEY, RELATIVE_TIME_DATE_AFTER_DAYS, SIDEBAR_SPACE_KEY, SIDEBAR_SWITCHER_KEY, SIDEBAR_VIEW_KEY, SMOOTH_TICK_MS, SessionStreamStore, VIEW_CHOICE, activityLabel, availableProjectsOf, batchThinkingRuns, batchToolRuns, beginChipWork, buildHostSidebarRows, buildQuerySidebarRows, buildSessionRows, buildSidebarRows, caretEffectivelyAtStart, chipForPath, chipWorkBusy, claimChildSessions, classifyInlineCode, clearedViewFilters, clusterByOwner, collapseEvents, commandName, commandRef, commandView, commitModelPick, commitView, compareSessions, composeLiveCost, composeSubmitText, computeSelectStops, constant, conversationBadges, createCompactionProgress, createComposerLists, createDecorator, createDraftScopeStore, createModelKnobs, createModelNames, createModelPickerPrefs, createNotificationStore, createPathResolver, createReferenceStore, createRunEstimates, createRunMeter, createSessionActivity, createSessionBadges, createSessionDirectory, createSessionStreamActions, createSessionStreams, createSidebarViews, createSiteIcons, dateBucket, decodeHistoryEntry, defaultFrameScheduler, defaultModelPatch, deleteSessionPrompt, deriveDotState, dockRunReceipts, dotVariantFor, draftFolderPath, draftLocalFolder, draftScopeOf, drainBucket, effortPickerTarget, encodeHistoryDraft, environmentKindLabel, environmentSummaryText, exitsModeOnKey, extensionSpaceOf, failureTooltip, filterDirectorySessions, filterQueryOf, filterSessions, filtersForSpace, findCommand, findLastStreamingRow, firstGrapheme, firstRowId, foldActionItems, foldExchanges, foldWorkerRows, formatElapsedShort, formatSessionCostLabel, groupsByFolder, hostReachable, hostStatusLabel, inheritRowIdentity, isProjectIcon, isProjectMember, itemRows, itemsForSpace, lastModelChainOf, markRunFailures, mergeLiveTail, mergePromptPreviews, mergeSidebarSpaces, missingPreviewData, modeForTypedChar, modelKnobsOf, modelNamesOf, namerFor, nestSidebarRows, nestToolCalls, nestedCallVisible, newSessionRequest, nextSavedViewName, openFenceOf, pairToolEvents, parseBashExitMeta, parseModelPickerPrefs, parsePinnedProjects, parseProjectIcons, parseSidebarView, parseSwitcherPrefs, partitionMainSession, pickRunEstimate, pinSession, pinnedSessions, projectKeyOf, projectPathOf, promptAttachments, promptDraftOf, promptRefs, readSidebarViews, recentHostFolders, recentLocalFolders, reduceActivity, reduceCompaction, refusedSpawn, relativeTime, rememberableChain, rememberedDefaultModel, rememberedPick, repoGroups, resetChipWorkForTests, resolveBadgePanel, resolveChipPath, resolveGrouping, resolveSort, rowTurnIds, runsInRemoteSandbox, safeSurrogateSlice, selectEditEvents, sendPrompt, sessionForToken, sessionRefsOf, sessionView, settledResource, shellCommandOf, shortUrl, sidebarContributionsOf, siteOrigin, skillName, skillView, spaceMembership, splitMarkdown, stableSelection, stopForRow, switcherSpaces, tickBucket, toolAction, toolFailed, unsentDraft, urlRefs, useReadable, viewFilterOf, viewFiltersOn, whenChipsSettle, wireAttachmentsToChat, withPinnedProject, withoutPartialFence, writable };
+export { AGENT_GROUPING, CHATS_BUCKET, CHUNK_THRESHOLD, COMMON_EMOJI, DEFAULT_CHAT_LABELS, DEFAULT_COMPOSER_CHROME_LABELS, DEFAULT_COMPOSER_LABELS, DEFAULT_MODEL_PICKER_PREFS, DEFAULT_SIDEBAR_LABELS, DEFAULT_SIDEBAR_VIEW, DEFAULT_SWITCHER_PREFS, EMPTY_RUN_METER, LIVE_BLOCK_RUN_LINES, MAIN_SESSION_ICON_KEY, MAX_EXTENSION_COMPOSER_BADGES, MAX_ROW_CHIPS, MODEL_PICKER_STORAGE_KEY, NO_PROVIDER_ERROR, NO_SIDEBAR_CONTRIBUTIONS, PINNED_PROJECTS_KEY, PROJECT_GROUP_CAP, PROJECT_ICONS_KEY, REFERENCES_STORAGE_KEY, RELATIVE_TIME_DATE_AFTER_DAYS, SIDEBAR_SPACE_KEY, SIDEBAR_SWITCHER_KEY, SIDEBAR_VIEW_KEY, SMOOTH_TICK_MS, SessionStreamStore, VIEW_CHOICE, activityLabel, availableProjectsOf, batchThinkingRuns, batchToolRuns, beginChipWork, buildHostSidebarRows, buildQuerySidebarRows, buildSessionRows, buildSidebarRows, caretEffectivelyAtStart, chipForPath, chipWorkBusy, claimChildSessions, classifyInlineCode, clearedViewFilters, clusterByOwner, collapseEvents, commandName, commandRef, commandView, commitModelPick, commitView, compareSessions, composeLiveCost, composeSubmitText, computeSelectStops, constant, conversationBadges, createChatBlockRuns, createCompactionProgress, createComposerLists, createDecorator, createDraftScopeStore, createModelKnobs, createModelNames, createModelPickerPrefs, createNotificationStore, createPathResolver, createReferenceStore, createRunEstimates, createRunMeter, createSessionActivity, createSessionBadges, createSessionDirectory, createSessionStreamActions, createSessionStreams, createSidebarViews, createSiteIcons, dateBucket, decodeHistoryEntry, defaultFrameScheduler, defaultModelPatch, deleteSessionPrompt, deriveDotState, dockRunReceipts, dotVariantFor, draftFolderPath, draftLocalFolder, draftScopeOf, drainBucket, effortPickerTarget, encodeHistoryDraft, environmentKindLabel, environmentSummaryText, exitsModeOnKey, extensionSpaceOf, failureTooltip, filterDirectorySessions, filterQueryOf, filterSessions, filtersForSpace, findCommand, findLastStreamingRow, firstGrapheme, firstRowId, foldActionItems, foldExchanges, foldWorkerRows, formatElapsedShort, formatSessionCostLabel, groupsByFolder, hostReachable, hostStatusLabel, inheritRowIdentity, isProjectIcon, isProjectMember, itemRows, itemsForSpace, lastModelChainOf, markRunFailures, mergeLiveTail, mergePromptPreviews, mergeSidebarSpaces, missingPreviewData, modeForTypedChar, modelKnobsOf, modelNamesOf, namerFor, nestSidebarRows, nestToolCalls, nestedCallVisible, newSessionRequest, nextSavedViewName, openFenceOf, pairToolEvents, parseBashExitMeta, parseModelPickerPrefs, parsePinnedProjects, parseProjectIcons, parseSidebarView, parseSwitcherPrefs, partitionMainSession, pickRunEstimate, pinSession, pinnedSessions, projectKeyOf, projectPathOf, promptAttachments, promptDraftOf, promptRefs, readSidebarViews, recentHostFolders, recentLocalFolders, reduceActivity, reduceCompaction, refusedSpawn, relativeTime, rememberableChain, rememberedDefaultModel, rememberedPick, repoGroups, resetChipWorkForTests, resolveBadgePanel, resolveChipPath, resolveGrouping, resolveSort, rowTurnIds, runsInRemoteSandbox, safeSurrogateSlice, selectEditEvents, sendPrompt, sessionForToken, sessionRefsOf, sessionView, settledResource, shellCommandOf, shortUrl, sidebarContributionsOf, siteOrigin, skillName, skillView, spaceMembership, splitMarkdown, stableSelection, stopForRow, switcherSpaces, tickBucket, toolAction, toolFailed, unsentDraft, urlRefs, useReadable, viewFilterOf, viewFiltersOn, whenChipsSettle, wireAttachmentsToChat, withPinnedProject, withoutPartialFence, writable };

package/dist/chat/headless/labels.d.ts

@@ -88,6 +88,23 @@ declare const DEFAULT_CHAT_LABELS: {
   showOutput: string;
   inputCaption: string;
   outputCaption: string;
+  /** Title of the chip that shows a script's `// @options` line. */
+  scriptOptions: string;
+  /** The script's `timeout_ms`, in its options tooltip. */
+  scriptOptionTimeout: string;
+  /** The script's `max_output_tokens`, in its options tooltip. */
+  scriptOptionOutput: string;
+  scriptOptionTokens: (tokens: number) => string;
+  /** Accessible name of the panel with the last lines a running script printed. */
+  scriptLiveOutput: string;
+  /** Calls finished out of all the script makes, when each runs once at most. */
+  scriptCallsOf: (done: number, total: number) => string;
+  scriptPercent: (percent: number) => string;
+  scriptCallsDone: (done: number) => string;
+  scriptCallsRunning: (running: number) => string;
+  scriptCallsFailed: (failed: number) => string;
+  /** Accessible name of the script's progress bar. */
+  scriptProgress: string;
   openNamedSession: (title: string) => string;
   /** A Mermaid diagram's accessible name, and its type when Pele detected one (`flowchart`). */
   diagram: (type: string | null) => string;
@@ -110,6 +127,31 @@ declare const DEFAULT_CHAT_LABELS: {
   shellKilled: string;
   shellExit: (code: number) => string;
   earlierLines: (count: number) => string;
+  /** The block's run button, and the menu row that runs it under the block. */
+  blockRunHere: string;
+  blockRunInTerminal: string;
+  /** The caret beside the run button: the menu of ways to run. */
+  blockRunMenu: string;
+  blockRunStop: string;
+  /** A run in progress, in the panel under the block. */
+  blockRunning: string;
+  /** Accessible name of a run's output panel. */
+  blockRunOutput: string;
+  blockRunAgain: string;
+  blockRunCopy: string;
+  /** Stages the run's output as a text file on the message being written. */
+  blockRunAttach: string;
+  blockRunRemove: string;
+  /** The attachment's file name when the output is added to a message. */
+  blockRunAttachmentName: string;
+  blockRunStopped: string;
+  blockRunTimedOut: string;
+  /** The output kept only its end. */
+  blockRunTruncated: string;
+  /** The panel when the block could not run. */
+  blockRunFailed: (reason: string) => string;
+  /** After a failed run: it may have wanted input, which a terminal gives. */
+  blockRunNeedsTerminal: string;
   working: string;
   foldSteps: (count: number) => string;
   foldOutcomes: (ok: number, failed: number) => string;

package/dist/chat/headless/labels.js

@@ -115,6 +115,23 @@ const DEFAULT_CHAT_LABELS = {
 	showOutput: "Show output",
 	inputCaption: "Input",
 	outputCaption: "Output",
+	/** Title of the chip that shows a script's `// @options` line. */
+	scriptOptions: "Script options",
+	/** The script's `timeout_ms`, in its options tooltip. */
+	scriptOptionTimeout: "Time limit",
+	/** The script's `max_output_tokens`, in its options tooltip. */
+	scriptOptionOutput: "Output budget",
+	scriptOptionTokens: (tokens) => `${tokens.toLocaleString("en-US")} tokens`,
+	/** Accessible name of the panel with the last lines a running script printed. */
+	scriptLiveOutput: "Live output",
+	/** Calls finished out of all the script makes, when each runs once at most. */
+	scriptCallsOf: (done, total) => `${done} of ${total}`,
+	scriptPercent: (percent) => `${percent}%`,
+	scriptCallsDone: (done) => `${done} done`,
+	scriptCallsRunning: (running) => `${running} running`,
+	scriptCallsFailed: (failed) => `${failed} failed`,
+	/** Accessible name of the script's progress bar. */
+	scriptProgress: "Script progress",
 	openNamedSession: (title) => `Open ${title}`,
 	/** A Mermaid diagram's accessible name, and its type when Pele detected one (`flowchart`). */
 	diagram: (type) => type ? `${type} diagram` : "Diagram",
@@ -137,6 +154,31 @@ const DEFAULT_CHAT_LABELS = {
 	shellKilled: "killed",
 	shellExit: (code) => `exit ${code}`,
 	earlierLines: (count) => `… (+${count} earlier lines)`,
+	/** The block's run button, and the menu row that runs it under the block. */
+	blockRunHere: "Run here",
+	blockRunInTerminal: "Run in a terminal",
+	/** The caret beside the run button: the menu of ways to run. */
+	blockRunMenu: "Ways to run",
+	blockRunStop: "Stop",
+	/** A run in progress, in the panel under the block. */
+	blockRunning: "Running",
+	/** Accessible name of a run's output panel. */
+	blockRunOutput: "Run output",
+	blockRunAgain: "Run again",
+	blockRunCopy: "Copy output",
+	/** Stages the run's output as a text file on the message being written. */
+	blockRunAttach: "Add to message",
+	blockRunRemove: "Remove output",
+	/** The attachment's file name when the output is added to a message. */
+	blockRunAttachmentName: "run-output.md",
+	blockRunStopped: "stopped",
+	blockRunTimedOut: "timed out",
+	/** The output kept only its end. */
+	blockRunTruncated: "Earlier output was cut.",
+	/** The panel when the block could not run. */
+	blockRunFailed: (reason) => `Could not run: ${reason}`,
+	/** After a failed run: it may have wanted input, which a terminal gives. */
+	blockRunNeedsTerminal: "Needs input? Run it in a terminal.",
 	working: "Working",
 	foldSteps: (count) => `${count} steps`,
 	foldOutcomes: (ok, failed) => failed > 0 ? `${ok} succeeded, ${failed} failed` : `${ok} succeeded`,

package/dist/chat/headless/session-list.d.ts

@@ -197,6 +197,17 @@ declare function dateBucket(at: number, now: number, labels?: {
   showOutput: string;
   inputCaption: string;
   outputCaption: string;
+  scriptOptions: string;
+  scriptOptionTimeout: string;
+  scriptOptionOutput: string;
+  scriptOptionTokens: (tokens: number) => string;
+  scriptLiveOutput: string;
+  scriptCallsOf: (done: number, total: number) => string;
+  scriptPercent: (percent: number) => string;
+  scriptCallsDone: (done: number) => string;
+  scriptCallsRunning: (running: number) => string;
+  scriptCallsFailed: (failed: number) => string;
+  scriptProgress: string;
   openNamedSession: (title: string) => string;
   diagram: (type: string | null) => string;
   showDiagramSource: string;
@@ -212,6 +223,22 @@ declare function dateBucket(at: number, now: number, labels?: {
   shellKilled: string;
   shellExit: (code: number) => string;
   earlierLines: (count: number) => string;
+  blockRunHere: string;
+  blockRunInTerminal: string;
+  blockRunMenu: string;
+  blockRunStop: string;
+  blockRunning: string;
+  blockRunOutput: string;
+  blockRunAgain: string;
+  blockRunCopy: string;
+  blockRunAttach: string;
+  blockRunRemove: string;
+  blockRunAttachmentName: string;
+  blockRunStopped: string;
+  blockRunTimedOut: string;
+  blockRunTruncated: string;
+  blockRunFailed: (reason: string) => string;
+  blockRunNeedsTerminal: string;
   working: string;
   foldSteps: (count: number) => string;
   foldOutcomes: (ok: number, failed: number) => string;

package/dist/chat/headless/sidebar/labels.d.ts

@@ -199,6 +199,17 @@ declare const DEFAULT_SIDEBAR_LABELS: {
   showOutput: string;
   inputCaption: string;
   outputCaption: string;
+  scriptOptions: string;
+  scriptOptionTimeout: string;
+  scriptOptionOutput: string;
+  scriptOptionTokens: (tokens: number) => string;
+  scriptLiveOutput: string;
+  scriptCallsOf: (done: number, total: number) => string;
+  scriptPercent: (percent: number) => string;
+  scriptCallsDone: (done: number) => string;
+  scriptCallsRunning: (running: number) => string;
+  scriptCallsFailed: (failed: number) => string;
+  scriptProgress: string;
   openNamedSession: (title: string) => string;
   diagram: (type: string | null) => string;
   showDiagramSource: string;
@@ -214,6 +225,22 @@ declare const DEFAULT_SIDEBAR_LABELS: {
   shellKilled: string;
   shellExit: (code: number) => string;
   earlierLines: (count: number) => string;
+  blockRunHere: string;
+  blockRunInTerminal: string;
+  blockRunMenu: string;
+  blockRunStop: string;
+  blockRunning: string;
+  blockRunOutput: string;
+  blockRunAgain: string;
+  blockRunCopy: string;
+  blockRunAttach: string;
+  blockRunRemove: string;
+  blockRunAttachmentName: string;
+  blockRunStopped: string;
+  blockRunTimedOut: string;
+  blockRunTruncated: string;
+  blockRunFailed: (reason: string) => string;
+  blockRunNeedsTerminal: string;
   working: string;
   foldSteps: (count: number) => string;
   foldOutcomes: (ok: number, failed: number) => string;

package/dist/chat/headless/streams/index.js

@@ -1,6 +1,6 @@
-import { defaultFrameScheduler } from "./scheduler.js";
 import { mergeLiveTail } from "./merge.js";
 import { mergePromptPreviews, missingPreviewData } from "./prompt-previews.js";
+import { defaultFrameScheduler } from "./scheduler.js";
 import { SessionStreamStore } from "./store.js";
 import { createSessionStreams } from "./session-streams.js";
 import { createSessionStreamActions } from "./actions.js";

package/dist/chat/headless/streams/live-events.js

@@ -1,4 +1,4 @@
-import { appendMarkdownDelta, appendThinkingLines, finalizeStreamingMarkdown, mergeTargetIndex, ownerOf } from "zidane/chat/pure";
+import { appendMarkdownDelta, appendThinkingLines, finalizeStreamingMarkdown, mergeTargetIndex, ownerOf, upsertToolProgress } from "zidane/chat/pure";
 //#region src/chat/headless/streams/live-events.ts
 const rows = (events) => events;
 const timed = (events) => events;
@@ -48,6 +48,7 @@ function closeThinkingSegment(events, owner, now = Date.now()) {
 * @param markdown - How streamed markdown merges (`segmentChars`: where a long message splits). The reducer's default when omitted.
 */
 function applyLiveEvent(events, event, now = Date.now(), markdown) {
+	if (event.kind === "tool-progress") return upsertToolProgress(events, event);
 	const owner = ownerOf(event);
 	if (event.kind === "thinking") return timed(appendThinkingLines(rows(events), event.text, owner, event.depth, event.turnId, { onLaneOpen: (row) => ({
 		...row,

package/dist/chat/headless/streams/session-streams.js

@@ -1,8 +1,8 @@
-import "../smooth-stream.js";
-import { allBucketsEmpty, getOrCreateBucket, planDrainBeforeSignal, planFullDrain, planTickDrain } from "./pacer.js";
 import { defaultFrameScheduler } from "./scheduler.js";
 import { SessionStreamStore } from "./store.js";
 import { storeTranscript } from "./transcript.js";
+import "../smooth-stream.js";
+import { allBucketsEmpty, getOrCreateBucket, planDrainBeforeSignal, planFullDrain, planTickDrain } from "./pacer.js";
 //#region src/chat/headless/streams/session-streams.ts
 /**
 * Event count past which a session's live window is compacted back to the

package/dist/chat/headless/streams/store.js

@@ -1,8 +1,8 @@
-import { inheritRowIdentity } from "../transcript/collapse.js";
-import { defaultFrameScheduler } from "./scheduler.js";
 import { applyLiveEvent, closeThinkingSegment, finishLive } from "./live-events.js";
+import { inheritRowIdentity } from "../transcript/collapse.js";
 import { mergeLiveTail } from "./merge.js";
 import { mergePromptPreviews, missingPreviewData } from "./prompt-previews.js";
+import { defaultFrameScheduler } from "./scheduler.js";
 import { discardThinking, finalizeStreamingMarkdownForOwner, reconcileEvents, retagUserPromptEventsFromRefs } from "zidane/chat/pure";
 //#region src/chat/headless/streams/store.ts
 const PARENT_OWNER = "parent";

package/dist/chat/headless/transcript/batch.d.ts

@@ -29,6 +29,26 @@ declare function summarizeToolBatch(tools: ReadonlyArray<Extract<Row, {
 declare const TOOL_GROUP_BOUNDARIES: ReadonlySet<Row['kind']>;
 declare const FOLD_CACHE: WeakMap<object, Row>;
 declare function sameMembers(a: readonly Row[], b: readonly Row[]): boolean;
+/**
+ * The id an aggregate row (a batch, an exchange fold, a message group) was
+ * first given, remembered by each of its members. A page of older history
+ * landing in front of the window extends the first aggregate backwards (its
+ * prompt, its earlier calls arrive): an id read off its new first member
+ * changed its React key, and the row remounted under the reader, blank for a
+ * frame. One hold per kind of aggregate: a prompt bounds both a fold and a
+ * message group.
+ */
+declare class IdHold {
+  private readonly ids;
+  /**
+   * The id one of `members` was given before, else `fresh`; never one `used` already holds (ids must stay unique in a pass).
+   *
+   * @param members - The aggregate's member rows.
+   * @param fresh - The id read off the aggregate as it is now.
+   * @param used - The ids this pass has given so far; the result is added.
+   */
+  take(members: readonly object[], fresh: string, used: Set<string>): string;
+}
 /**
  * Group consecutive `tool` rows (≥2) into a single `tool-batch` row so
  * the renderer can paint one Claude-Code-style collapsible header
@@ -74,4 +94,4 @@ declare function batchToolRuns(rows: readonly Row[], groupToolCalls?: boolean):
  */
 declare function batchThinkingRuns(rows: readonly Row[]): Row[];
 //#endregion
-export { FOLD_CACHE, TOOL_GROUP_BOUNDARIES, batchThinkingRuns, batchToolRuns, clusterByOwner, sameMembers, summarizeToolBatch };
+export { FOLD_CACHE, IdHold, TOOL_GROUP_BOUNDARIES, batchThinkingRuns, batchToolRuns, clusterByOwner, sameMembers, summarizeToolBatch };

package/dist/chat/headless/transcript/batch.js

@@ -118,10 +118,52 @@ function sameMembers(a, b) {
 	for (let i = 0; i < a.length; i++) if (a[i] !== b[i]) return false;
 	return true;
 }
-function stableBatch(cache, members, membersOf, build) {
+/**
+* The id an aggregate row (a batch, an exchange fold, a message group) was
+* first given, remembered by each of its members. A page of older history
+* landing in front of the window extends the first aggregate backwards (its
+* prompt, its earlier calls arrive): an id read off its new first member
+* changed its React key, and the row remounted under the reader, blank for a
+* frame. One hold per kind of aggregate: a prompt bounds both a fold and a
+* message group.
+*/
+var IdHold = class {
+	ids = /* @__PURE__ */ new WeakMap();
+	/**
+	* The id one of `members` was given before, else `fresh`; never one `used` already holds (ids must stay unique in a pass).
+	*
+	* @param members - The aggregate's member rows.
+	* @param fresh - The id read off the aggregate as it is now.
+	* @param used - The ids this pass has given so far; the result is added.
+	*/
+	take(members, fresh, used) {
+		let id;
+		for (const member of members) {
+			const held = this.ids.get(member);
+			if (held !== void 0 && !used.has(held)) {
+				id = held;
+				break;
+			}
+		}
+		if (id === void 0) {
+			id = fresh;
+			for (let n = 2; used.has(id); n++) id = `${fresh}~${n}`;
+		}
+		for (const member of members) this.ids.set(member, id);
+		used.add(id);
+		return id;
+	}
+};
+const TOOL_BATCH_IDS = new IdHold();
+const TOOL_GROUP_IDS = new IdHold();
+const THINKING_BATCH_IDS = new IdHold();
+function stableBatch(cache, hold, used, members, membersOf, fresh, build) {
 	const hit = cache.get(members[0]);
-	if (hit && sameMembers(membersOf(hit), members)) return hit;
-	const next = build();
+	if (hit && sameMembers(membersOf(hit), members) && !used.has(hit.id)) {
+		used.add(hit.id);
+		return hit;
+	}
+	const next = build(hold.take(members, fresh, used));
 	cache.set(members[0], next);
 	return next;
 }
@@ -153,15 +195,16 @@ function stableBatch(cache, members, membersOf, build) {
 */
 function liftExchangeToolGroups(rows) {
 	const out = [...rows];
+	const used = /* @__PURE__ */ new Set();
 	let exchange = [];
 	const flush = () => {
 		if (exchange.length >= 2) {
 			const tools = exchange.map((i) => rows[i]);
 			const first = tools[0];
-			out[exchange[0]] = stableBatch(TOOL_GROUP_CACHE, tools, (row) => row.tools, () => ({
+			out[exchange[0]] = stableBatch(TOOL_GROUP_CACHE, TOOL_GROUP_IDS, used, tools, (row) => row.tools, `tg-${first.id}`, (id) => ({
 				...first.turnId !== void 0 ? { turnId: first.turnId } : {},
 				kind: "tool-batch",
-				id: `tg-${first.id}`,
+				id,
 				summary: summarizeToolBatch(tools),
 				tools
 			}));
@@ -206,19 +249,20 @@ function liftExchangeToolGroups(rows) {
 function batchToolRuns(rows, groupToolCalls = false) {
 	const pre = groupToolCalls ? liftExchangeToolGroups(rows) : rows;
 	const out = [];
+	const used = /* @__PURE__ */ new Set();
 	let run = [];
 	const flush = () => {
 		if (run.length === 0) return;
 		if (run.length === 1) out.push(run[0]);
 		else {
 			const first = run[0];
-			const id = `tb-${first.id}`;
+			const fresh = `tb-${first.id}`;
 			const owned = {};
 			if (first.childId !== void 0) owned.childId = first.childId;
 			if (first.depth !== void 0) owned.depth = first.depth;
 			if (first.turnId !== void 0) owned.turnId = first.turnId;
 			const tools = run;
-			out.push(stableBatch(TOOL_BATCH_CACHE, tools, (row) => row.tools, () => ({
+			out.push(stableBatch(TOOL_BATCH_CACHE, TOOL_BATCH_IDS, used, tools, (row) => row.tools, fresh, (id) => ({
 				...owned,
 				kind: "tool-batch",
 				id,
@@ -272,6 +316,7 @@ const THINKING_CHAIN_TRANSPARENT = /* @__PURE__ */ new Set(["tool", "tool-batch"
 */
 function batchThinkingRuns(rows) {
 	const out = [];
+	const used = /* @__PURE__ */ new Set();
 	let chain = [];
 	/** Rows between chained thoughts, re-emitted after the group. */
 	let deferred = [];
@@ -284,10 +329,10 @@ function batchThinkingRuns(rows) {
 			if (first.turnId !== void 0) owned.turnId = first.turnId;
 			const totalMs = chain.reduce((sum, t) => sum + (t.thinkingMs ?? 0), 0);
 			const thoughts = chain;
-			out.push(stableBatch(THINKING_BATCH_CACHE, thoughts, (row) => row.thoughts, () => ({
+			out.push(stableBatch(THINKING_BATCH_CACHE, THINKING_BATCH_IDS, used, thoughts, (row) => row.thoughts, `kb-${first.id}`, (id) => ({
 				...owned,
 				kind: "thinking-batch",
-				id: `kb-${first.id}`,
+				id,
 				thoughts,
 				...totalMs > 0 ? { totalMs } : {}
 			})));
@@ -313,4 +358,4 @@ function batchThinkingRuns(rows) {
 	return out;
 }
 //#endregion
-export { FOLD_CACHE, TOOL_GROUP_BOUNDARIES, batchThinkingRuns, batchToolRuns, clusterByOwner, sameMembers, summarizeToolBatch };
+export { FOLD_CACHE, IdHold, TOOL_GROUP_BOUNDARIES, batchThinkingRuns, batchToolRuns, clusterByOwner, sameMembers, summarizeToolBatch };

package/dist/chat/headless/transcript/collapse.js

@@ -1,7 +1,7 @@
-import { parseBashExitMeta } from "./rows.js";
 import { promptOriginOf } from "../prompt-origin.js";
 import { pairToolEvents } from "./pairing.js";
-import { displayNameFor, formatToolCall, isUserBashEvent } from "zidane/chat/pure";
+import { parseBashExitMeta } from "./rows.js";
+import { displayNameFor, formatToolCall, isUserBashEvent, scriptProgressByCall, scriptProgressKey } from "zidane/chat/pure";
 //#region src/chat/headless/transcript/collapse.ts
 /**
 * When the paired result is an `error`, flip every `applied` outcome
@@ -225,6 +225,17 @@ function spawnQueue(events) {
 		startedAt
 	};
 }
+/** A number per progress state, for the row cache key: each `tool-progress` event brings a new one. */
+const progressIds = /* @__PURE__ */ new WeakMap();
+let nextProgressId = 0;
+function progressId(progress) {
+	let id = progressIds.get(progress);
+	if (id === void 0) {
+		id = ++nextProgressId;
+		progressIds.set(progress, id);
+	}
+	return id;
+}
 /**
 * A finished call's duration: the host's measure, less a spawn's wait for its
 * slot when both starts are known; else the gap between this window's arrival
@@ -274,6 +285,7 @@ function collapseAll(events, showEditDiffs, isStreaming) {
 	const headOf = new Int32Array(events.length);
 	const { pairings, consumedResultIndices } = pairToolEvents(events);
 	const { waiting, startedAt: workerStartedAt } = spawnQueue(events);
+	const progressOf = scriptProgressByCall(events);
 	const mdOrdinals = /* @__PURE__ */ new Map();
 	const thinkOrdinals = /* @__PURE__ */ new Map();
 	let promptScope = "@start";
@@ -353,6 +365,7 @@ function collapseAll(events, showEditDiffs, isStreaming) {
 				})));
 				break;
 			case "spawn-queued": break;
+			case "tool-progress": break;
 			case "spawn-end":
 				rows.push(cachedRow(event, `se-${sid}`, () => ({
 					...own(event),
@@ -406,7 +419,8 @@ function collapseAll(events, showEditDiffs, isStreaming) {
 				const since = workerStart ?? callStart;
 				const doneMs = paired ? doneDurationMs(paired, since, workerStart, callStart) : void 0;
 				const resuming = !paired && event.resuming === true;
-				const key = `t-${sid}|${showEditDiffs}|${okCoerced}|${paired ? rowIdFor(paired) : -1}|${paired?.text.length ?? -1}|${paired?.clipped ?? false}|${waitingFor ? "w" : ""}|${since ?? ""}|${doneMs ?? ""}|${resuming ? "r" : ""}`;
+				const scriptProgress = event.callId ? progressOf.get(scriptProgressKey(event.callId, event.childId)) : void 0;
+				const key = `t-${sid}|${showEditDiffs}|${okCoerced}|${paired ? rowIdFor(paired) : -1}|${paired?.text.length ?? -1}|${paired?.clipped ?? false}|${waitingFor ? "w" : ""}|${since ?? ""}|${doneMs ?? ""}|${resuming ? "r" : ""}|${scriptProgress ? progressId(scriptProgress) : ""}`;
 				rows.push(cachedRow(event, key, () => {
 					const toolName = event.tool ?? "?";
 					const rawInput = event.input;
@@ -430,6 +444,7 @@ function collapseAll(events, showEditDiffs, isStreaming) {
 						...paired?.clipped ? { resultClipped: true } : {},
 						...waitingFor ? { waitingFor } : {},
 						...resuming ? { resuming: true } : {},
+						...scriptProgress ? { scriptProgress } : {},
 						...event.approval ? { approval: event.approval } : {},
 						...event.parentToolCallId ? { parentId: event.parentToolCallId } : {},
 						...doneMs !== void 0 ? { durationMs: doneMs } : !paired && since !== void 0 ? { startedAt: since } : {}

package/dist/chat/headless/transcript/fold.js

@@ -1,5 +1,5 @@
 import { toolFailed } from "./collapse.js";
-import { FOLD_CACHE, TOOL_GROUP_BOUNDARIES, sameMembers } from "./batch.js";
+import { FOLD_CACHE, IdHold, TOOL_GROUP_BOUNDARIES, sameMembers } from "./batch.js";
 import { foldUnits } from "./fold-actions.js";
 import { foldSummary, foldsInCompactShape, planFold } from "zidane/chat/pure";
 //#region src/chat/headless/transcript/fold.ts
@@ -64,6 +64,16 @@ function foldsInCompact(row) {
 		depth: owned.depth
 	});
 }
+const FOLD_IDS = new IdHold();
+const MESSAGE_GROUP_IDS = new IdHold();
+/** A fold's members for its held id: its boundary and the rows under its batches (a batch's own object changes as it grows). */
+function foldMembers(boundary, folded) {
+	const members = boundary ? [boundary] : [];
+	for (const row of folded) if (row.kind === "tool-batch") members.push(...row.tools);
+	else if (row.kind === "thinking-batch") members.push(...row.thoughts);
+	else members.push(row);
+	return members;
+}
 /**
 * The id a fold keys off. A batch's own id changes as it forms (`t-5`
 * becomes `tg-t-5` once a second call joins), which would remount the
@@ -110,6 +120,7 @@ function rowStats(stats) {
 */
 function foldExchanges(rows, isStreaming) {
 	const out = [];
+	const used = /* @__PURE__ */ new Set();
 	let boundary = null;
 	let folded = [];
 	let visible = [];
@@ -121,16 +132,18 @@ function foldExchanges(rows, isStreaming) {
 			const owned = {};
 			const turnSource = folded[0] ?? boundary;
 			if (turnSource && turnSource.kind !== "separator" && turnSource.kind !== "compact-summary" && turnSource.turnId) owned.turnId = turnSource.turnId;
-			const id = `xf-${boundary ? boundary.id : foldAnchorId(anchor)}`;
 			const key = boundary ?? folded[0];
 			const hit = FOLD_CACHE.get(key);
-			if (hit && hit.kind === "exchange-fold" && hit.id === id && hit.live === live && sameMembers(hit.rows, folded)) out.push(hit);
-			else {
+			if (hit && hit.kind === "exchange-fold" && hit.live === live && sameMembers(hit.rows, folded) && !used.has(hit.id)) {
+				used.add(hit.id);
+				out.push(hit);
+			} else {
+				const fresh = `xf-${boundary ? boundary.id : foldAnchorId(anchor)}`;
 				const plan = planFold(foldUnits(folded));
 				const row = {
 					...owned,
 					kind: "exchange-fold",
-					id,
+					id: FOLD_IDS.take(foldMembers(boundary, folded), fresh, used),
 					rows: folded,
 					live,
 					stats: rowStats(plan.stats),
@@ -140,7 +153,7 @@ function foldExchanges(rows, isStreaming) {
 				out.push(row);
 			}
 		}
-		out.push(...groupMessages(visible, boundary, live));
+		out.push(...groupMessages(visible, boundary, live, used));
 		folded = [];
 		visible = [];
 	};
@@ -196,17 +209,20 @@ const isOwnMessage = (row) => row.kind === "markdown" && !("childId" in row && r
 * row, placed where the first of them was; everything else keeps its place.
 * An exchange with one message is left as it is.
 */
-function groupMessages(visible, boundary, live) {
+function groupMessages(visible, boundary, live, used) {
 	const messages = visible.filter(isOwnMessage);
 	if (messages.length === 0) return [...visible];
 	const earlier = messages.slice(0, -1);
 	const current = messages[messages.length - 1];
 	const key = boundary ?? messages[0];
-	const id = `mg-${boundary ? boundary.id : messages[0].id}`;
 	const hit = MESSAGE_GROUP_CACHE.get(key);
 	let group;
-	if (hit && hit.kind === "message-group" && hit.id === id && hit.live === live && hit.current === current && sameMembers(hit.messages, earlier)) group = hit;
-	else {
+	if (hit && hit.kind === "message-group" && hit.live === live && hit.current === current && sameMembers(hit.messages, earlier) && !used.has(hit.id)) {
+		used.add(hit.id);
+		group = hit;
+	} else {
+		const fresh = `mg-${boundary ? boundary.id : messages[0].id}`;
+		const id = MESSAGE_GROUP_IDS.take(boundary ? [boundary, ...messages] : messages, fresh, used);
 		const first = messages[0];
 		group = {
 			..."turnId" in first && first.turnId ? { turnId: first.turnId } : {},

package/dist/chat/headless/transcript/index.js

@@ -1,5 +1,5 @@
-import { firstRowId, parseBashExitMeta } from "./rows.js";
 import { pairToolEvents } from "./pairing.js";
+import { firstRowId, parseBashExitMeta } from "./rows.js";
 import { collapseEvents, inheritRowIdentity, refusedSpawn, toolFailed } from "./collapse.js";
 import { batchThinkingRuns, batchToolRuns, clusterByOwner } from "./batch.js";
 import { foldActionItems, toolAction } from "./fold-actions.js";

package/dist/chat/headless/transcript/rows.d.ts

@@ -1,6 +1,6 @@
 import { ChatAttachment } from "../host.js";
 import { PromptOrigin } from "../prompt-origin.js";
-import { PromptSegmentRef } from "zidane/chat/pure";
+import { PromptSegmentRef, ScriptProgress } from "zidane/chat/pure";
 import { SessionEventStatus, StreamEvent, ToolFormatLine } from "zidane/chat";
 //#region src/chat/headless/transcript/rows.d.ts
 /**
@@ -213,6 +213,12 @@ type Row = (Owned & {
   approval?: StreamEvent['approval'];
   /** `callId` of the call that made this one (a codemode script's `tools.*`): the row nests under it. */
   parentId?: string;
+  /**
+   * A codemode script's progress (its latest `tool-progress` event), with
+   * `Settings.codemodeStreamProgress`: the state of each line that made
+   * calls, the counts and the last lines it printed.
+   */
+  scriptProgress?: ScriptProgress;
   /** The calls this one made, in order, nested under it by {@link nestToolCalls}. */
   children?: ReadonlyArray<Extract<Row, {
     kind: 'tool';