pi-optchat 0.11.2 → 0.11.3

package/README.md

@@ -79,7 +79,7 @@ Details, errors and join rules: [docs/connected-windows.md](docs/connected-windo
 | Subagents | Anthropic Opus 5.5, high | `/optchat agents model` |
 | Compactor (summaries, imports, fallback handoffs) | Anthropic Sonnet 5.5, medium | `/optchat model` |
 
-All three are saved per profile. The main agent's model and thinking level are saved whenever you change them in Pi and picked again when the profile opens, unless the saved model is no longer available. This includes resumed sessions: the profile's pick replaces the one the session last used. On Pi's command line, `--model` (or `--provider`) keeps that model, `--thinking` that level, and `--models` keeps a saved model only if it is in that list. Subagent and compactor settings do not follow the main model. If you use other providers, change them before chatting. Authentication uses Pi's existing provider login.
+All three are saved per profile. The main agent's model and thinking level are saved when you first open the profile and whenever you change them in Pi, then picked again when the profile opens, unless the saved model is no longer available. This includes resumed sessions: the profile's pick replaces the one the session last used. On Pi's command line, `--model` (or `--provider`) keeps that model, `--thinking` that level, and `--models` keeps a saved model only if it is in that list. Subagent and compactor settings do not follow the main model. If you use other providers, change them before chatting. Authentication uses Pi's existing provider login.
 
 Compression and subagents make extra model requests with your provider credentials.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-optchat",
-  "version": "0.11.2",
+  "version": "0.11.3",
   "type": "module",
   "exports": {
     ".": "./src/index.ts",

package/src/index.ts

@@ -47,7 +47,7 @@ async function printReply(text: string) {
     catch (error) { if (!record(error) || error.code !== 'EAGAIN') throw error; await new Promise(resolve => setTimeout(resolve, 10)); }
   }
 }
-interface Active { name: string; dir: string; config: ProfileConfig; memory: Memory; inbox: Inbox; children: Children; usage: UsageLedger; unlock: () => Promise<void> }
+interface Active { name: string; session: string; dir: string; config: ProfileConfig; memory: Memory; inbox: Inbox; children: Children; usage: UsageLedger; unlock: () => Promise<void> }
 
 /** OptChat's own version, read from the package.json beside src/ (in the checkout and the npm package alike); none if unreadable. */
 export const version = ((): string | undefined => {
@@ -73,6 +73,8 @@ export default function optchat(pi: ExtensionAPI) {
   let view: string | undefined;
   let prompt = '';
   let runStarted = false;
+  /** The run was started by a custom message (`sendMessage` with `triggerTurn` while idle): its first message is that input, shown or hidden. */
+  let wake = false;
   let fault: string | undefined;
   /** Reports not yet in memory. `count`: how many subagent reports the text joins. `batch`: held while the rest of that spawn runs, not sent yet.
    * `steered`: last sent into a running turn, where Esc or a dequeue can clear it from Pi's queue unseen. */
@@ -133,7 +135,12 @@ export default function optchat(pi: ExtensionAPI) {
   pi.on('thinking_level_select', (_event, ctx) => rememberMain(ctx));
   const restoreMain = async (ctx: ExtensionContext, { name, config: { main } }: Active) => {
     restored = undefined;
-    if (!main || pinnedModel || launch.models && !ctx.scopedModels.some(({ model }) => model.provider === main.provider && model.id === main.model)) return;
+    if (!main) {
+      // Nothing saved yet: record where Pi is, so later opens keep this model instead of following Pi's default.
+      if (!pinnedModel) rememberMain(ctx);
+      return;
+    }
+    if (pinnedModel || launch.models && !ctx.scopedModels.some(({ model }) => model.provider === main.provider && model.id === main.model)) return;
     const model = ctx.modelRegistry.find(main.provider, main.model), thinking = launch.thinking ?? main.thinking;
     restoring = true;
     try {
@@ -223,6 +230,10 @@ export default function optchat(pi: ExtensionAPI) {
   const openProfile = async (name: string, ctx: ExtensionContext) => {
     const dir = profilePath(name);
     if (!existsSync(dir)) throw new Error(`Profile ${name} does not exist. Use /optchat profile to create it.`);
+    // Pi's RPC mode binds extensions twice after new_session/switch_session/fork/clone (setRebindSession, then rebindSession()),
+    // so session_start can arrive again for the session this profile already serves. Taking the lock again would meet our own socket.
+    // Only the same session is kept: another session without a session_shutdown still fails loudly below.
+    if (active?.name === name && active.session === ctx.sessionManager.getSessionId()) { await restoreMain(ctx, active); status(ctx); return; }
     const unlock = await holdProfile(storeFor(dir), dir, name, `${name} · PID ${process.pid} · ${hostname()} · ${ctx.cwd}`, warning => ctx.ui.notify(warning, 'warning'));
     let openingMemory: Memory | undefined;
     try {
@@ -250,7 +261,7 @@ export default function optchat(pi: ExtensionAPI) {
         .filter(r => !loggedReports.has(reportReceipt(r.text)));
       atomicWrite(pending, JSON.stringify(reports));
       rememberProfile(name);
-      active = { name, dir, config, memory, inbox, children, usage, unlock }; fault = undefined; idle = () => ctx.isIdle();
+      active = { name, session: sessionId, dir, config, memory, inbox, children, usage, unlock }; fault = undefined; idle = () => ctx.isIdle();
       await restoreMain(ctx, active);
       if (ctx.mode === 'tui') unmountNavigation = mountNavigation(ctx, children, memory, shortcut, page => { void inspect(ctx, page); });
       // A one-shot run (`pi -p`, JSON) exits after its own prompt, which would end every conversation connected to it.
@@ -406,7 +417,7 @@ export default function optchat(pi: ExtensionAPI) {
   pi.on('before_agent_start', (event, ctx) => {
     if (!active) return; // Plain Pi run: leave Pi's own prompt untouched.
     const a = active;
-    flush(); run = []; logged = 0; keep = 0; view = undefined; runStarted = true;
+    flush(); run = []; logged = 0; keep = 0; view = undefined; runStarted = true; wake = event.messageType === 'custom';
     previous = a.config.previousExchange ? previousExchange(ctx.sessionManager.getBranch(), a.config.previousExchangeKB * 1000) : [];
     pi.appendEntry(RUN_BOUNDARY, { state: 'start' });
     // Pi's own prompt sections (AGENTS.md files, skills, cwd) stay; the profile's instructions go last.
@@ -420,7 +431,8 @@ export default function optchat(pi: ExtensionAPI) {
   pi.on('message_end', async (event, ctx) => {
     if (!active || !runStarted) return;
     const bounded = boundedMessage(event.message);
-    const message = asUser(bounded);
+    // Pi puts the message that starts a run first, before any context it or other extensions inject.
+    const message = asUser(bounded, wake); if (bounded.role !== 'system') wake = false;
     // Before the message is logged, so the image its text names is already there for zoom; zoom's own images are kept already.
     if (message.role === 'user' || message.role === 'toolResult' && message.toolName !== 'zoom') {
       try { await saveImages(active.memory.store, message.content); }

package/src/profiles.ts

@@ -13,7 +13,7 @@ export const isWindows = process.platform === 'win32';
 const PIPE_PREFIX = '\\\\.\\pipe\\';
 
 export const dataHome = () => resolve(process.env.OPTCHAT_HOME ?? join(homedir(), '.optchat'));
-/** `main` is the last model and thinking level picked in Pi while this profile was open; absent until one is picked. */
+/** `main` is the last model and thinking level picked in Pi while this profile was open, recorded on the first open too. */
 export interface ProfileConfig extends Settings { compactor: ModelChoice; subagent: ModelChoice; main?: ModelChoice }
 export const defaults: ProfileConfig = {
   compactor: { provider: 'anthropic', model: 'claude-sonnet-5-5', thinking: 'medium' },

package/src/transcript.ts

@@ -24,13 +24,13 @@ export function typedText(content: unknown) {
   const text = textContent(content, false);
   return { text, bare: text.replace(/\n\n\[Image[ :][^\n]*\](?:\n\[Image[ :][^\n]*\])*$/, '') };
 }
-/** Pi's convertToLlm sends every custom message to the model as a user message. A shown one is part of the chat, so it
- * becomes a user message here too; another extension's starts with "[customType] ", as the recipe marks background work, so
- * the compactor never takes it for the user's words. A hidden one (display false), such as context an extension injects
- * each turn, stays custom: the model still sees it, and memory and the replay leave it out. Reports reach the model and the
- * previous-exchange replay as user messages; memory logs them as `work`. */
-export function asUser(message: AgentMessage): AgentMessage {
-  if (message.role !== 'custom' || !message.display) return message;
+/** Pi's convertToLlm sends every custom message to the model as a user message. One that is shown, or that starts the run
+ * (`input`, shown or hidden), is part of the chat, so it becomes a user message here too; another extension's starts with
+ * "[customType] ", as the recipe marks background work, so the compactor never takes it for the user's words. Any other hidden
+ * one (display false), such as context an extension injects each turn, stays custom: the model still sees it, and memory and
+ * the replay leave it out. Reports reach the model and the previous-exchange replay as user messages; memory logs them as `work`. */
+export function asUser(message: AgentMessage, input = false): AgentMessage {
+  if (message.role !== 'custom' || !message.display && !input) return message;
   const { content, customType, timestamp } = message;
   if (customType === REPORT_TYPE) return { role: 'user', content, timestamp };
   const tag = `[${customType}] `;
@@ -57,7 +57,14 @@ export function previousExchange(branch: readonly SessionEntry[], limit = PREVIO
 function latestExchange(branch: readonly SessionEntry[]) {
   let end = -1;
   let legacyEnd = branch.length;
-  const messages = (entries: readonly SessionEntry[]) => entries.flatMap(entry => entry.type === 'message' ? [asUser(entry.message)] : entry.type === 'custom_message' ? [asUser({ role: 'custom', customType: entry.customType, content: entry.content, display: entry.display, timestamp: Date.parse(entry.timestamp) })] : []);
+  // A run's first message is its input, a hidden custom one too: Pi puts it before any context it or other extensions inject.
+  const messages = (entries: readonly SessionEntry[], run = false) => entries.flatMap(entry => {
+    const message: AgentMessage | undefined = entry.type === 'message' ? entry.message : entry.type === 'custom_message'
+      ? { role: 'custom', customType: entry.customType, content: entry.content, display: entry.display, timestamp: Date.parse(entry.timestamp) } : undefined;
+    if (!message) return [];
+    const input = run; if (message.role !== 'system') run = false;
+    return [asUser(message, input)];
+  });
   for (let i = branch.length - 1; i >= 0; i--) {
     const entry = branch[i];
     if (entry.type !== 'custom' || entry.customType !== RUN_BOUNDARY || !record(entry.data)) continue;
@@ -65,7 +72,7 @@ function latestExchange(branch: readonly SessionEntry[]) {
     if (entry.data.state === 'end') end = i;
     else if (entry.data.state === 'start') {
       if (end >= 0) {
-        const exchange = completedExchange(messages(branch.slice(i + 1, end)), imageRef);
+        const exchange = completedExchange(messages(branch.slice(i + 1, end), true), imageRef);
         if (exchange.length) return exchange;
       }
       end = -1;