@xopcai/xopc 0.0.103 → 0.0.104

package/dist/src/tui/tui-run-state.js

@@ -0,0 +1,114 @@
+//#region src/tui/tui-run-state.ts
+const STALE_WATCH_ACTIVITY = new Set([
+	"sending",
+	"waiting",
+	"streaming",
+	"running"
+]);
+function markRunEvent(state, phase, runId, event, source, nowMs = Date.now()) {
+	const directStreamRunId = (source === "agent-response" || source === "agent-resume") && runId ? runId : state.runStatus.directStreamRunId;
+	state.runStatus = {
+		...state.runStatus,
+		phase,
+		runId,
+		directStreamRunId,
+		source,
+		lastEvent: event,
+		lastActivityAt: nowMs,
+		stalledAt: null
+	};
+}
+function markRunSending(state, nowMs = Date.now()) {
+	state.runStatus = {
+		...state.runStatus,
+		phase: "sending",
+		runId: null,
+		directStreamRunId: null,
+		lastCompletedRunId: null,
+		source: "unknown",
+		lastEvent: "send",
+		lastActivityAt: nowMs,
+		stalledAt: null
+	};
+}
+function markRunAborting(state, runId, nowMs = Date.now()) {
+	state.runStatus = {
+		...state.runStatus,
+		phase: "aborting",
+		runId,
+		lastEvent: "abort",
+		lastActivityAt: nowMs
+	};
+}
+function markRunIdleAfterAbort(state, nowMs = Date.now()) {
+	state.runStatus = {
+		...state.runStatus,
+		phase: "idle",
+		runId: null,
+		lastEvent: "abort",
+		lastActivityAt: nowMs,
+		stalledAt: null
+	};
+}
+function markRunIdleAfterCompletion(state, completedRunId, event, source, nowMs = Date.now()) {
+	markRunEvent(state, "idle", null, event, source, nowMs);
+	state.runStatus.lastCompletedRunId = completedRunId;
+}
+function resetRunStatus(state) {
+	state.runStatus = {
+		...state.runStatus,
+		phase: "idle",
+		runId: null,
+		directStreamRunId: null,
+		lastCompletedRunId: null,
+		lastEvent: null,
+		stalledAt: null
+	};
+}
+function isActiveRunStreamStale(state, nowMs, staleAfterMs) {
+	if (!state.activeRunId) return false;
+	if (!STALE_WATCH_ACTIVITY.has(state.activityStatus)) return false;
+	if (state.runStatus.phase === "stalled" || state.runStatus.phase === "recovering") return false;
+	if (state.runStatus.phase === "aborting") return false;
+	return nowMs - (state.runStatus.lastActivityAt ?? nowMs) >= staleAfterMs;
+}
+function markActiveRunStalled(state, nowMs) {
+	if (!state.activeRunId) return false;
+	if (state.runStatus.phase === "stalled" || state.runStatus.phase === "recovering") return false;
+	state.runStatus = {
+		...state.runStatus,
+		phase: "stalled",
+		runId: state.activeRunId,
+		stalledAt: nowMs
+	};
+	return true;
+}
+function markRunRecovering(state, nowMs) {
+	state.runStatus = {
+		...state.runStatus,
+		phase: "recovering",
+		runId: state.activeRunId,
+		recoveredAt: nowMs
+	};
+}
+function markRunRecoveryComplete(state, nowMs) {
+	if (state.activeRunId) {
+		state.runStatus = {
+			...state.runStatus,
+			phase: "stalled",
+			runId: state.activeRunId,
+			recoveredAt: nowMs
+		};
+		return;
+	}
+	state.runStatus = {
+		...state.runStatus,
+		phase: "idle",
+		runId: null,
+		recoveredAt: nowMs
+	};
+}
+//#endregion
+export { isActiveRunStreamStale, markActiveRunStalled, markRunAborting, markRunEvent, markRunIdleAfterAbort, markRunIdleAfterCompletion, markRunRecovering, markRunRecoveryComplete, markRunSending, resetRunStatus };
+
+//# sourceMappingURL=tui-run-state.js.map

package/dist/src/tui/tui-run-state.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tui-run-state.js","names":[],"sources":["../../../src/tui/tui-run-state.ts"],"sourcesContent":["import type { ActivityStatus, TuiEventSource, TuiRunPhase, TuiState } from './tui-types.js';\n\nconst STALE_WATCH_ACTIVITY = new Set<ActivityStatus>(['sending', 'waiting', 'streaming', 'running']);\n\nexport function markRunEvent(\n  state: TuiState,\n  phase: TuiRunPhase,\n  runId: string | null,\n  event: string,\n  source: TuiEventSource,\n  nowMs = Date.now(),\n): void {\n  const directStreamRunId =\n    (source === 'agent-response' || source === 'agent-resume') && runId\n      ? runId\n      : state.runStatus.directStreamRunId;\n  state.runStatus = {\n    ...state.runStatus,\n    phase,\n    runId,\n    directStreamRunId,\n    source,\n    lastEvent: event,\n    lastActivityAt: nowMs,\n    stalledAt: null,\n  };\n}\n\nexport function markRunSending(state: TuiState, nowMs = Date.now()): void {\n  state.runStatus = {\n    ...state.runStatus,\n    phase: 'sending',\n    runId: null,\n    directStreamRunId: null,\n    lastCompletedRunId: null,\n    source: 'unknown',\n    lastEvent: 'send',\n    lastActivityAt: nowMs,\n    stalledAt: null,\n  };\n}\n\nexport function markRunAborting(state: TuiState, runId: string, nowMs = Date.now()): void {\n  state.runStatus = {\n    ...state.runStatus,\n    phase: 'aborting',\n    runId,\n    lastEvent: 'abort',\n    lastActivityAt: nowMs,\n  };\n}\n\nexport function markRunIdleAfterAbort(state: TuiState, nowMs = Date.now()): void {\n  state.runStatus = {\n    ...state.runStatus,\n    phase: 'idle',\n    runId: null,\n    lastEvent: 'abort',\n    lastActivityAt: nowMs,\n    stalledAt: null,\n  };\n}\n\nexport function markRunIdleAfterCompletion(\n  state: TuiState,\n  completedRunId: string,\n  event: string,\n  source: TuiEventSource,\n  nowMs = Date.now(),\n): void {\n  markRunEvent(state, 'idle', null, event, source, nowMs);\n  state.runStatus.lastCompletedRunId = completedRunId;\n}\n\nexport function resetRunStatus(state: TuiState): void {\n  state.runStatus = {\n    ...state.runStatus,\n    phase: 'idle',\n    runId: null,\n    directStreamRunId: null,\n    lastCompletedRunId: null,\n    lastEvent: null,\n    stalledAt: null,\n  };\n}\n\nexport function isActiveRunStreamStale(\n  state: TuiState,\n  nowMs: number,\n  staleAfterMs: number,\n): boolean {\n  if (!state.activeRunId) return false;\n  if (!STALE_WATCH_ACTIVITY.has(state.activityStatus)) return false;\n  if (state.runStatus.phase === 'stalled' || state.runStatus.phase === 'recovering') return false;\n  if (state.runStatus.phase === 'aborting') return false;\n  const lastActivityAt = state.runStatus.lastActivityAt ?? nowMs;\n  return nowMs - lastActivityAt >= staleAfterMs;\n}\n\nexport function markActiveRunStalled(state: TuiState, nowMs: number): boolean {\n  if (!state.activeRunId) return false;\n  if (state.runStatus.phase === 'stalled' || state.runStatus.phase === 'recovering') {\n    return false;\n  }\n  state.runStatus = {\n    ...state.runStatus,\n    phase: 'stalled',\n    runId: state.activeRunId,\n    stalledAt: nowMs,\n  };\n  return true;\n}\n\nexport function markRunRecovering(state: TuiState, nowMs: number): void {\n  state.runStatus = {\n    ...state.runStatus,\n    phase: 'recovering',\n    runId: state.activeRunId,\n    recoveredAt: nowMs,\n  };\n}\n\nexport function markRunRecoveryComplete(state: TuiState, nowMs: number): void {\n  if (state.activeRunId) {\n    state.runStatus = {\n      ...state.runStatus,\n      phase: 'stalled',\n      runId: state.activeRunId,\n      recoveredAt: nowMs,\n    };\n    return;\n  }\n  state.runStatus = {\n    ...state.runStatus,\n    phase: 'idle',\n    runId: null,\n    recoveredAt: nowMs,\n  };\n}\n"],"mappings":";AAEA,MAAM,uBAAuB,IAAI,IAAoB;CAAC;CAAW;CAAW;CAAa;CAAU,CAAC;AAEpG,SAAgB,aACd,OACA,OACA,OACA,OACA,QACA,QAAQ,KAAK,KAAK,EACZ;CACN,MAAM,qBACH,WAAW,oBAAoB,WAAW,mBAAmB,QAC1D,QACA,MAAM,UAAU;AACtB,OAAM,YAAY;EAChB,GAAG,MAAM;EACT;EACA;EACA;EACA;EACA,WAAW;EACX,gBAAgB;EAChB,WAAW;EACZ;;AAGH,SAAgB,eAAe,OAAiB,QAAQ,KAAK,KAAK,EAAQ;AACxE,OAAM,YAAY;EAChB,GAAG,MAAM;EACT,OAAO;EACP,OAAO;EACP,mBAAmB;EACnB,oBAAoB;EACpB,QAAQ;EACR,WAAW;EACX,gBAAgB;EAChB,WAAW;EACZ;;AAGH,SAAgB,gBAAgB,OAAiB,OAAe,QAAQ,KAAK,KAAK,EAAQ;AACxF,OAAM,YAAY;EAChB,GAAG,MAAM;EACT,OAAO;EACP;EACA,WAAW;EACX,gBAAgB;EACjB;;AAGH,SAAgB,sBAAsB,OAAiB,QAAQ,KAAK,KAAK,EAAQ;AAC/E,OAAM,YAAY;EAChB,GAAG,MAAM;EACT,OAAO;EACP,OAAO;EACP,WAAW;EACX,gBAAgB;EAChB,WAAW;EACZ;;AAGH,SAAgB,2BACd,OACA,gBACA,OACA,QACA,QAAQ,KAAK,KAAK,EACZ;AACN,cAAa,OAAO,QAAQ,MAAM,OAAO,QAAQ,MAAM;AACvD,OAAM,UAAU,qBAAqB;;AAGvC,SAAgB,eAAe,OAAuB;AACpD,OAAM,YAAY;EAChB,GAAG,MAAM;EACT,OAAO;EACP,OAAO;EACP,mBAAmB;EACnB,oBAAoB;EACpB,WAAW;EACX,WAAW;EACZ;;AAGH,SAAgB,uBACd,OACA,OACA,cACS;AACT,KAAI,CAAC,MAAM,YAAa,QAAO;AAC/B,KAAI,CAAC,qBAAqB,IAAI,MAAM,eAAe,CAAE,QAAO;AAC5D,KAAI,MAAM,UAAU,UAAU,aAAa,MAAM,UAAU,UAAU,aAAc,QAAO;AAC1F,KAAI,MAAM,UAAU,UAAU,WAAY,QAAO;AAEjD,QAAO,SADgB,MAAM,UAAU,kBAAkB,UACxB;;AAGnC,SAAgB,qBAAqB,OAAiB,OAAwB;AAC5E,KAAI,CAAC,MAAM,YAAa,QAAO;AAC/B,KAAI,MAAM,UAAU,UAAU,aAAa,MAAM,UAAU,UAAU,aACnE,QAAO;AAET,OAAM,YAAY;EAChB,GAAG,MAAM;EACT,OAAO;EACP,OAAO,MAAM;EACb,WAAW;EACZ;AACD,QAAO;;AAGT,SAAgB,kBAAkB,OAAiB,OAAqB;AACtE,OAAM,YAAY;EAChB,GAAG,MAAM;EACT,OAAO;EACP,OAAO,MAAM;EACb,aAAa;EACd;;AAGH,SAAgB,wBAAwB,OAAiB,OAAqB;AAC5E,KAAI,MAAM,aAAa;AACrB,QAAM,YAAY;GAChB,GAAG,MAAM;GACT,OAAO;GACP,OAAO,MAAM;GACb,aAAa;GACd;AACD;;AAEF,OAAM,YAAY;EAChB,GAAG,MAAM;EACT,OAAO;EACP,OAAO;EACP,aAAa;EACd"}

