@narumitw/pi-starship 0.50.0 → 0.50.2

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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@narumitw/pi-starship",
3
- "version": "0.50.0",
3
+ "version": "0.50.2",
4
4
  "description": "Native Starship-style TOML statusline for the Pi coding agent.",
5
5
  "type": "module",
6
6
  "license": "MIT",
@@ -34,7 +34,7 @@
34
34
  "typecheck": "tsc --noEmit"
35
35
  },
36
36
  "dependencies": {
37
- "@narumitw/pi-tui-kit": "^0.49.1",
37
+ "@narumitw/pi-tui-kit": "^0.53.0",
38
38
  "smol-toml": "^1.7.1",
39
39
  "yaml": "^2.9.0"
40
40
  },
@@ -1,108 +1,27 @@
1
1
  import { stripVTControlCharacters } from "node:util";
2
- import type { ExtensionCommandContext, KeybindingsManager } from "@earendil-works/pi-coding-agent";
3
- import { Key, matchesKey, truncateToWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
4
2
  import type { StatuslineInspection } from "./modules/inspection.js";
5
3
 
6
- const RESERVED_HOST_ROWS = 3;
7
-
8
- export type InspectorResult = { kind: "back" } | { kind: "close" };
9
-
10
- export function showFooterExplanation(
11
- ctx: ExtensionCommandContext,
12
- inspection: StatuslineInspection | undefined,
13
- signal?: AbortSignal,
14
- ): Promise<InspectorResult | undefined> {
15
- if (signal?.aborted) return Promise.resolve({ kind: "close" });
16
- return ctx.ui.custom<InspectorResult | undefined>((tui, theme, keybindings, done) => {
17
- let scrollOffset = 0;
18
- let lastMaximumScroll = 0;
19
- let lastViewportSize = 1;
20
- let disposed = false;
21
- let settled = false;
22
- let deferredAbort: ReturnType<typeof setImmediate> | undefined;
23
- const finish = (result: InspectorResult) => {
24
- if (disposed || settled) return;
25
- settled = true;
26
- done(result);
27
- };
28
- const closeForAbort = () => finish({ kind: "close" });
29
- signal?.addEventListener("abort", closeForAbort, { once: true });
30
- if (signal?.aborted) deferredAbort = setImmediate(closeForAbort);
31
-
32
- return {
33
- focused: false,
34
- render(width: number): string[] {
35
- const safeWidth = Math.max(1, width);
36
- const availableRows = componentRows(tui.terminal.rows);
37
- const content = explanationLines(inspection, safeWidth);
38
- const layout = detailLayout(availableRows, content.length);
39
- lastViewportSize = layout.contentRows;
40
- lastMaximumScroll = Math.max(0, content.length - layout.contentRows);
41
- scrollOffset = clamp(scrollOffset, 0, lastMaximumScroll);
42
- const lines = [
43
- ...(layout.titleRows ? [theme.fg("accent", theme.bold("Explain footer"))] : []),
44
- ...content.slice(scrollOffset, scrollOffset + layout.contentRows),
45
- ...(layout.positionRows
46
- ? [theme.fg("dim", positionText(scrollOffset, layout.contentRows, content.length))]
47
- : []),
48
- ...(layout.hintRows ? [theme.fg("dim", detailHint(keybindings, "back"))] : []),
49
- ];
50
- return boundedLines(lines, safeWidth, availableRows);
51
- },
52
- invalidate() {},
53
- handleInput(data: string) {
54
- if (disposed || settled) return;
55
- if (matchesKey(data, Key.ctrl("c"))) finish({ kind: "close" });
56
- else if (keybindings.matches(data, "tui.select.cancel")) finish({ kind: "back" });
57
- else if (keybindings.matches(data, "tui.select.up")) {
58
- scrollOffset = clamp(scrollOffset - 1, 0, lastMaximumScroll);
59
- } else if (keybindings.matches(data, "tui.select.down")) {
60
- scrollOffset = clamp(scrollOffset + 1, 0, lastMaximumScroll);
61
- } else if (keybindings.matches(data, "tui.select.pageUp")) {
62
- scrollOffset = clamp(scrollOffset - lastViewportSize, 0, lastMaximumScroll);
63
- } else if (keybindings.matches(data, "tui.select.pageDown")) {
64
- scrollOffset = clamp(scrollOffset + lastViewportSize, 0, lastMaximumScroll);
65
- } else if (matchesKey(data, Key.home)) scrollOffset = 0;
66
- else if (matchesKey(data, Key.end)) scrollOffset = lastMaximumScroll;
67
- tui.requestRender();
68
- },
69
- dispose() {
70
- if (disposed) return;
71
- disposed = true;
72
- if (deferredAbort) clearImmediate(deferredAbort);
73
- deferredAbort = undefined;
74
- signal?.removeEventListener("abort", closeForAbort);
75
- },
76
- };
77
- });
78
- }
79
-
80
- function explanationLines(inspection: StatuslineInspection | undefined, width: number): string[] {
4
+ export function formatFooterExplanation(inspection: StatuslineInspection | undefined): string {
81
5
  if (!inspection) {
82
- return wrapLines(
83
- [
84
- "Footer inspection is unavailable until the TUI footer is ready.",
85
- "No collection work was started.",
86
- ],
87
- width,
88
- );
6
+ return safeLines([
7
+ "Footer inspection is unavailable until the TUI footer is ready.",
8
+ "No collection work was started.",
9
+ ]);
89
10
  }
90
11
  if (inspection.showing.length === 0) {
91
- return wrapLines(
92
- [
93
- "No modules are currently showing.",
94
- "Open Modules to inspect empty, disabled, or unreachable modules.",
95
- ],
96
- width,
97
- );
12
+ return safeLines([
13
+ "No modules are currently showing.",
14
+ "Open Modules to inspect empty, disabled, or unreachable modules.",
15
+ ]);
98
16
  }
99
- const lines = inspection.showing.flatMap((module, index) => [
100
- ...(index > 0 ? [""] : []),
101
- module.name,
102
- ...previewLines(module.preview),
103
- module.description,
104
- ]);
105
- return wrapLines(lines, width);
17
+ return safeLines(
18
+ inspection.showing.flatMap((module, index) => [
19
+ ...(index > 0 ? [""] : []),
20
+ module.name,
21
+ ...previewLines(module.preview),
22
+ module.description,
23
+ ]),
24
+ );
106
25
  }
107
26
 
108
27
  function previewLines(preview: string): string[] {
@@ -110,80 +29,8 @@ function previewLines(preview: string): string[] {
110
29
  return lines.map((line, index) => `${index === 0 ? "Value: " : " "}${line}`);
111
30
  }
112
31
 
113
- function wrapLines(lines: readonly string[], width: number): string[] {
114
- return lines.flatMap((line) => {
115
- const safe = safeDisplayText(line);
116
- return safe ? wrapTextWithAnsi(safe, width) : [""];
117
- });
118
- }
119
-
120
- interface DetailLayout {
121
- titleRows: number;
122
- contentRows: number;
123
- positionRows: number;
124
- hintRows: number;
125
- }
126
-
127
- function detailLayout(availableRows: number, contentLength: number): DetailLayout {
128
- if (availableRows === 1) {
129
- return { titleRows: 0, contentRows: 1, positionRows: 0, hintRows: 0 };
130
- }
131
- const titleRows = availableRows >= 4 ? 1 : 0;
132
- const hintRows = availableRows >= 3 ? 1 : 0;
133
- let contentRows = Math.max(1, availableRows - titleRows - hintRows);
134
- const positionRows = contentLength > contentRows && contentRows >= 2 ? 1 : 0;
135
- contentRows -= positionRows;
136
- return { titleRows, contentRows, positionRows, hintRows };
137
- }
138
-
139
- function componentRows(rows: number): number {
140
- const terminalRows = Number.isFinite(rows) ? Math.floor(rows) : 24;
141
- return Math.max(1, terminalRows - RESERVED_HOST_ROWS);
142
- }
143
-
144
- function positionText(offset: number, viewportSize: number, itemCount: number): string {
145
- if (itemCount === 0) return "0/0";
146
- return `${offset + 1}-${Math.min(itemCount, offset + viewportSize)}/${itemCount}`;
147
- }
148
-
149
- function boundedLines(lines: readonly string[], width: number, rows: number): string[] {
150
- return lines.slice(0, rows).map((line) => truncateToWidth(line, width, ""));
151
- }
152
-
153
- function detailHint(
154
- keybindings: Pick<KeybindingsManager, "getKeys">,
155
- destination: "back" | "close",
156
- ): string {
157
- const up = bindingText(keybindings, "tui.select.up");
158
- const down = bindingText(keybindings, "tui.select.down");
159
- const cancel = bindingText(keybindings, "tui.select.cancel", "ctrl+c");
160
- const pageUp = bindingText(keybindings, "tui.select.pageUp");
161
- const pageDown = bindingText(keybindings, "tui.select.pageDown");
162
- return [
163
- ...(up || down ? [`${[up, down].filter(Boolean).join("/")} scroll`] : []),
164
- ...(pageUp || pageDown ? [`${[pageUp, pageDown].filter(Boolean).join("/")} page`] : []),
165
- ...(cancel ? [`${cancel} ${destination}`] : []),
166
- "ctrl+c close",
167
- ].join(" • ");
168
- }
169
-
170
- function bindingText(
171
- keybindings: Pick<KeybindingsManager, "getKeys">,
172
- binding: Parameters<KeybindingsManager["getKeys"]>[0],
173
- excluded?: string,
174
- ): string {
175
- return keybindings
176
- .getKeys(binding)
177
- .filter((key) => key !== excluded)
178
- .map((key) => {
179
- if (key === "up") return "↑";
180
- if (key === "down") return "↓";
181
- if (key === "escape") return "esc";
182
- if (key === "return") return "enter";
183
- return safeDisplayText(key);
184
- })
185
- .filter(Boolean)
186
- .join("/");
32
+ function safeLines(lines: readonly string[]): string {
33
+ return lines.map(safeDisplayText).join("\n");
187
34
  }
188
35
 
189
36
  function safeDisplayText(value: string): string {
@@ -192,7 +39,3 @@ function safeDisplayText(value: string): string {
192
39
  return codePoint <= 0x1f || (codePoint >= 0x7f && codePoint <= 0x9f) ? "" : character;
193
40
  }).join("");
194
41
  }
195
-
196
- function clamp(value: number, minimum: number, maximum: number): number {
197
- return Math.max(minimum, Math.min(value, maximum));
198
- }
@@ -1,18 +1,5 @@
1
- import { stripVTControlCharacters } from "node:util";
2
- import {
3
- DynamicBorder,
4
- type ExtensionCommandContext,
5
- type KeybindingsManager,
6
- } from "@earendil-works/pi-coding-agent";
7
- import {
8
- Container,
9
- Key,
10
- matchesKey,
11
- type SelectItem,
12
- SelectList,
13
- Text,
14
- } from "@earendil-works/pi-tui";
15
- import { runCustomInteraction } from "@narumitw/pi-tui-kit";
1
+ import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
2
+ import { runLiveChoice } from "@narumitw/pi-tui-kit";
16
3
  import type { StarshipPreset } from "./presets/catalog.js";
17
4
 
18
5
  export type PresetPickerResult =
@@ -34,170 +21,42 @@ export async function showPresetPicker(
34
21
  ctx: ExtensionCommandContext,
35
22
  options: PresetPickerOptions,
36
23
  ): Promise<PresetPickerResult> {
37
- const items: SelectItem[] = options.presets.map((preset) => ({
38
- value: preset.id,
39
- label: `${preset.id === options.activePresetId ? "[-] " : ""}${preset.label}`,
40
- description:
41
- preset.id === options.activePresetId
42
- ? `Currently applied · ${preset.description}`
43
- : preset.description,
44
- }));
45
- const initialIndex = Math.max(
46
- 0,
47
- options.presets.findIndex(
48
- (preset) => preset.id === (options.initialPresetId ?? options.activePresetId),
49
- ),
50
- );
51
- const result = await runCustomInteraction<PresetPickerResult>(ctx, {
24
+ const current =
25
+ options.presets.find((preset) => preset.id === options.activePresetId)?.label ??
26
+ "Custom configuration";
27
+ const result = await runLiveChoice(ctx, {
28
+ title: `Presets · current: ${current}`,
29
+ items: options.presets.map((preset) => ({
30
+ id: preset.id,
31
+ label: preset.label,
32
+ description:
33
+ preset.id === options.activePresetId
34
+ ? `Currently applied · ${preset.description}`
35
+ : preset.description,
36
+ details: [
37
+ `Selected: ${preset.label} · ${preset.requiresNerdFont ? "requires Nerd Font" : "font-safe"}`,
38
+ ],
39
+ confirmationDisabled: preset.id === options.activePresetId,
40
+ confirmationDisabledReason: "Already applied; press e to customize",
41
+ })),
42
+ currentItemId: options.activePresetId,
43
+ initialItemId: options.initialPresetId ?? options.activePresetId,
44
+ viewportSize: Math.min(options.presets.length, 10),
45
+ hint: "back",
46
+ navigationLabel: "live preview",
47
+ confirmLabel: "apply",
48
+ shortcuts: [{ id: "customize", keys: ["e", "shift+e"], label: "customize" }],
49
+ onSelectionChange: ({ item }) => {
50
+ const preset = options.presets.find((candidate) => candidate.id === item.id);
51
+ if (preset) options.preview(preset);
52
+ },
52
53
  signal: options.signal,
53
54
  isCurrent: options.isCurrent,
54
- create({ tui, theme, keybindings, complete }) {
55
- const container = new Container();
56
- const topBorder = new DynamicBorder((text: string) => theme.fg("accent", text));
57
- const bottomBorder = new DynamicBorder((text: string) => theme.fg("accent", text));
58
- const title = new Text("", 1, 0);
59
- const detail = new Text("", 1, 0);
60
- const hint = new Text("", 1, 0);
61
- const viewportSize = Math.min(items.length, 10);
62
- const list = new SelectList(items, viewportSize, {
63
- selectedPrefix: (text) => theme.fg("accent", text),
64
- selectedText: (text) => theme.fg("accent", text),
65
- description: (text) => theme.fg("muted", text),
66
- scrollInfo: (text) => theme.fg("dim", text),
67
- noMatch: (text) => theme.fg("warning", text),
68
- });
69
- const selectedPreset = () => {
70
- const id = list.getSelectedItem()?.value;
71
- return options.presets.find((preset) => preset.id === id);
72
- };
73
- const updateSelectedText = () => {
74
- const preset = selectedPreset();
75
- if (!preset) return;
76
- detail.setText(
77
- theme.fg(
78
- "muted",
79
- `Selected: ${preset.label} · ${preset.requiresNerdFont ? "requires Nerd Font" : "font-safe"}`,
80
- ),
81
- );
82
- };
83
- const previewSelected = () => {
84
- const preset = selectedPreset();
85
- if (!preset) return;
86
- updateSelectedText();
87
- options.preview(preset);
88
- };
89
- const updateThemedText = () => {
90
- const current =
91
- options.presets.find((preset) => preset.id === options.activePresetId)?.label ??
92
- "Custom configuration";
93
- title.setText(theme.fg("accent", theme.bold(`Presets · current: ${current}`)));
94
- hint.setText(theme.fg("dim", pickerHint(keybindings)));
95
- };
96
-
97
- let selectedIndex = initialIndex;
98
- const select = (index: number) => {
99
- if (items.length === 0) return;
100
- selectedIndex = Math.max(0, Math.min(index, items.length - 1));
101
- list.setSelectedIndex(selectedIndex);
102
- previewSelected();
103
- };
104
- const move = (delta: number) => {
105
- if (items.length === 0) return;
106
- select((selectedIndex + delta + items.length) % items.length);
107
- };
108
- const applySelected = () => {
109
- const preset = selectedPreset();
110
- if (preset && preset.id !== options.activePresetId) {
111
- complete({ kind: "apply", presetId: preset.id });
112
- }
113
- };
114
- list.setSelectedIndex(initialIndex);
115
- container.addChild(topBorder);
116
- container.addChild(title);
117
- container.addChild(list);
118
- container.addChild(detail);
119
- container.addChild(hint);
120
- container.addChild(bottomBorder);
121
- updateThemedText();
122
- previewSelected();
123
-
124
- return {
125
- render: (width: number) => container.render(width),
126
- invalidate() {
127
- container.invalidate();
128
- updateThemedText();
129
- updateSelectedText();
130
- },
131
- handleInput(data: string) {
132
- if (matchesKey(data, Key.ctrl("c"))) {
133
- complete({ kind: "close" });
134
- } else if (keybindings.matches(data, "tui.select.cancel")) {
135
- complete({ kind: "back" });
136
- } else if (keybindings.matches(data, "tui.select.up")) {
137
- move(-1);
138
- } else if (keybindings.matches(data, "tui.select.down")) {
139
- move(1);
140
- } else if (keybindings.matches(data, "tui.select.pageUp")) {
141
- select(selectedIndex - Math.max(1, viewportSize));
142
- } else if (keybindings.matches(data, "tui.select.pageDown")) {
143
- select(selectedIndex + Math.max(1, viewportSize));
144
- } else if (matchesKey(data, Key.home)) {
145
- select(0);
146
- } else if (matchesKey(data, Key.end)) {
147
- select(items.length - 1);
148
- } else if (data === "e" || data === "E") {
149
- const preset = selectedPreset();
150
- if (preset) complete({ kind: "customize", presetId: preset.id });
151
- } else if (keybindings.matches(data, "tui.select.confirm")) {
152
- applySelected();
153
- }
154
- tui.requestRender();
155
- },
156
- };
157
- },
158
55
  });
159
- return result.kind === "completed" ? result.value : { kind: "close" };
160
- }
161
-
162
- function pickerHint(keybindings: Pick<KeybindingsManager, "getKeys">): string {
163
- const up = bindingText(keybindings, "tui.select.up");
164
- const down = bindingText(keybindings, "tui.select.down");
165
- const confirm = bindingText(keybindings, "tui.select.confirm");
166
- const cancel = bindingText(keybindings, "tui.select.cancel", "ctrl+c");
167
- const pageUp = bindingText(keybindings, "tui.select.pageUp");
168
- const pageDown = bindingText(keybindings, "tui.select.pageDown");
169
- return [
170
- ...(up || down ? [`${[up, down].filter(Boolean).join("/")} live preview`] : []),
171
- ...(confirm ? [`${confirm} apply`] : []),
172
- "e customize",
173
- ...(cancel ? [`${cancel} back`] : []),
174
- "ctrl+c close",
175
- ...(pageUp || pageDown ? [`${[pageUp, pageDown].filter(Boolean).join("/")} page preview`] : []),
176
- ].join(" • ");
177
- }
178
-
179
- function bindingText(
180
- keybindings: Pick<KeybindingsManager, "getKeys">,
181
- binding: Parameters<KeybindingsManager["getKeys"]>[0],
182
- excluded?: string,
183
- ): string {
184
- return keybindings
185
- .getKeys(binding)
186
- .filter((key) => key !== excluded)
187
- .map((key) => {
188
- if (key === "up") return "↑";
189
- if (key === "down") return "↓";
190
- if (key === "escape") return "esc";
191
- if (key === "return") return "enter";
192
- return safeDisplayText(key);
193
- })
194
- .join("/");
195
- }
196
-
197
- function safeDisplayText(value: string): string {
198
- return Array.from(stripVTControlCharacters(value), (character) => {
199
- const codePoint = character.codePointAt(0) ?? 0;
200
- const control = codePoint <= 0x1f || (codePoint >= 0x7f && codePoint <= 0x9f);
201
- return control ? "" : character;
202
- }).join("");
56
+ if (result.kind === "selected") return { kind: "apply", presetId: result.itemId };
57
+ if (result.kind === "shortcut") {
58
+ return { kind: "customize", presetId: result.itemId };
59
+ }
60
+ if (result.kind === "closed" && result.reason === "back") return { kind: "back" };
61
+ return { kind: "close" };
203
62
  }
package/src/commands.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import type { ExtensionAPI, ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
2
2
  import { defineMenu, runMenu } from "@narumitw/pi-tui-kit";
3
3
  import { completeStarshipArguments, STARSHIP_SUBCOMMANDS } from "./command-contract.js";
4
- import { showFooterExplanation } from "./command-inspector.js";
4
+ import { formatFooterExplanation } from "./command-inspector.js";
5
5
  import { showPresetPicker } from "./command-preset-picker.js";
6
6
  import { type PreviewMenuResult, showPreviewActionMenu } from "./command-preview.js";
7
7
  import {
@@ -114,8 +114,8 @@ async function showMainMenu(ctx: ExtensionCommandContext, options: StarshipComma
114
114
  signal: fallbackController.signal,
115
115
  isCurrent: () => !fallbackController.signal.aborted,
116
116
  };
117
- type Screen = "main" | "modules" | "configuration" | "help";
118
- type Action = "customize" | "presets" | "explain" | "restore";
117
+ type Screen = "main" | "explain" | "modules" | "configuration" | "help";
118
+ type Action = "customize" | "presets" | "restore";
119
119
  const menu = defineMenu<undefined, Screen, Action, ExtensionCommandContext>({
120
120
  start: "main",
121
121
  screens: {
@@ -143,7 +143,7 @@ async function showMainMenu(ctx: ExtensionCommandContext, options: StarshipComma
143
143
  id: MAIN_ACTIONS.explain,
144
144
  label: "Explain footer",
145
145
  description: "Why each visible module appears",
146
- action: "explain",
146
+ to: "explain",
147
147
  },
148
148
  {
149
149
  id: MAIN_ACTIONS.modules,
@@ -174,6 +174,14 @@ async function showMainMenu(ctx: ExtensionCommandContext, options: StarshipComma
174
174
  hint: "close",
175
175
  };
176
176
  },
177
+ explain: () => ({
178
+ kind: "review",
179
+ title: "Explain footer",
180
+ content: formatFooterExplanation(options.getInspection?.()),
181
+ format: { kind: "text" },
182
+ viewportSize: "adaptive",
183
+ hint: "back",
184
+ }),
177
185
  modules: () => {
178
186
  const inspection =
179
187
  options.getInspection?.() ?? inspectUnavailableModules(options.getLoaded().config);
@@ -237,11 +245,6 @@ async function showMainMenu(ctx: ExtensionCommandContext, options: StarshipComma
237
245
  const result = await editSettings(ctx, options);
238
246
  return result === "applied" || result === "close" ? { kind: "close" } : { kind: "stay" };
239
247
  },
240
- explain: async () => {
241
- const result = await showFooterExplanation(ctx, options.getInspection?.(), owner.signal);
242
- if (!isCurrentOwner(owner)) return { kind: "stay" };
243
- return result?.kind === "back" ? { kind: "stay" } : { kind: "close" };
244
- },
245
248
  presets: async () => {
246
249
  const result = await choosePreset(ctx, options, owner);
247
250
  return result === "applied" || result === "close" ? { kind: "close" } : { kind: "stay" };