@gtrabanco/pi-agentic-workflow 0.9.1 → 0.9.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/README.es.md +5 -1
- package/README.md +5 -1
- package/dist/extension/index.d.ts +10 -1
- package/dist/extension/index.js +9 -3
- package/dist/settings/console.d.ts +1 -0
- package/dist/settings/console.js +70 -6
- package/dist/settings/picker.d.ts +50 -0
- package/dist/settings/picker.js +112 -2
- package/package.json +1 -1
package/README.es.md
CHANGED
|
@@ -164,7 +164,11 @@ byte a byte idéntico; el campo de modelo puede construir una cadena de respaldo
|
|
|
164
164
|
ordenada (`a/m1 → b/m2`); y una sola pasada puede aplicar o limpiar una ruta en
|
|
165
165
|
varios comandos, avisando por comando cuando una referencia falta del registro
|
|
166
166
|
vivo. Fuera de una sesión TUI los selectores caen a un prompt simple, así que la
|
|
167
|
-
consola nunca se queda sin salida.
|
|
167
|
+
consola nunca se queda sin salida. Las listas de más de 24 opciones tampoco
|
|
168
|
+
llegan nunca a un solo diálogo: por encima del tope el selector de modelo
|
|
169
|
+
pregunta primero el proveedor, y una lista de proveedores o de modelos
|
|
170
|
+
demasiado larga pagina (`More options…` / `◀ Previous page`) en vez de tumbar
|
|
171
|
+
el diálogo de select del host.
|
|
168
172
|
|
|
169
173
|
## Diagnóstico
|
|
170
174
|
|
package/README.md
CHANGED
|
@@ -158,7 +158,11 @@ you are, and the value currently in force is pre-selected and labelled
|
|
|
158
158
|
model field can build an ordered fallback chain (`a/m1 → b/m2`); and one pass
|
|
159
159
|
can apply or clear a route across several commands, warning per command when a
|
|
160
160
|
reference is missing from the live registry. Outside a TUI session the pickers
|
|
161
|
-
fall back to a plain prompt, so the console never dead-ends.
|
|
161
|
+
fall back to a plain prompt, so the console never dead-ends. Lists longer than
|
|
162
|
+
24 options never reach a single dialog either: over the cap the model picker
|
|
163
|
+
asks for the provider first, and an overlong provider or model list pages
|
|
164
|
+
(`More options…` / `◀ Previous page`) instead of crashing the host's select
|
|
165
|
+
dialog.
|
|
162
166
|
|
|
163
167
|
## Troubleshooting
|
|
164
168
|
|
|
@@ -1,4 +1,13 @@
|
|
|
1
|
-
import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
|
|
1
|
+
import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
|
|
2
|
+
import type { SettingsUi } from "../routing/types.js";
|
|
2
3
|
import { SETTINGS_COMMAND } from "../routing/types.js";
|
|
4
|
+
/**
|
|
5
|
+
* The interactive slice the settings console sees: Pi's own `ui` plus the rich
|
|
6
|
+
* picker (P4). The picker is terminal-only, so a non-TUI mode (headless/RPC)
|
|
7
|
+
* gets the plain `select` path — the console never dead-ends (OB-12, PE-004).
|
|
8
|
+
* Exported as a test seam: the fallback's bounded paging (AC8) is exercised
|
|
9
|
+
* directly, without standing up the whole extension.
|
|
10
|
+
*/
|
|
11
|
+
export declare function richUi(ctx: ExtensionContext): SettingsUi;
|
|
3
12
|
export default function extension(pi: ExtensionAPI): void;
|
|
4
13
|
export { SETTINGS_COMMAND };
|
package/dist/extension/index.js
CHANGED
|
@@ -3,7 +3,7 @@ import { fileURLToPath } from "node:url";
|
|
|
3
3
|
import { getAgentDir } from "@earendil-works/pi-coding-agent";
|
|
4
4
|
import { loadConfig } from "../config/load.js";
|
|
5
5
|
import { createExtension } from "./factory.js";
|
|
6
|
-
import { createPickerComponent, PICKER_MAX_VISIBLE } from "../settings/picker.js";
|
|
6
|
+
import { createPickerComponent, PICKER_MAX_VISIBLE, pagedSelect } from "../settings/picker.js";
|
|
7
7
|
import { createHintStore, stateFilePath } from "../routing/state.js";
|
|
8
8
|
import { runSettingsConsole } from "../settings/console.js";
|
|
9
9
|
import { readConfigFile, writeConfigFile } from "../settings/store.js";
|
|
@@ -25,8 +25,10 @@ const thinkingLevelsInSyncWithPi = true;
|
|
|
25
25
|
* The interactive slice the settings console sees: Pi's own `ui` plus the rich
|
|
26
26
|
* picker (P4). The picker is terminal-only, so a non-TUI mode (headless/RPC)
|
|
27
27
|
* gets the plain `select` path — the console never dead-ends (OB-12, PE-004).
|
|
28
|
+
* Exported as a test seam: the fallback's bounded paging (AC8) is exercised
|
|
29
|
+
* directly, without standing up the whole extension.
|
|
28
30
|
*/
|
|
29
|
-
function richUi(ctx) {
|
|
31
|
+
export function richUi(ctx) {
|
|
30
32
|
const base = ctx.ui;
|
|
31
33
|
return {
|
|
32
34
|
select: (title, options) => base.select(title, [...options]),
|
|
@@ -35,7 +37,10 @@ function richUi(ctx) {
|
|
|
35
37
|
notify: (message, kind) => base.notify(message, kind),
|
|
36
38
|
pick: async (title, options, opts = {}) => {
|
|
37
39
|
if (ctx.mode !== "tui") {
|
|
38
|
-
|
|
40
|
+
// Non-TUI: the host's `select` dialog carries the same 24-option cap, so
|
|
41
|
+
// an over-cap list pages instead of crashing `pick` (AC8, PE-002). A
|
|
42
|
+
// list within the cap is one call with the same options, in order.
|
|
43
|
+
const picked = await pagedSelect((selectTitle, selectOptions) => base.select(selectTitle, [...selectOptions]), title, [...options]);
|
|
39
44
|
if (opts.multiple)
|
|
40
45
|
return picked ? [picked] : undefined;
|
|
41
46
|
return picked;
|
|
@@ -53,6 +58,7 @@ function richUi(ctx) {
|
|
|
53
58
|
items,
|
|
54
59
|
maxVisible: PICKER_MAX_VISIBLE,
|
|
55
60
|
theme: selectListTheme,
|
|
61
|
+
initial: opts.initial,
|
|
56
62
|
onSelect: (value) => done(value),
|
|
57
63
|
onCancel: () => done(undefined),
|
|
58
64
|
});
|
|
@@ -55,6 +55,7 @@ export declare const prompts: {
|
|
|
55
55
|
readonly cancel: "Cancel";
|
|
56
56
|
readonly model: (target: string) => string;
|
|
57
57
|
readonly modelPicked: (target: string) => string;
|
|
58
|
+
readonly modelProvider: (target: string) => string;
|
|
58
59
|
readonly thinking: (target: string) => string;
|
|
59
60
|
readonly fields: "Which fields should change?";
|
|
60
61
|
readonly fieldsBoth: "model and thinking";
|
package/dist/settings/console.js
CHANGED
|
@@ -12,6 +12,7 @@ import { effectiveRoute } from "../config/merge.js";
|
|
|
12
12
|
import { parseConfigFile, parseModelReference } from "../config/schema.js";
|
|
13
13
|
import { MAX_MODEL_CHAIN, SETTLE_POLICIES, THINKING_LEVELS, UNAVAILABLE_ROUTE_POLICIES } from "../config/types.js";
|
|
14
14
|
import { renderMergedConfig, routePath, DEFAULT_ROUTE } from "./view.js";
|
|
15
|
+
import { SELECT_OPTION_LIMIT, pagedSelect, providerOf } from "./picker.js";
|
|
15
16
|
/** The console's questions. `test/settings-console.test.mjs` drives the flow
|
|
16
17
|
* through these strings, so renaming one fails the tests that use it rather than
|
|
17
18
|
* silently re-sequencing them. */
|
|
@@ -38,6 +39,7 @@ export const prompts = {
|
|
|
38
39
|
cancel: "Cancel",
|
|
39
40
|
model: (target) => `Model for ${target}?`,
|
|
40
41
|
modelPicked: (target) => `Which model for ${target}?`,
|
|
42
|
+
modelProvider: (target) => `Provider for ${target}?`,
|
|
41
43
|
thinking: (target) => `Thinking level for ${target}?`,
|
|
42
44
|
fields: "Which fields should change?",
|
|
43
45
|
fieldsBoth: "model and thinking",
|
|
@@ -225,18 +227,25 @@ async function askFields(deps) {
|
|
|
225
227
|
}
|
|
226
228
|
/** Ask for one model entry; `undefined` means cancelled/skipped, `"inherit"` means the whole-route setting. */
|
|
227
229
|
async function pickModelEntry(deps, target, current) {
|
|
230
|
+
const models = deps.models ?? [];
|
|
228
231
|
let answer;
|
|
229
|
-
if (
|
|
232
|
+
if (models.length > SELECT_OPTION_LIMIT - 1) {
|
|
233
|
+
// Over the cap: TYPED occupies one dialog slot, so 24 models + TYPED would
|
|
234
|
+
// still crash (Decision 1). The issue's provider-first two-step keeps every
|
|
235
|
+
// dialog bounded in every UI mode (Decision 3).
|
|
236
|
+
answer = await askModelOverCap(deps, target, models, current);
|
|
237
|
+
}
|
|
238
|
+
else if (typeof deps.ui.pick === "function" && models.length > 0) {
|
|
230
239
|
// Rich seam: filterable, windowed, preselected to the value in force (OB-1).
|
|
231
|
-
const picked = await deps.ui.pick(prompts.modelPicked(target), [...
|
|
240
|
+
const picked = await deps.ui.pick(prompts.modelPicked(target), [...models, TYPED], {
|
|
232
241
|
initial: typeof current === "string" ? current : undefined,
|
|
233
242
|
});
|
|
234
243
|
answer = typeof picked === "string" ? picked : undefined;
|
|
235
244
|
if (answer === TYPED || answer === undefined)
|
|
236
245
|
answer = await deps.ui.input(prompts.model(target), "provider/modelId or inherit");
|
|
237
246
|
}
|
|
238
|
-
else if (
|
|
239
|
-
answer = await deps.ui.select(prompts.modelPicked(target), [...
|
|
247
|
+
else if (models.length > 0) {
|
|
248
|
+
answer = await deps.ui.select(prompts.modelPicked(target), [...models, TYPED]);
|
|
240
249
|
if (answer === TYPED || answer === undefined)
|
|
241
250
|
answer = await deps.ui.input(prompts.model(target), "provider/modelId or inherit");
|
|
242
251
|
}
|
|
@@ -257,6 +266,60 @@ async function pickModelEntry(deps, target, current) {
|
|
|
257
266
|
}
|
|
258
267
|
return `${parts.provider}/${parts.id}`;
|
|
259
268
|
}
|
|
269
|
+
/**
|
|
270
|
+
* The provider-first two-step the issue prescribes when the live registry exceeds
|
|
271
|
+
* the single-dialog cap (PE-003, PE-014). Unique providers (prefix before the
|
|
272
|
+
* first `/`, `localeCompare`-sorted) come first — through the rich picker while
|
|
273
|
+
* it fits, `pagedSelect` otherwise — then that provider's models in registry
|
|
274
|
+
* order. "Type another reference…" is the trailing entry of every dialog and
|
|
275
|
+
* still reaches the text input, so a pick-less UI completes the flow (OB-12).
|
|
276
|
+
*/
|
|
277
|
+
async function askModelOverCap(deps, target, models, current) {
|
|
278
|
+
const currentProvider = typeof current === "string" ? providerOf(current) : undefined;
|
|
279
|
+
const providers = [...new Set(models.map((model) => providerOf(model)))].sort((a, b) => a.localeCompare(b));
|
|
280
|
+
const provider = await askProvider(deps, target, providers, currentProvider);
|
|
281
|
+
if (provider === TYPED || provider === undefined) {
|
|
282
|
+
return await deps.ui.input(prompts.model(target), "provider/modelId or inherit");
|
|
283
|
+
}
|
|
284
|
+
const providerModels = models.filter((model) => providerOf(model) === provider);
|
|
285
|
+
const picked = await askModelWithinProvider(deps, target, providerModels, provider, current);
|
|
286
|
+
if (picked === TYPED || picked === undefined) {
|
|
287
|
+
return await deps.ui.input(prompts.model(target), "provider/modelId or inherit");
|
|
288
|
+
}
|
|
289
|
+
return picked;
|
|
290
|
+
}
|
|
291
|
+
/**
|
|
292
|
+
* Ask which provider. The rich picker handles it while `providers + TYPED` fits
|
|
293
|
+
* the cap (preselected to the value in force's provider); over the cap — Pi
|
|
294
|
+
* imposes no provider ceiling, so a > 24-provider registry is real (PE-014) —
|
|
295
|
+
* the dialog pages instead of crashing.
|
|
296
|
+
*/
|
|
297
|
+
async function askProvider(deps, target, providers, currentProvider) {
|
|
298
|
+
const title = prompts.modelProvider(target);
|
|
299
|
+
if (typeof deps.ui.pick === "function" && providers.length + 1 <= SELECT_OPTION_LIMIT) {
|
|
300
|
+
const picked = await deps.ui.pick(title, [...providers, TYPED], {
|
|
301
|
+
...(currentProvider !== undefined ? { initial: currentProvider } : {}),
|
|
302
|
+
});
|
|
303
|
+
return typeof picked === "string" ? picked : undefined;
|
|
304
|
+
}
|
|
305
|
+
return pagedSelect((selectTitle, options) => deps.ui.select(selectTitle, options), title, providers, { trailing: TYPED });
|
|
306
|
+
}
|
|
307
|
+
/**
|
|
308
|
+
* Ask the model within one provider. The rich picker handles it while `models +
|
|
309
|
+
* TYPED` fits the cap (preselected only when the value in force belongs to this
|
|
310
|
+
* provider); over the cap the dialog pages.
|
|
311
|
+
*/
|
|
312
|
+
async function askModelWithinProvider(deps, target, models, provider, current) {
|
|
313
|
+
const title = prompts.modelPicked(target);
|
|
314
|
+
if (typeof deps.ui.pick === "function" && models.length + 1 <= SELECT_OPTION_LIMIT) {
|
|
315
|
+
const initial = typeof current === "string" && providerOf(current) === provider ? current : undefined;
|
|
316
|
+
const picked = await deps.ui.pick(title, [...models, TYPED], {
|
|
317
|
+
...(initial !== undefined ? { initial } : {}),
|
|
318
|
+
});
|
|
319
|
+
return typeof picked === "string" ? picked : undefined;
|
|
320
|
+
}
|
|
321
|
+
return pagedSelect((selectTitle, options) => deps.ui.select(selectTitle, options), title, models, { trailing: TYPED });
|
|
322
|
+
}
|
|
260
323
|
/** Ask for a model; a lone reference is returned as-is, several references are returned as an ordered chain. */
|
|
261
324
|
async function askModel(deps, target, current) {
|
|
262
325
|
// The value in force (OB-3). For a route whose model is already a chain, seed
|
|
@@ -334,7 +397,8 @@ async function pickCommand(deps, options) {
|
|
|
334
397
|
deps.ui.notify("There is no command to pick here.", "warning");
|
|
335
398
|
return undefined;
|
|
336
399
|
}
|
|
337
|
-
|
|
400
|
+
const sorted = [...options].sort((a, b) => a.localeCompare(b));
|
|
401
|
+
return pagedSelect((title, list) => deps.ui.select(title, list), prompts.command, sorted);
|
|
338
402
|
}
|
|
339
403
|
/** Multi-select command picker over the seam's `multiple` mode; a non-rich UI falls back to repeated single selects. */
|
|
340
404
|
async function pickCommandsMulti(deps, options) {
|
|
@@ -355,7 +419,7 @@ async function pickCommandsMulti(deps, options) {
|
|
|
355
419
|
const remaining = sorted.filter((option) => !chosen.includes(option));
|
|
356
420
|
if (remaining.length === 0)
|
|
357
421
|
break;
|
|
358
|
-
const picked = await deps.ui.select(prompts.command, remaining);
|
|
422
|
+
const picked = await pagedSelect((title, list) => deps.ui.select(title, list), prompts.command, remaining);
|
|
359
423
|
if (picked === undefined)
|
|
360
424
|
break;
|
|
361
425
|
chosen.push(picked);
|
|
@@ -1,6 +1,51 @@
|
|
|
1
1
|
import { type Component, type SelectItem, type SelectListTheme } from "@earendil-works/pi-tui";
|
|
2
2
|
/** Default window height for the SelectList (the built-in position indicator scales to the list). */
|
|
3
3
|
export declare const PICKER_MAX_VISIBLE = 10;
|
|
4
|
+
/**
|
|
5
|
+
* The host dialog cap this package must never exceed (PE-001): pi-web rejects a
|
|
6
|
+
* `select` dialog offering more than 24 options with "A select dialog must not
|
|
7
|
+
* offer more than 24 options". It is the single knob if a future host enforces a
|
|
8
|
+
* different bound.
|
|
9
|
+
*/
|
|
10
|
+
export declare const SELECT_OPTION_LIMIT = 24;
|
|
11
|
+
/** Pager entry offered on every page but the first. */
|
|
12
|
+
export declare const PAGED_SELECT_PREV = "\u25C0 Previous page";
|
|
13
|
+
/** Pager entry offered on every page but the last. */
|
|
14
|
+
export declare const PAGED_SELECT_NEXT = "More options\u2026";
|
|
15
|
+
/** The plain-dialog shape `pagedSelect` drives (Pi's `ctx.ui.select`). */
|
|
16
|
+
export type SelectFn = (title: string, options: readonly string[]) => string | undefined | Promise<string | undefined>;
|
|
17
|
+
/**
|
|
18
|
+
* Present `options` through `select` without ever offering more than
|
|
19
|
+
* `SELECT_OPTION_LIMIT` entries in one dialog (AC6, PE-001, PE-012).
|
|
20
|
+
*
|
|
21
|
+
* - A list that fits — data plus `trailing` — opens exactly one dialog, in the
|
|
22
|
+
* caller's order with `trailing` last, so a ≤ cap flow is byte-identical to a
|
|
23
|
+
* plain `select` call.
|
|
24
|
+
* - A longer list pages `PAGED_SELECT_PAGE_SIZE` data entries at a time —
|
|
25
|
+
* `SELECT_OPTION_LIMIT - 3`, so the derived page never hardcodes the cap —
|
|
26
|
+
* appending `PAGED_SELECT_PREV` and/or `PAGED_SELECT_NEXT` before `trailing`.
|
|
27
|
+
* Pager entries navigate; `trailing` and data entries are returned to the
|
|
28
|
+
* caller; `undefined` (cancel) passes straight through.
|
|
29
|
+
*
|
|
30
|
+
* The two pager labels are reserved: a data value (or a `trailing` value) that
|
|
31
|
+
* spells one is indistinguishable from the pager entry in the string `select`
|
|
32
|
+
* answers with, so a colliding pager label is decorated until it names nothing
|
|
33
|
+
* else on the dialog — the data value stays selectable and so does the pager.
|
|
34
|
+
*/
|
|
35
|
+
export declare function pagedSelect(select: SelectFn, title: string, options: readonly string[], { trailing }?: {
|
|
36
|
+
trailing?: string;
|
|
37
|
+
}): Promise<string | undefined>;
|
|
38
|
+
/**
|
|
39
|
+
* The provider prefix Pi resolves a reference by — everything before the first
|
|
40
|
+
* `/` (SPEC Decision 6).
|
|
41
|
+
*
|
|
42
|
+
* Lenient on purpose, and deliberately distinct from the strict
|
|
43
|
+
* `parseModelReference` in `../config/schema.js`, which validates and rejects:
|
|
44
|
+
* this split must answer for any registry string. Both the console's
|
|
45
|
+
* provider-first grouping and the slash-aware filter below take their provider
|
|
46
|
+
* from here, so the two settings-side consumers cannot drift apart.
|
|
47
|
+
*/
|
|
48
|
+
export declare function providerOf(reference: string): string;
|
|
4
49
|
/**
|
|
5
50
|
* Token/subsequence, slash-aware reference filter (OB-2).
|
|
6
51
|
*
|
|
@@ -19,11 +64,16 @@ export declare function filterReferences(query: string, refs: readonly string[])
|
|
|
19
64
|
* `filterReferences` as the operator types so the subsequence/slash-aware
|
|
20
65
|
* filter (OB-2) — not `SelectList`'s own prefix `setFilter` — drives what the
|
|
21
66
|
* window shows. Control keys (arrows, Enter, Escape) forward to the list.
|
|
67
|
+
*
|
|
68
|
+
* `initial` — the value in force — is selected in the window the picker opens
|
|
69
|
+
* with, through the SelectList's own `setSelectedIndex` (OB-3).
|
|
22
70
|
*/
|
|
23
71
|
export declare function createPickerComponent(options: {
|
|
24
72
|
items: readonly SelectItem[];
|
|
25
73
|
maxVisible: number;
|
|
26
74
|
theme: SelectListTheme;
|
|
75
|
+
/** The value in force, selected in the window the picker opens with (OB-3). */
|
|
76
|
+
initial?: string;
|
|
27
77
|
onSelect: (value: string) => void;
|
|
28
78
|
onCancel?: () => void;
|
|
29
79
|
}): Component & {
|
package/dist/settings/picker.js
CHANGED
|
@@ -10,6 +10,10 @@
|
|
|
10
10
|
// to narrow the list, selection, and cancel. The Pi-free `SettingsUi.pick`
|
|
11
11
|
// seam stays separated so the filter and the component are exercisable
|
|
12
12
|
// without a live session.
|
|
13
|
+
// - `pagedSelect` is the plain-`select` counterpart: the host's dialog cap
|
|
14
|
+
// (pi-web rejects > 24 options, PE-001) is never a picker concern — a UI
|
|
15
|
+
// without the rich seam still gets a bounded dialog, and an over-cap list
|
|
16
|
+
// pages instead of crashing.
|
|
13
17
|
//
|
|
14
18
|
// The filter is implemented in this package (not imported from Pi): PE-004
|
|
15
19
|
// confirmed pi-coding-agent's `fuzzyFilter` is internal, so the same
|
|
@@ -17,6 +21,99 @@
|
|
|
17
21
|
import { SelectList } from "@earendil-works/pi-tui";
|
|
18
22
|
/** Default window height for the SelectList (the built-in position indicator scales to the list). */
|
|
19
23
|
export const PICKER_MAX_VISIBLE = 10;
|
|
24
|
+
/**
|
|
25
|
+
* The host dialog cap this package must never exceed (PE-001): pi-web rejects a
|
|
26
|
+
* `select` dialog offering more than 24 options with "A select dialog must not
|
|
27
|
+
* offer more than 24 options". It is the single knob if a future host enforces a
|
|
28
|
+
* different bound.
|
|
29
|
+
*/
|
|
30
|
+
export const SELECT_OPTION_LIMIT = 24;
|
|
31
|
+
/** Pager entry offered on every page but the first. */
|
|
32
|
+
export const PAGED_SELECT_PREV = "◀ Previous page";
|
|
33
|
+
/** Pager entry offered on every page but the last. */
|
|
34
|
+
export const PAGED_SELECT_NEXT = "More options…";
|
|
35
|
+
/**
|
|
36
|
+
* Data entries per page: `SELECT_OPTION_LIMIT - 3` — room inside one dialog for
|
|
37
|
+
* both pager entries and the caller's trailing option.
|
|
38
|
+
*/
|
|
39
|
+
const PAGED_SELECT_PAGE_SIZE = SELECT_OPTION_LIMIT - 3;
|
|
40
|
+
/**
|
|
41
|
+
* The pager label actually offered: `base`, decorated with `marker` while some
|
|
42
|
+
* value in the dialog spells it, so a label-colliding data entry can never be
|
|
43
|
+
* swallowed by the navigation guard (see the contract above).
|
|
44
|
+
*/
|
|
45
|
+
function pagerLabel(base, marker, spoken) {
|
|
46
|
+
let label = base;
|
|
47
|
+
while (spoken.includes(label))
|
|
48
|
+
label += marker;
|
|
49
|
+
return label;
|
|
50
|
+
}
|
|
51
|
+
/**
|
|
52
|
+
* Present `options` through `select` without ever offering more than
|
|
53
|
+
* `SELECT_OPTION_LIMIT` entries in one dialog (AC6, PE-001, PE-012).
|
|
54
|
+
*
|
|
55
|
+
* - A list that fits — data plus `trailing` — opens exactly one dialog, in the
|
|
56
|
+
* caller's order with `trailing` last, so a ≤ cap flow is byte-identical to a
|
|
57
|
+
* plain `select` call.
|
|
58
|
+
* - A longer list pages `PAGED_SELECT_PAGE_SIZE` data entries at a time —
|
|
59
|
+
* `SELECT_OPTION_LIMIT - 3`, so the derived page never hardcodes the cap —
|
|
60
|
+
* appending `PAGED_SELECT_PREV` and/or `PAGED_SELECT_NEXT` before `trailing`.
|
|
61
|
+
* Pager entries navigate; `trailing` and data entries are returned to the
|
|
62
|
+
* caller; `undefined` (cancel) passes straight through.
|
|
63
|
+
*
|
|
64
|
+
* The two pager labels are reserved: a data value (or a `trailing` value) that
|
|
65
|
+
* spells one is indistinguishable from the pager entry in the string `select`
|
|
66
|
+
* answers with, so a colliding pager label is decorated until it names nothing
|
|
67
|
+
* else on the dialog — the data value stays selectable and so does the pager.
|
|
68
|
+
*/
|
|
69
|
+
export async function pagedSelect(select, title, options, { trailing } = {}) {
|
|
70
|
+
const items = [...options];
|
|
71
|
+
if (items.length + (trailing !== undefined ? 1 : 0) <= SELECT_OPTION_LIMIT) {
|
|
72
|
+
return await select(title, trailing !== undefined ? [...items, trailing] : items);
|
|
73
|
+
}
|
|
74
|
+
// A label-colliding data value must stay reachable, so compute the offered
|
|
75
|
+
// pager labels once against every string that can appear in a dialog.
|
|
76
|
+
const spoken = trailing !== undefined ? [...items, trailing] : items;
|
|
77
|
+
const prevLabel = pagerLabel(PAGED_SELECT_PREV, " ‹", spoken);
|
|
78
|
+
const nextLabel = pagerLabel(PAGED_SELECT_NEXT, " ›", spoken);
|
|
79
|
+
const pageCount = Math.ceil(items.length / PAGED_SELECT_PAGE_SIZE);
|
|
80
|
+
let page = 0;
|
|
81
|
+
for (;;) {
|
|
82
|
+
const start = page * PAGED_SELECT_PAGE_SIZE;
|
|
83
|
+
const entries = [
|
|
84
|
+
...items.slice(start, start + PAGED_SELECT_PAGE_SIZE),
|
|
85
|
+
...(page > 0 ? [prevLabel] : []),
|
|
86
|
+
...(page < pageCount - 1 ? [nextLabel] : []),
|
|
87
|
+
...(trailing !== undefined ? [trailing] : []),
|
|
88
|
+
];
|
|
89
|
+
const answer = await select(title, entries);
|
|
90
|
+
if (answer === undefined)
|
|
91
|
+
return undefined;
|
|
92
|
+
if (answer === nextLabel && page < pageCount - 1) {
|
|
93
|
+
page += 1;
|
|
94
|
+
continue;
|
|
95
|
+
}
|
|
96
|
+
if (answer === prevLabel && page > 0) {
|
|
97
|
+
page -= 1;
|
|
98
|
+
continue;
|
|
99
|
+
}
|
|
100
|
+
return answer;
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
/**
|
|
104
|
+
* The provider prefix Pi resolves a reference by — everything before the first
|
|
105
|
+
* `/` (SPEC Decision 6).
|
|
106
|
+
*
|
|
107
|
+
* Lenient on purpose, and deliberately distinct from the strict
|
|
108
|
+
* `parseModelReference` in `../config/schema.js`, which validates and rejects:
|
|
109
|
+
* this split must answer for any registry string. Both the console's
|
|
110
|
+
* provider-first grouping and the slash-aware filter below take their provider
|
|
111
|
+
* from here, so the two settings-side consumers cannot drift apart.
|
|
112
|
+
*/
|
|
113
|
+
export function providerOf(reference) {
|
|
114
|
+
const slash = reference.indexOf("/");
|
|
115
|
+
return slash === -1 ? reference : reference.slice(0, slash);
|
|
116
|
+
}
|
|
20
117
|
/**
|
|
21
118
|
* Token/subsequence, slash-aware reference filter (OB-2).
|
|
22
119
|
*
|
|
@@ -41,7 +138,7 @@ function matchesToken(token, ref) {
|
|
|
41
138
|
const provider = token.slice(0, -1);
|
|
42
139
|
if (provider === "")
|
|
43
140
|
return true;
|
|
44
|
-
const refProvider = ref
|
|
141
|
+
const refProvider = providerOf(ref);
|
|
45
142
|
return refProvider.startsWith(provider);
|
|
46
143
|
}
|
|
47
144
|
return isSubsequence(token, ref);
|
|
@@ -60,14 +157,27 @@ function isSubsequence(needle, haystack) {
|
|
|
60
157
|
* `filterReferences` as the operator types so the subsequence/slash-aware
|
|
61
158
|
* filter (OB-2) — not `SelectList`'s own prefix `setFilter` — drives what the
|
|
62
159
|
* window shows. Control keys (arrows, Enter, Escape) forward to the list.
|
|
160
|
+
*
|
|
161
|
+
* `initial` — the value in force — is selected in the window the picker opens
|
|
162
|
+
* with, through the SelectList's own `setSelectedIndex` (OB-3).
|
|
63
163
|
*/
|
|
64
164
|
export function createPickerComponent(options) {
|
|
65
|
-
const { items, maxVisible, theme, onSelect, onCancel } = options;
|
|
165
|
+
const { items, maxVisible, theme, initial, onSelect, onCancel } = options;
|
|
66
166
|
let filterText = "";
|
|
167
|
+
let openSelectionApplied = false;
|
|
67
168
|
const byValue = new Map(items.map((item) => [item.value, item]));
|
|
68
169
|
const buildList = () => {
|
|
69
170
|
const visible = filterReferences(filterText, items.map((item) => item.value)).map((value) => byValue.get(value) ?? { value, label: value });
|
|
70
171
|
const list = new SelectList(visible, maxVisible, theme);
|
|
172
|
+
// Preselection is an open-time concern (OB-3): the value in force applies to
|
|
173
|
+
// the first window only, so narrowing afterwards keeps the narrowed window's
|
|
174
|
+
// own first match instead of yanking the selection to a filtered-out value.
|
|
175
|
+
if (!openSelectionApplied) {
|
|
176
|
+
openSelectionApplied = true;
|
|
177
|
+
const index = initial === undefined ? -1 : visible.findIndex((item) => item.value === initial);
|
|
178
|
+
if (index > 0)
|
|
179
|
+
list.setSelectedIndex(index); // index 0 is already the SelectList default
|
|
180
|
+
}
|
|
71
181
|
list.onSelect = (item) => onSelect(item.value);
|
|
72
182
|
list.onCancel = onCancel;
|
|
73
183
|
return list;
|
package/package.json
CHANGED