package/dist/src/tui/tui-runtime-hints.d.ts

@@ -0,0 +1,4 @@
+import type { KeybindingsManager } from '@earendil-works/pi-tui';
+export declare function formatBusyResponseHint(keybindings: KeybindingsManager): string;
+export declare function formatSteerUnavailableHint(keybindings: KeybindingsManager): string;
+export declare function formatSuspendUnsupportedHint(keybindings: KeybindingsManager): string;

package/dist/src/tui/tui-runtime-hints.js

@@ -0,0 +1,18 @@
+import { formatKeyIds } from "./format-tui-hotkeys.js";
+//#region src/tui/tui-runtime-hints.ts
+function keyLabel(keybindings, id) {
+	return formatKeyIds(keybindings, id, { capitalize: true });
+}
+function formatBusyResponseHint(keybindings) {
+	return `A response is still in progress. Press Enter to steer, ${keyLabel(keybindings, "app.message.followUp")} to queue, or ${keyLabel(keybindings, "app.interrupt")} to abort.`;
+}
+function formatSteerUnavailableHint(keybindings) {
+	return `Could not steer — no active run or steer failed. Press ${keyLabel(keybindings, "app.interrupt")} to abort, or ${keyLabel(keybindings, "app.message.followUp")} to queue a follow-up.`;
+}
+function formatSuspendUnsupportedHint(keybindings) {
+	return `Suspend (${keyLabel(keybindings, "app.suspend")}) is not supported on Windows.`;
+}
+//#endregion
+export { formatBusyResponseHint, formatSteerUnavailableHint, formatSuspendUnsupportedHint };
+
+//# sourceMappingURL=tui-runtime-hints.js.map

package/dist/src/tui/tui-runtime-hints.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tui-runtime-hints.js","names":[],"sources":["../../../src/tui/tui-runtime-hints.ts"],"sourcesContent":["import type { KeybindingsManager } from '@earendil-works/pi-tui';\n\nimport { formatKeyIds } from './format-tui-hotkeys.js';\n\nfunction keyLabel(\n  keybindings: KeybindingsManager,\n  id: Parameters<KeybindingsManager['getKeys']>[0],\n): string {\n  return formatKeyIds(keybindings, id, { capitalize: true });\n}\n\nexport function formatBusyResponseHint(keybindings: KeybindingsManager): string {\n  const followUp = keyLabel(keybindings, 'app.message.followUp');\n  const abort = keyLabel(keybindings, 'app.interrupt');\n  return `A response is still in progress. Press Enter to steer, ${followUp} to queue, or ${abort} to abort.`;\n}\n\nexport function formatSteerUnavailableHint(keybindings: KeybindingsManager): string {\n  const abort = keyLabel(keybindings, 'app.interrupt');\n  const followUp = keyLabel(keybindings, 'app.message.followUp');\n  return `Could not steer — no active run or steer failed. Press ${abort} to abort, or ${followUp} to queue a follow-up.`;\n}\n\nexport function formatSuspendUnsupportedHint(keybindings: KeybindingsManager): string {\n  const suspend = keyLabel(keybindings, 'app.suspend');\n  return `Suspend (${suspend}) is not supported on Windows.`;\n}\n"],"mappings":";;AAIA,SAAS,SACP,aACA,IACQ;AACR,QAAO,aAAa,aAAa,IAAI,EAAE,YAAY,MAAM,CAAC;;AAG5D,SAAgB,uBAAuB,aAAyC;AAG9E,QAAO,0DAFU,SAAS,aAAa,uBAEkC,CAAC,gBAD5D,SAAS,aAAa,gBAC2D,CAAC;;AAGlG,SAAgB,2BAA2B,aAAyC;AAGlF,QAAO,0DAFO,SAAS,aAAa,gBAEkC,CAAC,gBADtD,SAAS,aAAa,uBACwD,CAAC;;AAGlG,SAAgB,6BAA6B,aAAyC;AAEpF,QAAO,YADS,SAAS,aAAa,cACZ,CAAC"}

package/dist/src/tui/tui-scoped-models.d.ts

@@ -4,5 +4,5 @@ export declare function loadScopedModelRefs(cwd?: string): string[] | null;
 /** Persist scoped model refs for this workspace. Pass `null` to enable all models. */
 export declare function saveScopedModelRefs(refs: string[] | null, cwd?: string): void;
 export declare function modelRef(choice: TuiModelChoice): string;
-/** Filter catalog by scoped refs; empty scoped array falls back to full catalog. */
+/** Filter catalog by scoped refs; `null` means full catalog, empty array means no scoped models. */
 export declare function filterModelsForCycle(catalog: TuiModelChoice[], scopedRefs: string[] | null): TuiModelChoice[];

package/dist/src/tui/tui-scoped-models.js

