@mrclrchtr/supi-ask-user 2.0.6 → 2.2.0
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/node_modules/@mrclrchtr/supi-core/README.md +32 -23
- package/node_modules/@mrclrchtr/supi-core/package.json +2 -1
- package/node_modules/@mrclrchtr/supi-core/src/config/config.ts +22 -8
- package/node_modules/@mrclrchtr/supi-core/src/config/prompt-surface.ts +357 -0
- package/node_modules/@mrclrchtr/supi-core/src/config.ts +2 -3
- package/node_modules/@mrclrchtr/supi-core/src/debug-registry.ts +0 -5
- package/node_modules/@mrclrchtr/supi-core/src/prompt-surface.ts +4 -0
- package/node_modules/@mrclrchtr/supi-core/src/settings/scoped-settings-list.ts +372 -0
- package/node_modules/@mrclrchtr/supi-core/src/settings/settings-action-menu.ts +101 -0
- package/node_modules/@mrclrchtr/supi-core/src/settings/settings-command.ts +1 -1
- package/node_modules/@mrclrchtr/supi-core/src/settings/settings-registry.ts +55 -27
- package/node_modules/@mrclrchtr/supi-core/src/settings/settings-schema.ts +464 -0
- package/node_modules/@mrclrchtr/supi-core/src/settings/settings-submenus.ts +124 -0
- package/node_modules/@mrclrchtr/supi-core/src/settings/settings-ui.ts +72 -285
- package/node_modules/@mrclrchtr/supi-core/src/settings-ui.ts +2 -5
- package/node_modules/@mrclrchtr/supi-core/src/settings.ts +27 -5
- package/node_modules/@mrclrchtr/supi-core/src/tool-framework.ts +10 -0
- package/package.json +2 -2
- package/src/ask-user.ts +30 -6
- package/src/tool/guidance.ts +11 -6
- package/node_modules/@mrclrchtr/supi-core/src/config/config-settings.ts +0 -188
|
@@ -1,327 +1,114 @@
|
|
|
1
|
-
//
|
|
1
|
+
// Declarative settings overlay for SuPi extensions.
|
|
2
2
|
//
|
|
3
|
-
//
|
|
4
|
-
//
|
|
3
|
+
// Thin orchestration layer that collects settings contributions and opens the
|
|
4
|
+
// scoped settings list inside a pi-tui custom component overlay.
|
|
5
5
|
|
|
6
|
-
import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
|
|
7
|
-
import {
|
|
6
|
+
import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
|
|
7
|
+
import { Container, Key, matchesKey, Text } from "@earendil-works/pi-tui";
|
|
8
|
+
import { ScopedSettingsList } from "./scoped-settings-list.ts";
|
|
9
|
+
import type { SettingsCollectionDiagnostic, SettingsScope } from "./settings-registry.ts";
|
|
8
10
|
import {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
Key,
|
|
12
|
-
matchesKey,
|
|
13
|
-
type SelectItem,
|
|
14
|
-
SelectList,
|
|
15
|
-
type SelectListTheme,
|
|
16
|
-
type SettingItem,
|
|
17
|
-
SettingsList,
|
|
18
|
-
Text,
|
|
19
|
-
} from "@earendil-works/pi-tui";
|
|
20
|
-
import { getSelectableModels } from "../model-selection.ts";
|
|
21
|
-
import {
|
|
22
|
-
getRegisteredSettings,
|
|
23
|
-
type SettingsScope,
|
|
24
|
-
type SettingsSection,
|
|
11
|
+
createSettingsContributionCollector,
|
|
12
|
+
SUPI_SETTINGS_COLLECT_EVENT,
|
|
25
13
|
} from "./settings-registry.ts";
|
|
26
14
|
|
|
27
|
-
//
|
|
15
|
+
// Re-export submenu helpers
|
|
16
|
+
export { createInputSubmenu, createModelPickerSubmenu } from "./settings-submenus.ts";
|
|
28
17
|
|
|
29
|
-
|
|
30
|
-
* Creates a pi-tui Input-backed submenu component with enter-to-confirm
|
|
31
|
-
* and escape-to-cancel handling.
|
|
32
|
-
*
|
|
33
|
-
* @param currentValue - Initial value for the text input.
|
|
34
|
-
* @param label - Label text displayed above the input.
|
|
35
|
-
* @param done - Callback invoked with the confirmed value, or undefined on cancel.
|
|
36
|
-
*/
|
|
37
|
-
export function createInputSubmenu(
|
|
38
|
-
currentValue: string,
|
|
39
|
-
label: string,
|
|
40
|
-
done: (selectedValue?: string) => void,
|
|
41
|
-
): {
|
|
42
|
-
render: (width: number) => string[];
|
|
43
|
-
invalidate: () => void;
|
|
44
|
-
handleInput: (data: string) => boolean;
|
|
45
|
-
} {
|
|
46
|
-
const input = new Input();
|
|
47
|
-
input.setValue(currentValue);
|
|
18
|
+
// ── Overlay ────────────────────────────────────────────────────────────────
|
|
48
19
|
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
lines.push(...input.render(_width));
|
|
53
|
-
lines.push(" enter confirm • esc cancel");
|
|
54
|
-
return lines;
|
|
55
|
-
},
|
|
56
|
-
invalidate: () => {
|
|
57
|
-
input.invalidate();
|
|
58
|
-
},
|
|
59
|
-
handleInput: (data: string) => {
|
|
60
|
-
if (matchesKey(data, Key.escape)) {
|
|
61
|
-
done();
|
|
62
|
-
return true;
|
|
63
|
-
}
|
|
64
|
-
if (matchesKey(data, Key.enter)) {
|
|
65
|
-
done(input.getValue());
|
|
66
|
-
return true;
|
|
67
|
-
}
|
|
68
|
-
input.handleInput(data);
|
|
69
|
-
return true;
|
|
70
|
-
},
|
|
71
|
-
};
|
|
20
|
+
interface OverlayStatus {
|
|
21
|
+
kind: "warning" | "error";
|
|
22
|
+
message: string;
|
|
72
23
|
}
|
|
73
24
|
|
|
74
|
-
// ── Types ────────────────────────────────────────────────────
|
|
75
|
-
|
|
76
25
|
interface OverlayState {
|
|
77
26
|
scope: SettingsScope;
|
|
78
27
|
cwd: string;
|
|
28
|
+
status?: OverlayStatus;
|
|
79
29
|
}
|
|
80
30
|
|
|
81
|
-
// ── Pure helpers ─────────────────────────────────────────────
|
|
82
|
-
|
|
83
31
|
function getScopeLabel(scope: SettingsScope): string {
|
|
84
32
|
return scope === "project" ? "Project" : "Global";
|
|
85
33
|
}
|
|
86
34
|
|
|
87
|
-
function
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
ctx?: ExtensionContext,
|
|
92
|
-
): SettingItem[] {
|
|
93
|
-
const items: SettingItem[] = [];
|
|
94
|
-
for (const section of sections) {
|
|
95
|
-
const sectionItems = section.loadValues(scope, cwd, ctx);
|
|
96
|
-
for (const item of sectionItems) {
|
|
97
|
-
items.push({
|
|
98
|
-
...item,
|
|
99
|
-
id: `${section.id}.${item.id}`,
|
|
100
|
-
label: `${section.label}: ${item.label}`,
|
|
101
|
-
});
|
|
102
|
-
}
|
|
103
|
-
}
|
|
104
|
-
return items;
|
|
105
|
-
}
|
|
106
|
-
|
|
107
|
-
function findSectionAndId(
|
|
108
|
-
sections: SettingsSection[],
|
|
109
|
-
flatId: string,
|
|
110
|
-
): { section: SettingsSection; itemId: string } | null {
|
|
111
|
-
const dotIndex = flatId.indexOf(".");
|
|
112
|
-
if (dotIndex === -1) return null;
|
|
113
|
-
const sectionId = flatId.slice(0, dotIndex);
|
|
114
|
-
const itemId = flatId.slice(dotIndex + 1);
|
|
115
|
-
const section = sections.find((s) => s.id === sectionId);
|
|
116
|
-
if (!section) return null;
|
|
117
|
-
return { section, itemId };
|
|
118
|
-
}
|
|
119
|
-
|
|
120
|
-
// ── Component ────────────────────────────────────────────────
|
|
121
|
-
|
|
122
|
-
interface SettingsOverlayDeps {
|
|
123
|
-
ctx: ExtensionContext;
|
|
124
|
-
state: OverlayState;
|
|
125
|
-
container: Container;
|
|
126
|
-
settingsList: SettingsList | null;
|
|
127
|
-
tui: Parameters<Parameters<ExtensionContext["ui"]["custom"]>[0]>[0];
|
|
128
|
-
theme: Parameters<Parameters<ExtensionContext["ui"]["custom"]>[0]>[1];
|
|
129
|
-
done: () => void;
|
|
130
|
-
}
|
|
131
|
-
|
|
132
|
-
function createSettingsList(deps: SettingsOverlayDeps): SettingsList {
|
|
133
|
-
const sections = getRegisteredSettings();
|
|
134
|
-
const items = buildFlatItems(sections, deps.state.scope, deps.state.cwd, deps.ctx);
|
|
135
|
-
const onChange = (flatId: string, newValue: string) => {
|
|
136
|
-
const found = findSectionAndId(sections, flatId);
|
|
137
|
-
if (found) {
|
|
138
|
-
found.section.persistChange(
|
|
139
|
-
deps.state.scope,
|
|
140
|
-
deps.state.cwd,
|
|
141
|
-
found.itemId,
|
|
142
|
-
newValue,
|
|
143
|
-
deps.ctx,
|
|
144
|
-
);
|
|
145
|
-
}
|
|
146
|
-
// Re-read all values to reflect persisted changes, but keep the list
|
|
147
|
-
// instance (and its selectedIndex) intact.
|
|
148
|
-
const updatedItems = buildFlatItems(sections, deps.state.scope, deps.state.cwd, deps.ctx);
|
|
149
|
-
for (const updated of updatedItems) {
|
|
150
|
-
const existing = items.find((i) => i.id === updated.id);
|
|
151
|
-
if (existing && existing.currentValue !== updated.currentValue) {
|
|
152
|
-
settingsList.updateValue(updated.id, updated.currentValue);
|
|
153
|
-
}
|
|
154
|
-
}
|
|
155
|
-
deps.tui.requestRender();
|
|
156
|
-
};
|
|
157
|
-
const settingsList = new SettingsList(
|
|
158
|
-
items,
|
|
159
|
-
Math.min(items.length + 4, 20),
|
|
160
|
-
getSettingsListTheme(),
|
|
161
|
-
onChange,
|
|
162
|
-
() => deps.done(),
|
|
163
|
-
{ enableSearch: true },
|
|
164
|
-
);
|
|
165
|
-
return settingsList;
|
|
166
|
-
}
|
|
167
|
-
|
|
168
|
-
function rebuildSettingsList(deps: SettingsOverlayDeps): SettingsList {
|
|
169
|
-
const settingsList = createSettingsList(deps);
|
|
170
|
-
deps.settingsList = settingsList;
|
|
171
|
-
|
|
172
|
-
deps.container.clear();
|
|
173
|
-
deps.container.addChild(createHeaderComponent(deps));
|
|
174
|
-
deps.container.addChild(settingsList);
|
|
175
|
-
|
|
176
|
-
return settingsList;
|
|
177
|
-
}
|
|
178
|
-
|
|
179
|
-
function createHeaderComponent(deps: SettingsOverlayDeps): Text {
|
|
180
|
-
const { theme, state } = deps;
|
|
181
|
-
const scopeLabel = getScopeLabel(state.scope);
|
|
182
|
-
const otherScope = state.scope === "project" ? "Global" : "Project";
|
|
183
|
-
const headerText = new Text(
|
|
184
|
-
`${theme.fg("accent", theme.bold("SuPi Settings"))} ${theme.fg("text", `Scope: ${scopeLabel}`)} ${theme.fg("dim", `(tab → ${otherScope})`)}`,
|
|
185
|
-
0,
|
|
186
|
-
0,
|
|
187
|
-
);
|
|
188
|
-
return headerText;
|
|
189
|
-
}
|
|
190
|
-
|
|
191
|
-
function handleScopeToggle(deps: SettingsOverlayDeps): void {
|
|
192
|
-
deps.state.scope = deps.state.scope === "project" ? "global" : "project";
|
|
193
|
-
rebuildSettingsList(deps);
|
|
194
|
-
deps.tui.requestRender();
|
|
195
|
-
}
|
|
196
|
-
|
|
197
|
-
/** Minimal SelectList theme — uses identity so the parent SettingsList provides styling context. */
|
|
198
|
-
const PASSTHROUGH_THEME: SelectListTheme = {
|
|
199
|
-
selectedPrefix: (text) => `› ${text}`,
|
|
200
|
-
selectedText: (text) => text,
|
|
201
|
-
description: (text) => text,
|
|
202
|
-
scrollInfo: (text) => text,
|
|
203
|
-
noMatch: (text) => text,
|
|
204
|
-
};
|
|
205
|
-
|
|
206
|
-
/**
|
|
207
|
-
* Create a model picker submenu for settings.
|
|
208
|
-
*
|
|
209
|
-
* Shows a scrollable list of selectable models from the scoped model set,
|
|
210
|
-
* with the current session model annotated `[current]`. The first entry is
|
|
211
|
-
* always `"disabled"`.
|
|
212
|
-
*
|
|
213
|
-
* @param currentValue - Currently configured canonical model id or `"disabled"`.
|
|
214
|
-
* @param done - Callback invoked with the selected value, or undefined on cancel.
|
|
215
|
-
* @param ctx - Extension context for model listing. When undefined, only
|
|
216
|
-
* `"disabled"` is offered.
|
|
217
|
-
*/
|
|
218
|
-
export function createModelPickerSubmenu(
|
|
219
|
-
currentValue: string,
|
|
220
|
-
done: (selectedValue?: string) => void,
|
|
221
|
-
ctx?: ExtensionContext,
|
|
222
|
-
): {
|
|
223
|
-
render: (width: number) => string[];
|
|
224
|
-
invalidate: () => void;
|
|
225
|
-
handleInput: (data: string) => boolean;
|
|
226
|
-
} {
|
|
227
|
-
const items = buildModelItems(ctx);
|
|
228
|
-
|
|
229
|
-
const initialIndex =
|
|
230
|
-
currentValue === "disabled"
|
|
231
|
-
? 0
|
|
232
|
-
: Math.max(
|
|
233
|
-
0,
|
|
234
|
-
items.findIndex((item) => item.value === currentValue),
|
|
235
|
-
);
|
|
236
|
-
|
|
237
|
-
const container = new Container();
|
|
238
|
-
container.addChild(new Text(" Select suggestion model", 1, 0));
|
|
239
|
-
container.addChild(new Text("", 1, 0));
|
|
240
|
-
|
|
241
|
-
const selectList = new SelectList(items, Math.min(items.length, 15), PASSTHROUGH_THEME);
|
|
242
|
-
|
|
243
|
-
if (initialIndex >= 0) {
|
|
244
|
-
selectList.setSelectedIndex(initialIndex);
|
|
245
|
-
}
|
|
246
|
-
|
|
247
|
-
selectList.onSelect = (item) => done(item.value);
|
|
248
|
-
selectList.onCancel = () => done();
|
|
249
|
-
|
|
250
|
-
container.addChild(selectList);
|
|
251
|
-
container.addChild(new Text(" ↑↓ navigate • enter select • esc cancel", 1, 0));
|
|
252
|
-
|
|
253
|
-
return {
|
|
254
|
-
render: (width: number) => container.render(width),
|
|
255
|
-
invalidate: () => container.invalidate(),
|
|
256
|
-
handleInput: (data: string) => {
|
|
257
|
-
selectList.handleInput(data);
|
|
258
|
-
return true;
|
|
259
|
-
},
|
|
260
|
-
};
|
|
35
|
+
function collectSettingsSections(pi: ExtensionAPI) {
|
|
36
|
+
const collector = createSettingsContributionCollector();
|
|
37
|
+
pi.events.emit(SUPI_SETTINGS_COLLECT_EVENT, collector);
|
|
38
|
+
return collector.result();
|
|
261
39
|
}
|
|
262
40
|
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
{
|
|
267
|
-
value: "disabled",
|
|
268
|
-
label: "disabled",
|
|
269
|
-
description: "No prompt suggestions",
|
|
270
|
-
},
|
|
271
|
-
];
|
|
272
|
-
|
|
273
|
-
if (!ctx) return items;
|
|
274
|
-
|
|
275
|
-
const models = getSelectableModels(ctx);
|
|
276
|
-
|
|
277
|
-
for (const model of models) {
|
|
278
|
-
const suffix = model.isCurrent ? " [current]" : "";
|
|
279
|
-
items.push({
|
|
280
|
-
value: model.canonicalId,
|
|
281
|
-
label: `${model.canonicalId}${suffix}`,
|
|
282
|
-
description: model.label !== model.canonicalId ? model.label : undefined,
|
|
283
|
-
});
|
|
284
|
-
}
|
|
285
|
-
|
|
286
|
-
return items;
|
|
41
|
+
function latestStatus(diagnostics: SettingsCollectionDiagnostic[]): OverlayStatus | undefined {
|
|
42
|
+
const latest = diagnostics.at(-1);
|
|
43
|
+
return latest ? { kind: latest.kind, message: latest.message } : undefined;
|
|
287
44
|
}
|
|
288
45
|
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
const sections = getRegisteredSettings();
|
|
293
|
-
if (sections.length === 0) {
|
|
46
|
+
export function openSettingsOverlay(pi: ExtensionAPI, ctx: ExtensionContext): void {
|
|
47
|
+
const collection = collectSettingsSections(pi);
|
|
48
|
+
if (collection.sections.length === 0) {
|
|
294
49
|
ctx.ui.notify("No settings registered by SuPi extensions", "info");
|
|
295
50
|
return;
|
|
296
51
|
}
|
|
297
52
|
|
|
298
53
|
void ctx.ui.custom<void>((tui, theme, _kb, done) => {
|
|
299
|
-
const state: OverlayState = {
|
|
300
|
-
|
|
54
|
+
const state: OverlayState = {
|
|
55
|
+
scope: "project",
|
|
56
|
+
cwd: ctx.cwd,
|
|
57
|
+
status: latestStatus(collection.diagnostics),
|
|
58
|
+
};
|
|
301
59
|
|
|
302
|
-
const
|
|
60
|
+
const container = new Container();
|
|
61
|
+
const scopedList = new ScopedSettingsList(
|
|
62
|
+
collection.sections,
|
|
63
|
+
state.scope,
|
|
64
|
+
state.cwd,
|
|
303
65
|
ctx,
|
|
304
|
-
state,
|
|
305
|
-
container,
|
|
306
|
-
settingsList: null,
|
|
307
|
-
tui,
|
|
308
66
|
theme,
|
|
67
|
+
tui,
|
|
309
68
|
done,
|
|
69
|
+
(message) => {
|
|
70
|
+
state.status = { kind: "error", message };
|
|
71
|
+
rebuildOverlay();
|
|
72
|
+
tui.requestRender();
|
|
73
|
+
},
|
|
74
|
+
);
|
|
75
|
+
scopedList.enableSearch();
|
|
76
|
+
|
|
77
|
+
const rebuildOverlay = () => {
|
|
78
|
+
container.clear();
|
|
79
|
+
const scopeLabel = getScopeLabel(state.scope);
|
|
80
|
+
const otherScope = state.scope === "project" ? "Global" : "Project";
|
|
81
|
+
container.addChild(
|
|
82
|
+
new Text(
|
|
83
|
+
`${theme.fg("accent", theme.bold("SuPi Settings"))} ${theme.fg("text", `Scope: ${scopeLabel}`)} ${theme.fg("dim", `(tab → ${otherScope})`)}`,
|
|
84
|
+
0,
|
|
85
|
+
0,
|
|
86
|
+
),
|
|
87
|
+
);
|
|
88
|
+
if (state.status) {
|
|
89
|
+
container.addChild(new Text(theme.fg(state.status.kind, state.status.message), 0, 0));
|
|
90
|
+
}
|
|
310
91
|
};
|
|
311
92
|
|
|
312
|
-
|
|
93
|
+
rebuildOverlay();
|
|
313
94
|
|
|
314
95
|
const component = {
|
|
315
|
-
render: (width: number) => container.render(width),
|
|
316
|
-
invalidate: () =>
|
|
96
|
+
render: (width: number) => [...container.render(width), ...scopedList.render(width)],
|
|
97
|
+
invalidate: () => {
|
|
98
|
+
container.invalidate();
|
|
99
|
+
scopedList.invalidate();
|
|
100
|
+
},
|
|
317
101
|
handleInput: (data: string) => {
|
|
318
102
|
if (matchesKey(data, Key.tab)) {
|
|
319
|
-
|
|
103
|
+
state.scope = state.scope === "project" ? "global" : "project";
|
|
104
|
+
state.status = undefined;
|
|
105
|
+
scopedList.reload(state.scope, state.cwd, ctx);
|
|
106
|
+
rebuildOverlay();
|
|
107
|
+
tui.requestRender();
|
|
320
108
|
return true;
|
|
321
109
|
}
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
deps.tui.requestRender();
|
|
110
|
+
scopedList.handleInput(data);
|
|
111
|
+
tui.requestRender();
|
|
325
112
|
return true;
|
|
326
113
|
},
|
|
327
114
|
};
|
|
@@ -1,6 +1,3 @@
|
|
|
1
1
|
// supi-core settings-ui domain — settings TUI components (imports pi-tui at runtime, heavy).
|
|
2
|
-
export {
|
|
3
|
-
|
|
4
|
-
createModelPickerSubmenu,
|
|
5
|
-
openSettingsOverlay,
|
|
6
|
-
} from "./settings/settings-ui.ts";
|
|
2
|
+
export { createInputSubmenu, createModelPickerSubmenu } from "./settings/settings-submenus.ts";
|
|
3
|
+
export { openSettingsOverlay } from "./settings/settings-ui.ts";
|
|
@@ -1,9 +1,31 @@
|
|
|
1
|
-
// supi-core settings domain — settings
|
|
1
|
+
// supi-core settings domain — event-backed declarative settings contributions and command wiring.
|
|
2
2
|
|
|
3
3
|
export { registerSettingsCommand } from "./settings/settings-command.ts";
|
|
4
|
-
export type {
|
|
4
|
+
export type {
|
|
5
|
+
SettingsCollectionDiagnostic,
|
|
6
|
+
SettingsCollectionResult,
|
|
7
|
+
SettingsContributionCollector,
|
|
8
|
+
SettingsScope,
|
|
9
|
+
SettingsSection,
|
|
10
|
+
} from "./settings/settings-registry.ts";
|
|
5
11
|
export {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
12
|
+
createSettingsContributionCollector,
|
|
13
|
+
isSettingsContributionCollector,
|
|
14
|
+
SUPI_SETTINGS_COLLECT_EVENT,
|
|
9
15
|
} from "./settings/settings-registry.ts";
|
|
16
|
+
export type {
|
|
17
|
+
BoolField,
|
|
18
|
+
ConfigHelpers,
|
|
19
|
+
CustomField,
|
|
20
|
+
DeclarativeSettingsOptions,
|
|
21
|
+
EnumField,
|
|
22
|
+
ModelPickerField,
|
|
23
|
+
NumberField,
|
|
24
|
+
ScopedFieldValue,
|
|
25
|
+
SettingsField,
|
|
26
|
+
SettingsFieldAction,
|
|
27
|
+
SettingsPersistedChange,
|
|
28
|
+
StringListField,
|
|
29
|
+
ValueSource,
|
|
30
|
+
} from "./settings/settings-schema.ts";
|
|
31
|
+
export { registerDeclarativeSettings } from "./settings/settings-schema.ts";
|
|
@@ -53,6 +53,16 @@ export function derivePromptSurface(spec: SuiPiToolSpec): SuiPiToolPromptSurface
|
|
|
53
53
|
};
|
|
54
54
|
}
|
|
55
55
|
|
|
56
|
+
// Re-export prompt-surface types (implemented in config/prompt-surface.ts)
|
|
57
|
+
export {
|
|
58
|
+
notifyToolPromptSurfaceDiagnostics,
|
|
59
|
+
type ResolveToolPromptSurfaceOptions,
|
|
60
|
+
type ResolveToolPromptSurfaceResult,
|
|
61
|
+
resolveToolPromptSurface,
|
|
62
|
+
type ToolPromptSurfaceDiagnostic,
|
|
63
|
+
type ToolPromptSurfaceDiagnosticCode,
|
|
64
|
+
} from "./config/prompt-surface.ts";
|
|
65
|
+
|
|
56
66
|
// ---------------------------------------------------------------------------
|
|
57
67
|
// Registration
|
|
58
68
|
// ---------------------------------------------------------------------------
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mrclrchtr/supi-ask-user",
|
|
3
|
-
"version": "2.0
|
|
3
|
+
"version": "2.2.0",
|
|
4
4
|
"description": "SuPi ask-user extension — rich questionnaire UI for structured agent-user decisions",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
"!__tests__"
|
|
33
33
|
],
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@mrclrchtr/supi-core": "2.0
|
|
35
|
+
"@mrclrchtr/supi-core": "2.2.0"
|
|
36
36
|
},
|
|
37
37
|
"bundledDependencies": [
|
|
38
38
|
"@mrclrchtr/supi-core"
|
package/src/ask-user.ts
CHANGED
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
|
|
2
|
+
import {
|
|
3
|
+
notifyToolPromptSurfaceDiagnostics,
|
|
4
|
+
resolveToolPromptSurface,
|
|
5
|
+
} from "@mrclrchtr/supi-core/prompt-surface";
|
|
2
6
|
import { formatTitle, signalWaiting } from "@mrclrchtr/supi-core/terminal";
|
|
3
7
|
import { AskUserValidationError, normalizeQuestionnaire } from "./normalize.ts";
|
|
4
8
|
import { type AskUserToolResult, buildResult } from "./render/result.ts";
|
|
@@ -7,11 +11,9 @@ import { buildTreeSummaryLabel } from "./render/tree-summary.ts";
|
|
|
7
11
|
import { type AskUserParams, AskUserParamsSchema } from "./schema.ts";
|
|
8
12
|
import { ActiveQuestionnaireLock } from "./session/lock.ts";
|
|
9
13
|
import {
|
|
14
|
+
ASK_USER_PROMPT_SURFACE_DEFAULTS,
|
|
10
15
|
ASK_USER_TOOL_LABEL,
|
|
11
16
|
ASK_USER_TOOL_NAME,
|
|
12
|
-
promptGuidelines,
|
|
13
|
-
promptSnippet,
|
|
14
|
-
toolDescription,
|
|
15
17
|
} from "./tool/guidance.ts";
|
|
16
18
|
import type {
|
|
17
19
|
AskUserInteractionResult,
|
|
@@ -35,12 +37,34 @@ export type AskUserExecutionContext = Pick<ExtensionContext, "cwd" | "hasUI" | "
|
|
|
35
37
|
export default function askUserExtension(pi: ExtensionAPI): void {
|
|
36
38
|
const lock = new ActiveQuestionnaireLock();
|
|
37
39
|
|
|
40
|
+
// Factory-time: register with package defaults.
|
|
41
|
+
registerAskUserTool(pi, lock, ASK_USER_PROMPT_SURFACE_DEFAULTS);
|
|
42
|
+
|
|
43
|
+
// session_start: re-register with resolved prompt surface (global + trusted project config).
|
|
44
|
+
pi.on("session_start", async (_event, ctx) => {
|
|
45
|
+
const { surface, diagnostics } = resolveToolPromptSurface({
|
|
46
|
+
section: "ask-user",
|
|
47
|
+
toolName: ASK_USER_TOOL_NAME,
|
|
48
|
+
defaults: ASK_USER_PROMPT_SURFACE_DEFAULTS,
|
|
49
|
+
ctx,
|
|
50
|
+
});
|
|
51
|
+
|
|
52
|
+
registerAskUserTool(pi, lock, surface);
|
|
53
|
+
notifyToolPromptSurfaceDiagnostics(ctx, diagnostics);
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
function registerAskUserTool(
|
|
58
|
+
pi: ExtensionAPI,
|
|
59
|
+
lock: ActiveQuestionnaireLock,
|
|
60
|
+
surface: typeof ASK_USER_PROMPT_SURFACE_DEFAULTS,
|
|
61
|
+
): void {
|
|
38
62
|
pi.registerTool<typeof AskUserParamsSchema, AskUserToolDetails>({
|
|
39
63
|
name: ASK_USER_TOOL_NAME,
|
|
40
64
|
label: ASK_USER_TOOL_LABEL,
|
|
41
|
-
description:
|
|
42
|
-
promptSnippet,
|
|
43
|
-
promptGuidelines,
|
|
65
|
+
description: surface.description,
|
|
66
|
+
promptSnippet: surface.promptSnippet,
|
|
67
|
+
promptGuidelines: surface.promptGuidelines,
|
|
44
68
|
parameters: AskUserParamsSchema,
|
|
45
69
|
executionMode: "sequential",
|
|
46
70
|
// biome-ignore lint/complexity/useMaxParams: pi ToolDefinition.execute signature
|
package/src/tool/guidance.ts
CHANGED
|
@@ -5,14 +5,19 @@ import { DEFAULT_MAX_BYTES, DEFAULT_MAX_LINES, formatSize } from "@earendil-work
|
|
|
5
5
|
export const ASK_USER_TOOL_NAME = "ask_user";
|
|
6
6
|
export const ASK_USER_TOOL_LABEL = "Ask User";
|
|
7
7
|
|
|
8
|
-
export const toolDescription = `Open a blocking interactive TUI decision form
|
|
8
|
+
export const toolDescription = `Open a blocking interactive TUI decision form for focused user input. Supports 1-10 choice/text questions, one active form, and sequential execution; requires TUI custom UI. Result text is truncated to ${DEFAULT_MAX_LINES} lines or ${formatSize(DEFAULT_MAX_BYTES)}.`;
|
|
9
9
|
|
|
10
10
|
export const promptSnippet = "ask_user — request a focused blocking user decision";
|
|
11
11
|
|
|
12
12
|
export const promptGuidelines = [
|
|
13
|
-
"Use ask_user only when blocked
|
|
14
|
-
"Use
|
|
15
|
-
"
|
|
16
|
-
"Use ask_user `choice` for fixed/yes-no options and `text` for short freeform input.",
|
|
17
|
-
"In ask_user, use stable ids/values; recommendations are single-choice string (omitted = first option), multi-choice array (omitted = none), or text string; unanswered questions return `needs_discussion`.",
|
|
13
|
+
"Use ask_user only when blocked after inspecting what can be inspected; not for status updates or broad surveys.",
|
|
14
|
+
"Use ask_user for one decision form; combine related choice/text questions and avoid sibling tool calls that depend on the answer.",
|
|
15
|
+
"In ask_user, use stable ids/values; recommendations must match question type, and unanswered questions return `needs_discussion`.",
|
|
18
16
|
];
|
|
17
|
+
|
|
18
|
+
/** Package defaults for the ask_user prompt surface (used by the config resolver). */
|
|
19
|
+
export const ASK_USER_PROMPT_SURFACE_DEFAULTS = {
|
|
20
|
+
description: toolDescription,
|
|
21
|
+
promptSnippet,
|
|
22
|
+
promptGuidelines: [...promptGuidelines],
|
|
23
|
+
};
|