pi-optchat 0.7.1 → 0.7.2

package/README.md

@@ -44,9 +44,9 @@ For headless use, pass `--optchat-profile work`.
 | `/optchat` | Status and actions menu. |
 | `/optchat profile` | Select or create a profile. Switching starts a fresh Pi session. |
 | `/optchat settings` | This profile's settings: models, subagent levels and limits, previous exchange, summary size tolerance. |
-| `/optchat model` | Compactor model and effort for this profile. |
+| `/optchat model` | Compactor model and effort for this profile. Type to filter the models you are logged in to; the current one is marked. |
 | `/optchat agents` | Live agent tree and saved run history. |
-| `/optchat agents model` | Subagent model and effort for this profile. |
+| `/optchat agents model` | Subagent model and effort for this profile, picked the same way. |
 | `/optchat usage` | Token usage and cost estimates. |
 | `/optchat activity` | Memory gauge: view size, summaries catching up, running agents. |
 | `/optchat instructions` | Edit this profile's `AGENTS.md`. |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-optchat",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "type": "module",
   "pi": {
     "extensions": [

package/src/index.ts

@@ -9,7 +9,7 @@ import { parseSkillBlock, type ExtensionAPI, type ExtensionContext, type Extensi
 import { Type } from 'typebox';
 import { Memory } from './memory.ts';
 import { createCompressor } from './compactor.ts';
-import { atomicWrite, createProfile, instructions, lastProfile, listProfiles, loadConfig, lockProfile, profilePath, rememberProfile, saveConfig, ProfileBusyError, THINKING, type ProfileConfig } from './profiles.ts';
+import { atomicWrite, createProfile, instructions, lastProfile, listProfiles, loadConfig, lockProfile, profilePath, rememberProfile, saveConfig, ProfileBusyError, type ProfileConfig } from './profiles.ts';
 import { MASTER, VIEW_DOC } from './prompts.ts';
 import { cachePayload, record } from './cache.ts';
 import { asUser, boundedMessage, buildContext, logMessage, previousExchange, REPORT_TYPE, RUN_BOUNDARY, textContent, typedText } from './transcript.ts';
@@ -30,7 +30,7 @@ import { serveWindows } from './window-bridge.ts';
 import { openConnectedWindow, registerConnectedRenderer } from './connected-window.ts';
 import { createHandoffSummarizer } from './handoff.ts';
 import { mainTitle, TabTitle } from './title.ts';
-import { showSettings } from './settings-page.ts';
+import { showModelPicker, showSettings } from './settings-page.ts';
 
 const binding = 'optchat.profile';
 const CONTINUITY = '\n\nFor conversational continuity, the memory view may be followed by the immediately preceding completed exchange (its user requests and final answer, in full text; left out when very long), then the new input. Use that exact wording to understand follow-ups; older exchanges and previous tool output remain accessible through memory and zoom.';
@@ -357,20 +357,15 @@ export default function optchat(pi: ExtensionAPI) {
     async execute(_id, args) { return result(await required().children.tell(args.id, args.message)); },
   });
 
+  /** The settings page's options: every model Pi is logged in to, with the thinking levels it takes, sorted so each provider's models sit together. */
+  const settingsOptions = (ctx: ExtensionContext, a: Active) => ({ profile: a.name, config: a.config,
+    models: ctx.modelRegistry.getAvailable().map(m => ({ name: `${m.provider}/${m.id}`, thinking: getSupportedThinkingLevels(m) })).sort((x, y) => x.name.localeCompare(y.name)),
+    save: (config: ProfileConfig) => { saveConfig(a.dir, config); syncSearch(config); } });
   const pickModel = async (ctx: ExtensionContext, role: 'compactor' | 'subagent') => {
-    const a = required(), current = a.config[role];
-    const available = ctx.modelRegistry.getAvailable(), choices = available.map(m => `${m.provider}/${m.id}`);
-    choices.sort((a, b) => Number(b === `${current.provider}/${current.model}`) - Number(a === `${current.provider}/${current.model}`) || a.localeCompare(b));
-    const selected = await ctx.ui.select(`${a.name}: ${role} model`, choices);
-    if (!selected) return;
-    const model = available.find(m => `${m.provider}/${m.id}` === selected);
-    const levels = model ? getSupportedThinkingLevels(model) : THINKING;
-    const picked = await ctx.ui.select('Thinking level', [...levels]);
-    const thinking = levels.find(level => level === picked);
-    if (!thinking) return;
-    const separator = selected.indexOf('/');
-    a.config[role] = { provider: selected.slice(0, separator), model: selected.slice(separator + 1), thinking };
-    saveConfig(a.dir, a.config); ctx.ui.notify(`${role}: ${selected} (${thinking}); applies to new calls.`, 'info');
+    const a = required();
+    if (ctx.mode !== 'tui') throw new Error('Choosing a model requires interactive Pi. Edit config.json in the profile directory instead.');
+    const choice = await showModelPicker(ctx, role, settingsOptions(ctx, a));
+    if (choice) ctx.ui.notify(`${role}: ${choice.provider}/${choice.model} (${choice.thinking}); applies to new calls.`, 'info');
   };
   const inspect = async (ctx: ExtensionContext, page: InspectorPage) => {
     if (inspectorController) return;
@@ -451,8 +446,7 @@ export default function optchat(pi: ExtensionAPI) {
     if (action === 'settings') {
       const a = required();
       if (ctx.mode !== 'tui') throw new Error('/optchat settings requires interactive Pi. Edit config.json in the profile directory instead.');
-      return showSettings(ctx, { profile: a.name, config: a.config, models: ctx.modelRegistry.getAvailable().map(m => ({ name: `${m.provider}/${m.id}`, thinking: getSupportedThinkingLevels(m) })).sort((a, b) => a.name.localeCompare(b.name)),
-        save: config => { saveConfig(a.dir, config); syncSearch(config); } });
+      return showSettings(ctx, settingsOptions(ctx, a));
     }
     if (action === 'model') return pickModel(ctx, 'compactor');
     if (action === 'agents model') return pickModel(ctx, 'subagent');

package/src/settings-page.ts

@@ -71,7 +71,7 @@ class ModelStep extends Container {
   }
   private pickModel() {
     const { theme, current } = this, filter = new Input();
-    const items: SelectItem[] = this.models.map(({ name }) => ({ value: name, label: name }));
+    const items: SelectItem[] = this.models.map(({ name }) => ({ value: name, label: name, description: name === modelName(current) ? 'current' : undefined }));
     let list = new SelectList(items, 10, listTheme(theme));
     const build = () => {
       list = new SelectList(filter.getValue() ? fuzzyFilter(items, filter.getValue(), i => i.value) : items, 10, listTheme(theme));
@@ -106,6 +106,21 @@ class ModelStep extends Container {
   handleInput(data: string) { this.active.handleInput(data); }
 }
 
+/** Saves a change to the profile config and applies it in memory; returns the reason if it couldn't be written. */
+function update(o: Options, patch: Partial<ProfileConfig>) {
+  try { o.save({ ...o.config, ...patch }); }
+  catch (error) { return `Could not save: ${error instanceof Error ? error.message : String(error)}`; }
+  Object.assign(o.config, patch);
+  return undefined;
+}
+/** Bordered, titled like Pi's own dialogs. */
+function frame(theme: Theme, title: string, profile: string, body: Component[]) {
+  const page = new Container();
+  for (const child of [new DynamicBorder(s => theme.fg('border', s)), new Text(`${theme.bold(theme.fg('accent', title))}${theme.fg('muted', ` · ${profile}`)}`, 1, 0),
+    ...body, new DynamicBorder(s => theme.fg('border', s))]) page.addChild(child);
+  return page;
+}
+
 /** The page itself: Pi's settings list over this profile's config, one row per setting, saved on change. */
 export function settingsPage(theme: Theme, o: Options, close: () => void, redraw = () => {}) {
   const { config } = o;
@@ -113,11 +128,9 @@ export function settingsPage(theme: Theme, o: Options, close: () => void, redraw
   const marker = (same: boolean, fallback: string) => theme.fg('dim', same ? '  default' : `  default ${fallback}`);
   const value = (key: SettingKey, current: number | boolean) => `${show(key, current)}${marker(current === SETTINGS[key].default, show(key, SETTINGS[key].default))}`;
   const apply = (patch: Partial<ProfileConfig>, what: string, applies: string) => {
-    try { o.save({ ...config, ...patch }); }
-    catch (error) { return `Could not save: ${error instanceof Error ? error.message : String(error)}`; }
-    Object.assign(config, patch);
-    notice.setText(theme.fg('success', `Saved ${what}. `) + theme.fg('muted', applies));
-    return undefined;
+    const problem = update(o, patch);
+    if (!problem) notice.setText(theme.fg('success', `Saved ${what}. `) + theme.fg('muted', applies));
+    return problem;
   };
   const models = (['compactor', 'subagent'] as const).map((role): SettingItem => {
     const { label, description, applies } = ROLES[role];
@@ -152,13 +165,25 @@ export function settingsPage(theme: Theme, o: Options, close: () => void, redraw
     const problem = apply({ [key]: on }, `${SETTINGS[key].label.toLowerCase()} ${on ? 'on' : 'off'}`, SETTINGS[key].applies);
     if (problem) { list.updateValue(key, value(key, config[key])); notice.setText(theme.fg('error', problem)); }
   }, close);
-  const page = new Container();
-  for (const child of [new DynamicBorder(s => theme.fg('border', s)), new Text(`${theme.bold(theme.fg('accent', 'OptChat settings'))}${theme.fg('muted', ` · ${o.profile}`)}`, 1, 0),
+  const page = frame(theme, 'OptChat settings', o.profile, [
     new Text(theme.fg('dim', 'Saved as you change them · Victor\'s recipe by default, except Previous exchange and Summary size tolerance'), 1, 0),
-    new Spacer(1), list, notice, new DynamicBorder(s => theme.fg('border', s))]) page.addChild(child);
+    new Spacer(1), list, notice]);
   return Object.assign(page, { handleInput: (data: string) => { notice.setText(''); list.handleInput(data); redraw(); } });
 }
 
+/** Just the settings page's model step, for /optchat model and /optchat agents model: closes with the saved choice, or nothing on Esc. */
+export function modelPicker(theme: Theme, role: Role, o: Options, close: (choice?: ModelChoice) => void, redraw = () => {}) {
+  const step = new ModelStep(theme, role, o.models, o.config[role], choice => {
+    const problem = update(o, { [role]: choice });
+    if (!problem) close(choice);
+    return problem;
+  }, () => close());
+  return Object.assign(frame(theme, 'OptChat', o.profile, [new Spacer(1), step]), { handleInput: (data: string) => { step.handleInput(data); redraw(); } });
+}
+
 export function showSettings(ctx: ExtensionContext, o: Options) {
   return ctx.ui.custom<void>((tui, theme, _keys, done) => settingsPage(theme, o, () => done(undefined), () => tui.requestRender()));
 }
+export function showModelPicker(ctx: ExtensionContext, role: Role, o: Options) {
+  return ctx.ui.custom<ModelChoice | undefined>((tui, theme, _keys, done) => modelPicker(theme, role, o, done, () => tui.requestRender()));
+}