@@ -40,10 +40,10 @@ function saveScopedModelRefs(refs, cwd = process.cwd()) {
 function modelRef(choice) {
 	return `${choice.provider}/${choice.id}`;
 }
-/** Filter catalog by scoped refs; empty scoped array falls back to full catalog. */
+/** Filter catalog by scoped refs; `null` means full catalog, empty array means no scoped models. */
 function filterModelsForCycle(catalog, scopedRefs) {
 	if (scopedRefs === null) return catalog;
-	if (scopedRefs.length === 0) return catalog;
+	if (scopedRefs.length === 0) return [];
 	const order = new Map(scopedRefs.map((ref, idx) => [ref, idx]));
 	return catalog.filter((m) => order.has(modelRef(m))).toSorted((a, b) => (order.get(modelRef(a)) ?? 0) - (order.get(modelRef(b)) ?? 0));
 }

package/dist/src/tui/tui-scoped-models.js.map

@@ -1 +1 @@
-{"version":3,"file":"tui-scoped-models.js","names":[],"sources":["../../../src/tui/tui-scoped-models.ts"],"sourcesContent":["import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';\nimport { homedir } from 'node:os';\nimport { join } from 'node:path';\n\nimport type { TuiModelChoice } from './tui-backend.js';\n\nconst STORE_PATH = join(homedir(), '.xopc', 'tui-scoped-models.json');\n\ntype ScopedModelsFile = {\n  /** `null` = all models enabled for Ctrl+P cycle. */\n  byWorkspace?: Record<string, string[] | null>;\n};\n\nfunction normalizeWorkspaceKey(cwd: string): string {\n  return cwd.replace(/\\\\/g, '/').replace(/\\/+$/, '') || '/';\n}\n\nfunction readStore(): ScopedModelsFile {\n  try {\n    if (!existsSync(STORE_PATH)) return {};\n    const raw = readFileSync(STORE_PATH, 'utf8');\n    const parsed = JSON.parse(raw) as ScopedModelsFile;\n    return parsed && typeof parsed === 'object' ? parsed : {};\n  } catch {\n    return {};\n  }\n}\n\nfunction writeStore(data: ScopedModelsFile): void {\n  const dir = join(homedir(), '.xopc');\n  if (!existsSync(dir)) {\n    mkdirSync(dir, { recursive: true });\n  }\n  writeFileSync(STORE_PATH, `${JSON.stringify(data, null, 2)}\\n`, 'utf8');\n}\n\n/** Load scoped model refs for Ctrl+P cycling (`null` = all models). */\nexport function loadScopedModelRefs(cwd: string = process.cwd()): string[] | null {\n  const key = normalizeWorkspaceKey(cwd);\n  const store = readStore();\n  const entry = store.byWorkspace?.[key];\n  if (entry === undefined) return null;\n  if (entry === null) return null;\n  return [...entry];\n}\n\n/** Persist scoped model refs for this workspace. Pass `null` to enable all models. */\nexport function saveScopedModelRefs(\n  refs: string[] | null,\n  cwd: string = process.cwd(),\n): void {\n  const key = normalizeWorkspaceKey(cwd);\n  const store = readStore();\n  const byWorkspace = { ...store.byWorkspace };\n  if (refs === null) {\n    byWorkspace[key] = null;\n  } else {\n    byWorkspace[key] = [...refs];\n  }\n  writeStore({ byWorkspace });\n}\n\nexport function modelRef(choice: TuiModelChoice): string {\n  return `${choice.provider}/${choice.id}`;\n}\n\n/** Filter catalog by scoped refs; empty scoped array falls back to full catalog. */\nexport function filterModelsForCycle(\n  catalog: TuiModelChoice[],\n  scopedRefs: string[] | null,\n): TuiModelChoice[] {\n  if (scopedRefs === null) return catalog;\n  if (scopedRefs.length === 0) return catalog;\n  const order = new Map(scopedRefs.map((ref, idx) => [ref, idx]));\n  return catalog\n    .filter((m) => order.has(modelRef(m)))\n    .toSorted((a, b) => (order.get(modelRef(a)) ?? 0) - (order.get(modelRef(b)) ?? 0));\n}\n"],"mappings":";;;;AAMA,MAAM,aAAa,KAAK,SAAS,EAAE,SAAS,yBAAyB;AAOrE,SAAS,sBAAsB,KAAqB;AAClD,QAAO,IAAI,QAAQ,OAAO,IAAI,CAAC,QAAQ,QAAQ,GAAG,IAAI;;AAGxD,SAAS,YAA8B;AACrC,KAAI;AACF,MAAI,CAAC,WAAW,WAAW,CAAE,QAAO,EAAE;EACtC,MAAM,MAAM,aAAa,YAAY,OAAO;EAC5C,MAAM,SAAS,KAAK,MAAM,IAAI;AAC9B,SAAO,UAAU,OAAO,WAAW,WAAW,SAAS,EAAE;SACnD;AACN,SAAO,EAAE;;;AAIb,SAAS,WAAW,MAA8B;CAChD,MAAM,MAAM,KAAK,SAAS,EAAE,QAAQ;AACpC,KAAI,CAAC,WAAW,IAAI,CAClB,WAAU,KAAK,EAAE,WAAW,MAAM,CAAC;AAErC,eAAc,YAAY,GAAG,KAAK,UAAU,MAAM,MAAM,EAAE,CAAC,KAAK,OAAO;;;AAIzE,SAAgB,oBAAoB,MAAc,QAAQ,KAAK,EAAmB;CAChF,MAAM,MAAM,sBAAsB,IAAI;CAEtC,MAAM,QADQ,WACK,CAAC,cAAc;AAClC,KAAI,UAAU,KAAA,EAAW,QAAO;AAChC,KAAI,UAAU,KAAM,QAAO;AAC3B,QAAO,CAAC,GAAG,MAAM;;;AAInB,SAAgB,oBACd,MACA,MAAc,QAAQ,KAAK,EACrB;CACN,MAAM,MAAM,sBAAsB,IAAI;CAEtC,MAAM,cAAc,EAAE,GADR,WACgB,CAAC,aAAa;AAC5C,KAAI,SAAS,KACX,aAAY,OAAO;KAEnB,aAAY,OAAO,CAAC,GAAG,KAAK;AAE9B,YAAW,EAAE,aAAa,CAAC;;AAG7B,SAAgB,SAAS,QAAgC;AACvD,QAAO,GAAG,OAAO,SAAS,GAAG,OAAO;;;AAItC,SAAgB,qBACd,SACA,YACkB;AAClB,KAAI,eAAe,KAAM,QAAO;AAChC,KAAI,WAAW,WAAW,EAAG,QAAO;CACpC,MAAM,QAAQ,IAAI,IAAI,WAAW,KAAK,KAAK,QAAQ,CAAC,KAAK,IAAI,CAAC,CAAC;AAC/D,QAAO,QACJ,QAAQ,MAAM,MAAM,IAAI,SAAS,EAAE,CAAC,CAAC,CACrC,UAAU,GAAG,OAAO,MAAM,IAAI,SAAS,EAAE,CAAC,IAAI,MAAM,MAAM,IAAI,SAAS,EAAE,CAAC,IAAI,GAAG"}
+{"version":3,"file":"tui-scoped-models.js","names":[],"sources":["../../../src/tui/tui-scoped-models.ts"],"sourcesContent":["import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';\nimport { homedir } from 'node:os';\nimport { join } from 'node:path';\n\nimport type { TuiModelChoice } from './tui-backend.js';\n\nconst STORE_PATH = join(homedir(), '.xopc', 'tui-scoped-models.json');\n\ntype ScopedModelsFile = {\n  /** `null` = all models enabled for Ctrl+P cycle. */\n  byWorkspace?: Record<string, string[] | null>;\n};\n\nfunction normalizeWorkspaceKey(cwd: string): string {\n  return cwd.replace(/\\\\/g, '/').replace(/\\/+$/, '') || '/';\n}\n\nfunction readStore(): ScopedModelsFile {\n  try {\n    if (!existsSync(STORE_PATH)) return {};\n    const raw = readFileSync(STORE_PATH, 'utf8');\n    const parsed = JSON.parse(raw) as ScopedModelsFile;\n    return parsed && typeof parsed === 'object' ? parsed : {};\n  } catch {\n    return {};\n  }\n}\n\nfunction writeStore(data: ScopedModelsFile): void {\n  const dir = join(homedir(), '.xopc');\n  if (!existsSync(dir)) {\n    mkdirSync(dir, { recursive: true });\n  }\n  writeFileSync(STORE_PATH, `${JSON.stringify(data, null, 2)}\\n`, 'utf8');\n}\n\n/** Load scoped model refs for Ctrl+P cycling (`null` = all models). */\nexport function loadScopedModelRefs(cwd: string = process.cwd()): string[] | null {\n  const key = normalizeWorkspaceKey(cwd);\n  const store = readStore();\n  const entry = store.byWorkspace?.[key];\n  if (entry === undefined) return null;\n  if (entry === null) return null;\n  return [...entry];\n}\n\n/** Persist scoped model refs for this workspace. Pass `null` to enable all models. */\nexport function saveScopedModelRefs(\n  refs: string[] | null,\n  cwd: string = process.cwd(),\n): void {\n  const key = normalizeWorkspaceKey(cwd);\n  const store = readStore();\n  const byWorkspace = { ...store.byWorkspace };\n  if (refs === null) {\n    byWorkspace[key] = null;\n  } else {\n    byWorkspace[key] = [...refs];\n  }\n  writeStore({ byWorkspace });\n}\n\nexport function modelRef(choice: TuiModelChoice): string {\n  return `${choice.provider}/${choice.id}`;\n}\n\n/** Filter catalog by scoped refs; `null` means full catalog, empty array means no scoped models. */\nexport function filterModelsForCycle(\n  catalog: TuiModelChoice[],\n  scopedRefs: string[] | null,\n): TuiModelChoice[] {\n  if (scopedRefs === null) return catalog;\n  if (scopedRefs.length === 0) return [];\n  const order = new Map(scopedRefs.map((ref, idx) => [ref, idx]));\n  return catalog\n    .filter((m) => order.has(modelRef(m)))\n    .toSorted((a, b) => (order.get(modelRef(a)) ?? 0) - (order.get(modelRef(b)) ?? 0));\n}\n"],"mappings":";;;;AAMA,MAAM,aAAa,KAAK,SAAS,EAAE,SAAS,yBAAyB;AAOrE,SAAS,sBAAsB,KAAqB;AAClD,QAAO,IAAI,QAAQ,OAAO,IAAI,CAAC,QAAQ,QAAQ,GAAG,IAAI;;AAGxD,SAAS,YAA8B;AACrC,KAAI;AACF,MAAI,CAAC,WAAW,WAAW,CAAE,QAAO,EAAE;EACtC,MAAM,MAAM,aAAa,YAAY,OAAO;EAC5C,MAAM,SAAS,KAAK,MAAM,IAAI;AAC9B,SAAO,UAAU,OAAO,WAAW,WAAW,SAAS,EAAE;SACnD;AACN,SAAO,EAAE;;;AAIb,SAAS,WAAW,MAA8B;CAChD,MAAM,MAAM,KAAK,SAAS,EAAE,QAAQ;AACpC,KAAI,CAAC,WAAW,IAAI,CAClB,WAAU,KAAK,EAAE,WAAW,MAAM,CAAC;AAErC,eAAc,YAAY,GAAG,KAAK,UAAU,MAAM,MAAM,EAAE,CAAC,KAAK,OAAO;;;AAIzE,SAAgB,oBAAoB,MAAc,QAAQ,KAAK,EAAmB;CAChF,MAAM,MAAM,sBAAsB,IAAI;CAEtC,MAAM,QADQ,WACK,CAAC,cAAc;AAClC,KAAI,UAAU,KAAA,EAAW,QAAO;AAChC,KAAI,UAAU,KAAM,QAAO;AAC3B,QAAO,CAAC,GAAG,MAAM;;;AAInB,SAAgB,oBACd,MACA,MAAc,QAAQ,KAAK,EACrB;CACN,MAAM,MAAM,sBAAsB,IAAI;CAEtC,MAAM,cAAc,EAAE,GADR,WACgB,CAAC,aAAa;AAC5C,KAAI,SAAS,KACX,aAAY,OAAO;KAEnB,aAAY,OAAO,CAAC,GAAG,KAAK;AAE9B,YAAW,EAAE,aAAa,CAAC;;AAG7B,SAAgB,SAAS,QAAgC;AACvD,QAAO,GAAG,OAAO,SAAS,GAAG,OAAO;;;AAItC,SAAgB,qBACd,SACA,YACkB;AAClB,KAAI,eAAe,KAAM,QAAO;AAChC,KAAI,WAAW,WAAW,EAAG,QAAO,EAAE;CACtC,MAAM,QAAQ,IAAI,IAAI,WAAW,KAAK,KAAK,QAAQ,CAAC,KAAK,IAAI,CAAC,CAAC;AAC/D,QAAO,QACJ,QAAQ,MAAM,MAAM,IAAI,SAAS,EAAE,CAAC,CAAC,CACrC,UAAU,GAAG,OAAO,MAAM,IAAI,SAAS,EAAE,CAAC,IAAI,MAAM,MAAM,IAAI,SAAS,EAAE,CAAC,IAAI,GAAG"}

package/dist/src/tui/tui-session-actions.d.ts

@@ -1,24 +1,26 @@
 import type { TUI } from '@earendil-works/pi-tui';
 import type { ChatLog } from './components/chat-log.js';
 import type { TuiBackend } from './tui-backend.js';
-import type { StreamAssembler } from './stream-assembler.js';
 import type { TuiState } from './tui-types.js';
+import type { TuiSessionSnapshot } from './tui-session-snapshot.js';
 export type SessionActionsContext = {
     client: TuiBackend;
     chatLog: ChatLog;
     tui: TUI;
     state: TuiState;
-    assembler: StreamAssembler;
     resolveSessionKey: (raw?: string) => string;
     updateHeader: () => void;
     updateFooter: () => void;
     setActivityStatus: (status: string) => void;
     historyLimit?: number;
     onAgentIdChange?: (agentId: string) => void;
+    sessionSnapshot?: TuiSessionSnapshot;
 };
 export declare function createSessionActions(context: SessionActionsContext): {
     refreshSessionInfo: () => Promise<void>;
-    loadHistory: () => Promise<void>;
+    loadHistory: (opts?: {
+        merge?: boolean;
+    }) => Promise<void>;
     setSession: (rawKey: string) => Promise<void>;
     abortActive: (opts?: {
         clearUi?: boolean;

package/dist/src/tui/tui-session-actions.js

@@ -1,12 +1,14 @@
 import { parseAgentSessionKey } from "../routing/session-key-utils.js";
 import { init_agent_session_key } from "../routing/agent-session-key.js";
-import { appendHistoryToChatLog } from "./chat-history.js";
-import { clearPendingToolCallIds } from "./tui-agent-events.js";
+import { appendHistoryToChatLog, historyKeysHaveAppendOnlyPrefix, historyMessageKey } from "./chat-history.js";
+import { markRunAborting, markRunIdleAfterAbort, resetRunStatus } from "./tui-run-state.js";
+import { clearSeenStreamEvents } from "./tui-agent-events.js";
 //#region src/tui/tui-session-actions.ts
 init_agent_session_key();
 function createSessionActions(context) {
-	const { client, chatLog, tui, state, assembler, resolveSessionKey, updateHeader, updateFooter, setActivityStatus, historyLimit = 200, onAgentIdChange } = context;
+	const { client, chatLog, tui, state, resolveSessionKey, updateHeader, updateFooter, setActivityStatus, historyLimit = 200, onAgentIdChange, sessionSnapshot } = context;
 	let refreshSessionInfoPromise = Promise.resolve();
+	let lastHistoryKeys = [];
 	const updateAgentFromSessionKey = (key) => {
 		const parsed = parseAgentSessionKey(key);
 		if (!parsed?.agentId) return;
@@ -24,20 +26,29 @@ function createSessionActions(context) {
 		await refreshSessionInfoPromise;
 	};
 	const clearChatForSessionSwitch = () => {
-		assembler.clear();
 		chatLog.clearAll();
-		clearPendingToolCallIds();
+		clearSeenStreamEvents();
+		sessionSnapshot?.clear();
+		lastHistoryKeys = [];
+		resetRunStatus(state);
 		state.historyLoaded = false;
 		state.messageFollowUpQueue.length = 0;
+		state.steeringQueue.length = 0;
 	};
-	const loadHistory = async () => {
+	const loadHistory = async (opts) => {
 		try {
 			const { messages } = await client.loadHistory({
 				sessionKey: state.currentSessionKey,
 				limit: historyLimit
 			});
-			chatLog.clearAll();
-			appendHistoryToChatLog(chatLog, messages, state.toolsExpanded);
+			sessionSnapshot?.replaceFromHistory(messages);
+			const nextKeys = messages.map(historyMessageKey);
+			if (opts?.merge === true && historyKeysHaveAppendOnlyPrefix(lastHistoryKeys, nextKeys)) appendHistoryToChatLog(chatLog, messages.slice(lastHistoryKeys.length), state.toolsExpanded, state.showThinking, { startIndex: lastHistoryKeys.length });
+			else {
+				chatLog.clearAll();
+				appendHistoryToChatLog(chatLog, messages, state.toolsExpanded, state.showThinking);
+			}
+			lastHistoryKeys = nextKeys;
 		} catch {} finally {
 			state.historyLoaded = true;
 			await refreshSessionInfo();
@@ -58,10 +69,11 @@ function createSessionActions(context) {
 	const abortActive = async (opts) => {
 		if (!state.activeRunId) return;
 		const runId = state.activeRunId;
+		markRunAborting(state, runId);
 		state.activeRunId = null;
-		assembler.drop(runId);
 		if (opts?.clearUi !== false) chatLog.dropAssistant(runId);
 		setActivityStatus("idle");
+		markRunIdleAfterAbort(state);
 		tui.requestRender();
 		await client.abortChat({
 			sessionKey: state.currentSessionKey,

package/dist/src/tui/tui-session-actions.js.map

@@ -1 +1 @@
-{"version":3,"file":"tui-session-actions.js","names":[],"sources":["../../../src/tui/tui-session-actions.ts"],"sourcesContent":["import type { TUI } from '@earendil-works/pi-tui';\n\nimport { parseAgentSessionKey } from '../routing/agent-session-key.js';\nimport { appendHistoryToChatLog } from './chat-history.js';\nimport type { ChatLog } from './components/chat-log.js';\nimport { clearPendingToolCallIds } from './tui-agent-events.js';\nimport type { TuiBackend } from './tui-backend.js';\nimport type { StreamAssembler } from './stream-assembler.js';\nimport type { TuiState } from './tui-types.js';\n\nexport type SessionActionsContext = {\n  client: TuiBackend;\n  chatLog: ChatLog;\n  tui: TUI;\n  state: TuiState;\n  assembler: StreamAssembler;\n  resolveSessionKey: (raw?: string) => string;\n  updateHeader: () => void;\n  updateFooter: () => void;\n  setActivityStatus: (status: string) => void;\n  historyLimit?: number;\n  onAgentIdChange?: (agentId: string) => void;\n};\n\nexport function createSessionActions(context: SessionActionsContext) {\n  const {\n    client,\n    chatLog,\n    tui,\n    state,\n    assembler,\n    resolveSessionKey,\n    updateHeader,\n    updateFooter,\n    setActivityStatus,\n    historyLimit = 200,\n    onAgentIdChange,\n  } = context;\n\n  let refreshSessionInfoPromise: Promise<void> = Promise.resolve();\n\n  const updateAgentFromSessionKey = (key: string) => {\n    const parsed = parseAgentSessionKey(key);\n    if (!parsed?.agentId) {\n      return;\n    }\n    onAgentIdChange?.(parsed.agentId);\n  };\n\n  const runRefreshSessionInfo = async () => {\n    try {\n      state.sessionInfo = await client.getSessionInfo(state.currentSessionKey);\n      updateFooter();\n      tui.requestRender();\n    } catch {\n      // ignore\n    }\n  };\n\n  const refreshSessionInfo = async () => {\n    refreshSessionInfoPromise = refreshSessionInfoPromise.then(\n      runRefreshSessionInfo,\n      runRefreshSessionInfo,\n    );\n    await refreshSessionInfoPromise;\n  };\n\n  const clearChatForSessionSwitch = () => {\n    assembler.clear();\n    chatLog.clearAll();\n    clearPendingToolCallIds();\n    state.historyLoaded = false;\n    state.messageFollowUpQueue.length = 0;\n  };\n\n  const loadHistory = async () => {\n    try {\n      const { messages } = await client.loadHistory({\n        sessionKey: state.currentSessionKey,\n        limit: historyLimit,\n      });\n      chatLog.clearAll();\n      appendHistoryToChatLog(chatLog, messages, state.toolsExpanded);\n    } catch {\n      // ignore; footer already hints on disconnect\n    } finally {\n      state.historyLoaded = true;\n      await refreshSessionInfo();\n      tui.requestRender();\n    }\n  };\n\n  const setSession = async (rawKey: string) => {\n    const nextKey = resolveSessionKey(rawKey);\n    updateAgentFromSessionKey(nextKey);\n    state.currentSessionKey = nextKey;\n    state.activeRunId = null;\n    setActivityStatus('idle');\n    clearChatForSessionSwitch();\n    updateHeader();\n    updateFooter();\n    await loadHistory();\n  };\n\n  const abortActive = async (opts?: { clearUi?: boolean }) => {\n    if (!state.activeRunId) {\n      return;\n    }\n    const runId = state.activeRunId;\n    state.activeRunId = null;\n    assembler.drop(runId);\n    if (opts?.clearUi !== false) {\n      chatLog.dropAssistant(runId);\n    }\n    setActivityStatus('idle');\n    tui.requestRender();\n    await client.abortChat({ sessionKey: state.currentSessionKey, runId }).catch(() => {});\n  };\n\n  const resetCurrentSession = async () => {\n    await client.resetSession(state.currentSessionKey);\n    clearChatForSessionSwitch();\n    await loadHistory();\n  };\n\n  return {\n    refreshSessionInfo,\n    loadHistory,\n    setSession,\n    abortActive,\n    resetCurrentSession,\n    clearChatForSessionSwitch,\n  };\n}\n"],"mappings":";;;;;wBAEuE;AAsBvE,SAAgB,qBAAqB,SAAgC;CACnE,MAAM,EACJ,QACA,SACA,KACA,OACA,WACA,mBACA,cACA,cACA,mBACA,eAAe,KACf,oBACE;CAEJ,IAAI,4BAA2C,QAAQ,SAAS;CAEhE,MAAM,6BAA6B,QAAgB;EACjD,MAAM,SAAS,qBAAqB,IAAI;AACxC,MAAI,CAAC,QAAQ,QACX;AAEF,oBAAkB,OAAO,QAAQ;;CAGnC,MAAM,wBAAwB,YAAY;AACxC,MAAI;AACF,SAAM,cAAc,MAAM,OAAO,eAAe,MAAM,kBAAkB;AACxE,iBAAc;AACd,OAAI,eAAe;UACb;;CAKV,MAAM,qBAAqB,YAAY;AACrC,8BAA4B,0BAA0B,KACpD,uBACA,sBACD;AACD,QAAM;;CAGR,MAAM,kCAAkC;AACtC,YAAU,OAAO;AACjB,UAAQ,UAAU;AAClB,2BAAyB;AACzB,QAAM,gBAAgB;AACtB,QAAM,qBAAqB,SAAS;;CAGtC,MAAM,cAAc,YAAY;AAC9B,MAAI;GACF,MAAM,EAAE,aAAa,MAAM,OAAO,YAAY;IAC5C,YAAY,MAAM;IAClB,OAAO;IACR,CAAC;AACF,WAAQ,UAAU;AAClB,0BAAuB,SAAS,UAAU,MAAM,cAAc;UACxD,WAEE;AACR,SAAM,gBAAgB;AACtB,SAAM,oBAAoB;AAC1B,OAAI,eAAe;;;CAIvB,MAAM,aAAa,OAAO,WAAmB;EAC3C,MAAM,UAAU,kBAAkB,OAAO;AACzC,4BAA0B,QAAQ;AAClC,QAAM,oBAAoB;AAC1B,QAAM,cAAc;AACpB,oBAAkB,OAAO;AACzB,6BAA2B;AAC3B,gBAAc;AACd,gBAAc;AACd,QAAM,aAAa;;CAGrB,MAAM,cAAc,OAAO,SAAiC;AAC1D,MAAI,CAAC,MAAM,YACT;EAEF,MAAM,QAAQ,MAAM;AACpB,QAAM,cAAc;AACpB,YAAU,KAAK,MAAM;AACrB,MAAI,MAAM,YAAY,MACpB,SAAQ,cAAc,MAAM;AAE9B,oBAAkB,OAAO;AACzB,MAAI,eAAe;AACnB,QAAM,OAAO,UAAU;GAAE,YAAY,MAAM;GAAmB;GAAO,CAAC,CAAC,YAAY,GAAG;;CAGxF,MAAM,sBAAsB,YAAY;AACtC,QAAM,OAAO,aAAa,MAAM,kBAAkB;AAClD,6BAA2B;AAC3B,QAAM,aAAa;;AAGrB,QAAO;EACL;EACA;EACA;EACA;EACA;EACA;EACD"}
+{"version":3,"file":"tui-session-actions.js","names":[],"sources":["../../../src/tui/tui-session-actions.ts"],"sourcesContent":["import type { TUI } from '@earendil-works/pi-tui';\n\nimport { parseAgentSessionKey } from '../routing/agent-session-key.js';\nimport {\n  appendHistoryToChatLog,\n  historyKeysHaveAppendOnlyPrefix,\n  historyMessageKey,\n} from './chat-history.js';\nimport type { ChatLog } from './components/chat-log.js';\nimport { clearSeenStreamEvents } from './tui-agent-events.js';\nimport type { TuiBackend } from './tui-backend.js';\nimport type { TuiState } from './tui-types.js';\nimport type { TuiSessionSnapshot } from './tui-session-snapshot.js';\nimport {\n  markRunAborting,\n  markRunIdleAfterAbort,\n  resetRunStatus,\n} from './tui-run-state.js';\n\nexport type SessionActionsContext = {\n  client: TuiBackend;\n  chatLog: ChatLog;\n  tui: TUI;\n  state: TuiState;\n  resolveSessionKey: (raw?: string) => string;\n  updateHeader: () => void;\n  updateFooter: () => void;\n  setActivityStatus: (status: string) => void;\n  historyLimit?: number;\n  onAgentIdChange?: (agentId: string) => void;\n  sessionSnapshot?: TuiSessionSnapshot;\n};\n\nexport function createSessionActions(context: SessionActionsContext) {\n  const {\n    client,\n    chatLog,\n    tui,\n    state,\n    resolveSessionKey,\n    updateHeader,\n    updateFooter,\n    setActivityStatus,\n    historyLimit = 200,\n    onAgentIdChange,\n    sessionSnapshot,\n  } = context;\n\n  let refreshSessionInfoPromise: Promise<void> = Promise.resolve();\n  let lastHistoryKeys: string[] = [];\n\n  const updateAgentFromSessionKey = (key: string) => {\n    const parsed = parseAgentSessionKey(key);\n    if (!parsed?.agentId) {\n      return;\n    }\n    onAgentIdChange?.(parsed.agentId);\n  };\n\n  const runRefreshSessionInfo = async () => {\n    try {\n      state.sessionInfo = await client.getSessionInfo(state.currentSessionKey);\n      updateFooter();\n      tui.requestRender();\n    } catch {\n      // ignore\n    }\n  };\n\n  const refreshSessionInfo = async () => {\n    refreshSessionInfoPromise = refreshSessionInfoPromise.then(\n      runRefreshSessionInfo,\n      runRefreshSessionInfo,\n    );\n    await refreshSessionInfoPromise;\n  };\n\n  const clearChatForSessionSwitch = () => {\n    chatLog.clearAll();\n    clearSeenStreamEvents();\n    sessionSnapshot?.clear();\n    lastHistoryKeys = [];\n    resetRunStatus(state);\n    state.historyLoaded = false;\n    state.messageFollowUpQueue.length = 0;\n    state.steeringQueue.length = 0;\n  };\n\n  const loadHistory = async (opts?: { merge?: boolean }) => {\n    try {\n      const { messages } = await client.loadHistory({\n        sessionKey: state.currentSessionKey,\n        limit: historyLimit,\n      });\n      sessionSnapshot?.replaceFromHistory(messages);\n      const nextKeys = messages.map(historyMessageKey);\n      const canAppend =\n        opts?.merge === true &&\n        historyKeysHaveAppendOnlyPrefix(lastHistoryKeys, nextKeys);\n      if (canAppend) {\n        appendHistoryToChatLog(\n          chatLog,\n          messages.slice(lastHistoryKeys.length),\n          state.toolsExpanded,\n          state.showThinking,\n          { startIndex: lastHistoryKeys.length },\n        );\n      } else {\n        chatLog.clearAll();\n        appendHistoryToChatLog(chatLog, messages, state.toolsExpanded, state.showThinking);\n      }\n      lastHistoryKeys = nextKeys;\n    } catch {\n      // ignore; footer already hints on disconnect\n    } finally {\n      state.historyLoaded = true;\n      await refreshSessionInfo();\n      tui.requestRender();\n    }\n  };\n\n  const setSession = async (rawKey: string) => {\n    const nextKey = resolveSessionKey(rawKey);\n    updateAgentFromSessionKey(nextKey);\n    state.currentSessionKey = nextKey;\n    state.activeRunId = null;\n    setActivityStatus('idle');\n    clearChatForSessionSwitch();\n    updateHeader();\n    updateFooter();\n    await loadHistory();\n  };\n\n  const abortActive = async (opts?: { clearUi?: boolean }) => {\n    if (!state.activeRunId) {\n      return;\n    }\n    const runId = state.activeRunId;\n    markRunAborting(state, runId);\n    state.activeRunId = null;\n    if (opts?.clearUi !== false) {\n      chatLog.dropAssistant(runId);\n    }\n    setActivityStatus('idle');\n    markRunIdleAfterAbort(state);\n    tui.requestRender();\n    await client.abortChat({ sessionKey: state.currentSessionKey, runId }).catch(() => {});\n  };\n\n  const resetCurrentSession = async () => {\n    await client.resetSession(state.currentSessionKey);\n    clearChatForSessionSwitch();\n    await loadHistory();\n  };\n\n  return {\n    refreshSessionInfo,\n    loadHistory,\n    setSession,\n    abortActive,\n    resetCurrentSession,\n    clearChatForSessionSwitch,\n  };\n}\n"],"mappings":";;;;;;wBAEuE;AA+BvE,SAAgB,qBAAqB,SAAgC;CACnE,MAAM,EACJ,QACA,SACA,KACA,OACA,mBACA,cACA,cACA,mBACA,eAAe,KACf,iBACA,oBACE;CAEJ,IAAI,4BAA2C,QAAQ,SAAS;CAChE,IAAI,kBAA4B,EAAE;CAElC,MAAM,6BAA6B,QAAgB;EACjD,MAAM,SAAS,qBAAqB,IAAI;AACxC,MAAI,CAAC,QAAQ,QACX;AAEF,oBAAkB,OAAO,QAAQ;;CAGnC,MAAM,wBAAwB,YAAY;AACxC,MAAI;AACF,SAAM,cAAc,MAAM,OAAO,eAAe,MAAM,kBAAkB;AACxE,iBAAc;AACd,OAAI,eAAe;UACb;;CAKV,MAAM,qBAAqB,YAAY;AACrC,8BAA4B,0BAA0B,KACpD,uBACA,sBACD;AACD,QAAM;;CAGR,MAAM,kCAAkC;AACtC,UAAQ,UAAU;AAClB,yBAAuB;AACvB,mBAAiB,OAAO;AACxB,oBAAkB,EAAE;AACpB,iBAAe,MAAM;AACrB,QAAM,gBAAgB;AACtB,QAAM,qBAAqB,SAAS;AACpC,QAAM,cAAc,SAAS;;CAG/B,MAAM,cAAc,OAAO,SAA+B;AACxD,MAAI;GACF,MAAM,EAAE,aAAa,MAAM,OAAO,YAAY;IAC5C,YAAY,MAAM;IAClB,OAAO;IACR,CAAC;AACF,oBAAiB,mBAAmB,SAAS;GAC7C,MAAM,WAAW,SAAS,IAAI,kBAAkB;AAIhD,OAFE,MAAM,UAAU,QAChB,gCAAgC,iBAAiB,SAAS,CAE1D,wBACE,SACA,SAAS,MAAM,gBAAgB,OAAO,EACtC,MAAM,eACN,MAAM,cACN,EAAE,YAAY,gBAAgB,QAAQ,CACvC;QACI;AACL,YAAQ,UAAU;AAClB,2BAAuB,SAAS,UAAU,MAAM,eAAe,MAAM,aAAa;;AAEpF,qBAAkB;UACZ,WAEE;AACR,SAAM,gBAAgB;AACtB,SAAM,oBAAoB;AAC1B,OAAI,eAAe;;;CAIvB,MAAM,aAAa,OAAO,WAAmB;EAC3C,MAAM,UAAU,kBAAkB,OAAO;AACzC,4BAA0B,QAAQ;AAClC,QAAM,oBAAoB;AAC1B,QAAM,cAAc;AACpB,oBAAkB,OAAO;AACzB,6BAA2B;AAC3B,gBAAc;AACd,gBAAc;AACd,QAAM,aAAa;;CAGrB,MAAM,cAAc,OAAO,SAAiC;AAC1D,MAAI,CAAC,MAAM,YACT;EAEF,MAAM,QAAQ,MAAM;AACpB,kBAAgB,OAAO,MAAM;AAC7B,QAAM,cAAc;AACpB,MAAI,MAAM,YAAY,MACpB,SAAQ,cAAc,MAAM;AAE9B,oBAAkB,OAAO;AACzB,wBAAsB,MAAM;AAC5B,MAAI,eAAe;AACnB,QAAM,OAAO,UAAU;GAAE,YAAY,MAAM;GAAmB;GAAO,CAAC,CAAC,YAAY,GAAG;;CAGxF,MAAM,sBAAsB,YAAY;AACtC,QAAM,OAAO,aAAa,MAAM,kBAAkB;AAClD,6BAA2B;AAC3B,QAAM,aAAa;;AAGrB,QAAO;EACL;EACA;EACA;EACA;EACA;EACA;EACD"}

package/dist/src/tui/tui-session-format.d.ts

@@ -1,6 +1,9 @@
 import type { SessionMetadata } from '../session/types.js';
 import type { TuiSessionItem } from './tui-backend.js';
+export declare function shortenSessionPath(path: string): string;
 /** Compact relative time for session picker rows (pi-style). */
 export declare function formatSessionAge(updatedAtMs: number | null | undefined): string;
 export declare function sessionMetadataToTuiItem(meta: SessionMetadata): TuiSessionItem;
-export declare function formatSessionPickerDescription(session: TuiSessionItem): string;
+export declare function formatSessionPickerDescription(session: TuiSessionItem, options?: {
+    showKey?: boolean;
+}): string;

package/dist/src/tui/tui-session-format.js

@@ -1,4 +1,12 @@
 //#region src/tui/tui-session-format.ts
+function homeDir() {
+	return process.env.HOME || process.env.USERPROFILE;
+}
+function shortenSessionPath(path) {
+	const home = homeDir();
+	if (home && path.startsWith(home)) return `~${path.slice(home.length)}`;
+	return path;
+}
 /** Compact relative time for session picker rows (pi-style). */
 function formatSessionAge(updatedAtMs) {
 	if (updatedAtMs == null || !Number.isFinite(updatedAtMs)) return "";
@@ -23,19 +31,25 @@ function sessionMetadataToTuiItem(meta) {
 		updatedAt: Date.parse(meta.updatedAt),
 		totalTokens: meta.estimatedTokens ?? null,
 		messageCount: meta.messageCount,
-		model: modelRef
+		model: modelRef,
+		forkedFromSessionKey: typeof cd?.forkedFromSessionKey === "string" ? cd.forkedFromSessionKey : void 0,
+		cwd: meta.cwd
 	};
 }
-function formatSessionPickerDescription(session) {
+function formatSessionPickerDescription(session, options = {}) {
 	const parts = [];
 	const age = formatSessionAge(session.updatedAt ?? null);
 	if (age) parts.push(age);
 	if (session.messageCount != null) parts.push(`${session.messageCount} msgs`);
 	if (session.totalTokens != null) parts.push(`${session.totalTokens} tok`);
 	if (session.model) parts.push(String(session.model));
+	if (options.showKey) {
+		if (session.cwd) parts.push(shortenSessionPath(session.cwd));
+		parts.push(session.key);
+	}
 	return parts.join(" · ");
 }
 //#endregion
-export { formatSessionAge, formatSessionPickerDescription, sessionMetadataToTuiItem };
+export { formatSessionAge, formatSessionPickerDescription, sessionMetadataToTuiItem, shortenSessionPath };
 
 //# sourceMappingURL=tui-session-format.js.map

package/dist/src/tui/tui-session-format.js.map

@@ -1 +1 @@
-{"version":3,"file":"tui-session-format.js","names":[],"sources":["../../../src/tui/tui-session-format.ts"],"sourcesContent":["import type { SessionMetadata } from '../session/types.js';\nimport type { TuiSessionItem } from './tui-backend.js';\n\n/** Compact relative time for session picker rows (pi-style). */\nexport function formatSessionAge(updatedAtMs: number | null | undefined): string {\n  if (updatedAtMs == null || !Number.isFinite(updatedAtMs)) return '';\n  const diffMs = Date.now() - updatedAtMs;\n  if (diffMs < 60_000) return 'now';\n  const diffMins = Math.floor(diffMs / 60_000);\n  if (diffMins < 60) return `${diffMins}m`;\n  const diffHours = Math.floor(diffMs / 3_600_000);\n  if (diffHours < 24) return `${diffHours}h`;\n  const diffDays = Math.floor(diffMs / 86_400_000);\n  if (diffDays < 7) return `${diffDays}d`;\n  if (diffDays < 30) return `${Math.floor(diffDays / 7)}w`;\n  if (diffDays < 365) return `${Math.floor(diffDays / 30)}mo`;\n  return `${Math.floor(diffDays / 365)}y`;\n}\n\nexport function sessionMetadataToTuiItem(meta: SessionMetadata): TuiSessionItem {\n  const cd = meta.customData;\n  const modelRef =\n    typeof cd?.model === 'string'\n      ? cd.model\n      : typeof cd?.modelRef === 'string'\n        ? cd.modelRef\n        : null;\n  return {\n    key: meta.key,\n    displayName: meta.name,\n    updatedAt: Date.parse(meta.updatedAt),\n    totalTokens: meta.estimatedTokens ?? null,\n    messageCount: meta.messageCount,\n    model: modelRef,\n  };\n}\n\nexport function formatSessionPickerDescription(session: TuiSessionItem): string {\n  const parts: string[] = [];\n  const age = formatSessionAge(session.updatedAt ?? null);\n  if (age) parts.push(age);\n  if (session.messageCount != null) parts.push(`${session.messageCount} msgs`);\n  if (session.totalTokens != null) parts.push(`${session.totalTokens} tok`);\n  if (session.model) parts.push(String(session.model));\n  return parts.join(' · ');\n}\n"],"mappings":";;AAIA,SAAgB,iBAAiB,aAAgD;AAC/E,KAAI,eAAe,QAAQ,CAAC,OAAO,SAAS,YAAY,CAAE,QAAO;CACjE,MAAM,SAAS,KAAK,KAAK,GAAG;AAC5B,KAAI,SAAS,IAAQ,QAAO;CAC5B,MAAM,WAAW,KAAK,MAAM,SAAS,IAAO;AAC5C,KAAI,WAAW,GAAI,QAAO,GAAG,SAAS;CACtC,MAAM,YAAY,KAAK,MAAM,SAAS,KAAU;AAChD,KAAI,YAAY,GAAI,QAAO,GAAG,UAAU;CACxC,MAAM,WAAW,KAAK,MAAM,SAAS,MAAW;AAChD,KAAI,WAAW,EAAG,QAAO,GAAG,SAAS;AACrC,KAAI,WAAW,GAAI,QAAO,GAAG,KAAK,MAAM,WAAW,EAAE,CAAC;AACtD,KAAI,WAAW,IAAK,QAAO,GAAG,KAAK,MAAM,WAAW,GAAG,CAAC;AACxD,QAAO,GAAG,KAAK,MAAM,WAAW,IAAI,CAAC;;AAGvC,SAAgB,yBAAyB,MAAuC;CAC9E,MAAM,KAAK,KAAK;CAChB,MAAM,WACJ,OAAO,IAAI,UAAU,WACjB,GAAG,QACH,OAAO,IAAI,aAAa,WACtB,GAAG,WACH;AACR,QAAO;EACL,KAAK,KAAK;EACV,aAAa,KAAK;EAClB,WAAW,KAAK,MAAM,KAAK,UAAU;EACrC,aAAa,KAAK,mBAAmB;EACrC,cAAc,KAAK;EACnB,OAAO;EACR;;AAGH,SAAgB,+BAA+B,SAAiC;CAC9E,MAAM,QAAkB,EAAE;CAC1B,MAAM,MAAM,iBAAiB,QAAQ,aAAa,KAAK;AACvD,KAAI,IAAK,OAAM,KAAK,IAAI;AACxB,KAAI,QAAQ,gBAAgB,KAAM,OAAM,KAAK,GAAG,QAAQ,aAAa,OAAO;AAC5E,KAAI,QAAQ,eAAe,KAAM,OAAM,KAAK,GAAG,QAAQ,YAAY,MAAM;AACzE,KAAI,QAAQ,MAAO,OAAM,KAAK,OAAO,QAAQ,MAAM,CAAC;AACpD,QAAO,MAAM,KAAK,MAAM"}
+{"version":3,"file":"tui-session-format.js","names":[],"sources":["../../../src/tui/tui-session-format.ts"],"sourcesContent":["import type { SessionMetadata } from '../session/types.js';\nimport type { TuiSessionItem } from './tui-backend.js';\n\nfunction homeDir(): string | undefined {\n  return process.env.HOME || process.env.USERPROFILE;\n}\n\nexport function shortenSessionPath(path: string): string {\n  const home = homeDir();\n  if (home && path.startsWith(home)) {\n    return `~${path.slice(home.length)}`;\n  }\n  return path;\n}\n\n/** Compact relative time for session picker rows (pi-style). */\nexport function formatSessionAge(updatedAtMs: number | null | undefined): string {\n  if (updatedAtMs == null || !Number.isFinite(updatedAtMs)) return '';\n  const diffMs = Date.now() - updatedAtMs;\n  if (diffMs < 60_000) return 'now';\n  const diffMins = Math.floor(diffMs / 60_000);\n  if (diffMins < 60) return `${diffMins}m`;\n  const diffHours = Math.floor(diffMs / 3_600_000);\n  if (diffHours < 24) return `${diffHours}h`;\n  const diffDays = Math.floor(diffMs / 86_400_000);\n  if (diffDays < 7) return `${diffDays}d`;\n  if (diffDays < 30) return `${Math.floor(diffDays / 7)}w`;\n  if (diffDays < 365) return `${Math.floor(diffDays / 30)}mo`;\n  return `${Math.floor(diffDays / 365)}y`;\n}\n\nexport function sessionMetadataToTuiItem(meta: SessionMetadata): TuiSessionItem {\n  const cd = meta.customData;\n  const modelRef =\n    typeof cd?.model === 'string'\n      ? cd.model\n      : typeof cd?.modelRef === 'string'\n        ? cd.modelRef\n        : null;\n  return {\n    key: meta.key,\n    displayName: meta.name,\n    updatedAt: Date.parse(meta.updatedAt),\n    totalTokens: meta.estimatedTokens ?? null,\n    messageCount: meta.messageCount,\n    model: modelRef,\n    forkedFromSessionKey:\n      typeof cd?.forkedFromSessionKey === 'string' ? cd.forkedFromSessionKey : undefined,\n    cwd: meta.cwd,\n  };\n}\n\nexport function formatSessionPickerDescription(\n  session: TuiSessionItem,\n  options: { showKey?: boolean } = {},\n): string {\n  const parts: string[] = [];\n  const age = formatSessionAge(session.updatedAt ?? null);\n  if (age) parts.push(age);\n  if (session.messageCount != null) parts.push(`${session.messageCount} msgs`);\n  if (session.totalTokens != null) parts.push(`${session.totalTokens} tok`);\n  if (session.model) parts.push(String(session.model));\n  if (options.showKey) {\n    if (session.cwd) parts.push(shortenSessionPath(session.cwd));\n    parts.push(session.key);\n  }\n  return parts.join(' · ');\n}\n"],"mappings":";AAGA,SAAS,UAA8B;AACrC,QAAO,QAAQ,IAAI,QAAQ,QAAQ,IAAI;;AAGzC,SAAgB,mBAAmB,MAAsB;CACvD,MAAM,OAAO,SAAS;AACtB,KAAI,QAAQ,KAAK,WAAW,KAAK,CAC/B,QAAO,IAAI,KAAK,MAAM,KAAK,OAAO;AAEpC,QAAO;;;AAIT,SAAgB,iBAAiB,aAAgD;AAC/E,KAAI,eAAe,QAAQ,CAAC,OAAO,SAAS,YAAY,CAAE,QAAO;CACjE,MAAM,SAAS,KAAK,KAAK,GAAG;AAC5B,KAAI,SAAS,IAAQ,QAAO;CAC5B,MAAM,WAAW,KAAK,MAAM,SAAS,IAAO;AAC5C,KAAI,WAAW,GAAI,QAAO,GAAG,SAAS;CACtC,MAAM,YAAY,KAAK,MAAM,SAAS,KAAU;AAChD,KAAI,YAAY,GAAI,QAAO,GAAG,UAAU;CACxC,MAAM,WAAW,KAAK,MAAM,SAAS,MAAW;AAChD,KAAI,WAAW,EAAG,QAAO,GAAG,SAAS;AACrC,KAAI,WAAW,GAAI,QAAO,GAAG,KAAK,MAAM,WAAW,EAAE,CAAC;AACtD,KAAI,WAAW,IAAK,QAAO,GAAG,KAAK,MAAM,WAAW,GAAG,CAAC;AACxD,QAAO,GAAG,KAAK,MAAM,WAAW,IAAI,CAAC;;AAGvC,SAAgB,yBAAyB,MAAuC;CAC9E,MAAM,KAAK,KAAK;CAChB,MAAM,WACJ,OAAO,IAAI,UAAU,WACjB,GAAG,QACH,OAAO,IAAI,aAAa,WACtB,GAAG,WACH;AACR,QAAO;EACL,KAAK,KAAK;EACV,aAAa,KAAK;EAClB,WAAW,KAAK,MAAM,KAAK,UAAU;EACrC,aAAa,KAAK,mBAAmB;EACrC,cAAc,KAAK;EACnB,OAAO;EACP,sBACE,OAAO,IAAI,yBAAyB,WAAW,GAAG,uBAAuB,KAAA;EAC3E,KAAK,KAAK;EACX;;AAGH,SAAgB,+BACd,SACA,UAAiC,EAAE,EAC3B;CACR,MAAM,QAAkB,EAAE;CAC1B,MAAM,MAAM,iBAAiB,QAAQ,aAAa,KAAK;AACvD,KAAI,IAAK,OAAM,KAAK,IAAI;AACxB,KAAI,QAAQ,gBAAgB,KAAM,OAAM,KAAK,GAAG,QAAQ,aAAa,OAAO;AAC5E,KAAI,QAAQ,eAAe,KAAM,OAAM,KAAK,GAAG,QAAQ,YAAY,MAAM;AACzE,KAAI,QAAQ,MAAO,OAAM,KAAK,OAAO,QAAQ,MAAM,CAAC;AACpD,KAAI,QAAQ,SAAS;AACnB,MAAI,QAAQ,IAAK,OAAM,KAAK,mBAAmB,QAAQ,IAAI,CAAC;AAC5D,QAAM,KAAK,QAAQ,IAAI;;AAEzB,QAAO,MAAM,KAAK,MAAM"}

package/dist/src/tui/tui-session-snapshot.d.ts

@@ -0,0 +1,82 @@
+import type { HistoryMessage } from './tui-backend.js';
+export type TuiSessionSnapshotEntryType = 'message' | 'compaction' | 'context' | 'bash' | 'custom' | 'branch';
+export interface TuiSessionSnapshotEntry {
+    id: string;
+    type: TuiSessionSnapshotEntryType;
+    parentId: string | null;
+    customType?: string;
+    data?: unknown;
+    display?: boolean;
+    userLabel?: string;
+    labelTimestamp?: string;
+    role?: 'user' | 'assistant' | 'system';
+    message?: {
+        role: 'user' | 'assistant' | 'system';
+        content: string;
+        usage?: {
+            input: number;
+            output: number;
+            cost: {
+                total: number;
+            };
+        };
+    };
+    content: string;
+    timestamp?: number;
+    raw?: HistoryMessage | Record<string, unknown>;
+}
+export interface TuiSessionSnapshotHeader {
+    type: 'session';
+    version?: number;
+    id: string;
+    timestamp: string;
+    cwd: string;
+    parentSession?: string;
+}
+export interface TuiSessionSnapshotTreeNode {
+    entry: TuiSessionSnapshotEntry;
+    children: TuiSessionSnapshotTreeNode[];
+    label?: string;
+    labelTimestamp?: string;
+}
+export interface TuiReadonlySessionManager {
+    getEntries(): TuiSessionSnapshotEntry[];
+    getBranch(): TuiSessionSnapshotEntry[];
+    getLeafEntry(): TuiSessionSnapshotEntry | undefined;
+    getLeafId(): string | null;
+    getEntry(entryId: string): TuiSessionSnapshotEntry | undefined;
+    getLabel(entryId: string): string | undefined;
+    getHeader(): TuiSessionSnapshotHeader | null;
+    getTree(): TuiSessionSnapshotTreeNode[];
+    getSessionId(): string;
+    getSessionFile(): string | undefined;
+    getSessionDir(): string | undefined;
+    getSessionName(): string | undefined;
+    getCwd(): string;
+}
+export declare class TuiSessionSnapshot {
+    private readonly getSessionKey;
+    private readonly getCwdValue;
+    private readonly getSessionNameValue;
+    private readonly getSessionFileValue;
+    private readonly getSessionDirValue;
+    private entries;
+    private nextId;
+    constructor(getSessionKey: () => string, getCwdValue: () => string, getSessionNameValue: () => string | undefined, getSessionFileValue?: () => string | undefined, getSessionDirValue?: () => string | undefined);
+    replaceFromHistory(messages: HistoryMessage[]): void;
+    clear(): void;
+    appendMessage(role: 'user' | 'assistant' | 'system', content: string): void;
+    setLabel(entryId: string, label: string | undefined): void;
+    appendCustomEntry(customType: string, data?: unknown): void;
+    appendCustomMessage(message: {
+        customType: string;
+        content?: string | unknown[];
+        display?: boolean;
+        details?: unknown;
+    }): void;
+    manager(): TuiReadonlySessionManager;
+    private entryFromHistory;
+    private createHeader;
+    private createTree;
+    private createEntry;
+}