copilot-operator 0.1.25 → 0.1.27

package/dist/src/api/operator.service.js

@@ -12,6 +12,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
  * the UI resolves), where events go (the bus, streamed as SSE), and how a run is stopped
  * (an AbortController per session).
  */
+import { pageModelFor, sameModel } from '../transport/modelMatch.js';
 import { Injectable } from '@nestjs/common';
 import { readFile, readdir } from 'node:fs/promises';
 import { existsSync } from 'node:fs';
@@ -1095,6 +1096,7 @@ let OperatorService = class OperatorService {
             ...(transport || !runGroup ? {} : { beforeBrowser: () => this.browserRequested(runGroup.id, [sessionId]) }),
             // The page is the source of the model names: Settings and the saved list follow it (see `ModelHooks`).
             models: {
+                locate: async (name) => (await this.store.getModels())?.options.find((o) => sameModel(o.name, name))?.locator,
                 renamedDefault: async (which, from, to) => {
                     const now = (await this.settings.load()).copilot;
                     if (which === 'model' && (now.defaultModel ?? '').trim() === from)
@@ -3027,6 +3029,16 @@ let OperatorService = class OperatorService {
             const { options, current, note } = await transport.listModels();
             const catalogue = { options, current: current ?? undefined, readAt: new Date().toISOString(), note };
             await this.store.saveModels(catalogue);
+            // A saved choice the page now offers under another name follows it here, as a run does (see `modelMatch.ts`).
+            const saved = cfg.copilot;
+            const work = (saved.defaultModel ?? '').trim();
+            const review = (saved.defaultReviewModel ?? '').trim();
+            const workNow = work ? pageModelFor(work, options) : null;
+            const reviewNow = review ? pageModelFor(review, options) : null;
+            if (workNow && !sameModel(workNow.name, work))
+                await this.setDefaultModel(workNow.name);
+            if (reviewNow && !sameModel(reviewNow.name, review))
+                await this.setDefaultReviewModel(reviewNow.name);
             return catalogue;
         }
         finally {

package/dist/src/orchestrator/taskRunner.js

@@ -523,8 +523,9 @@ export function effectiveModels(session, cfg) {
 async function applySessionModel(transport, session, bus, cfg, store, hooks) {
     const wanted = effectiveModels(session, cfg).model;
     if (!wanted)
-        return undefined;
-    const result = await transport.selectModel(wanted).catch((e) => ({
+        return {};
+    const locator = await hooks?.locate?.(wanted).catch(() => undefined);
+    const result = await transport.selectModel(wanted, { locator }).catch((e) => ({
         ok: false,
         current: null,
         reason: e.message,
@@ -538,8 +539,8 @@ async function applySessionModel(transport, session, bus, cfg, store, hooks) {
         level: result.ok ? 'info' : 'warn',
         message: result.ok
             ? `model: ${result.current ?? wanted}${session.model?.trim() ? '' : ' (from Settings)'}`
-            : `could not switch to "${wanted}"${session.model?.trim() ? '' : ' (the default model in Settings — change it there)'}: ${(result.reason ?? 'unknown reason').replace(/[.\s]+$/, '')}. Continuing on ${result.current ?? 'the chat default'}.`,
-        data: { asked: wanted, fromSettings: !session.model?.trim(), current: result.current, ok: result.ok },
+            : `could not switch to "${wanted}"${session.model?.trim() ? '' : ' (the default model in Settings)'}: ${(result.reason ?? 'unknown reason').replace(/[.\s]+$/, '')}. Nothing is sent on ${result.current ?? 'the chat default'} instead.`,
+        data: { asked: wanted, fromSettings: !session.model?.trim(), current: result.current, ok: result.ok, by: result.by ?? null, savedLocator: !!locator },
     });
     // Kept on the session, so each task's record says which model it ran on and why (see `runTask`).
     await store
@@ -555,7 +556,18 @@ async function applySessionModel(transport, session, bus, cfg, store, hooks) {
         };
     })
         .catch(() => undefined);
-    return result.current ?? undefined;
+    /*
+     * A model the operator chose and the chat is not on is not worked around: the run went on Auto with a
+     * warning nobody saw, and its work was then taken for the chosen model's (2026-10-05). Nothing goes out.
+     */
+    if (!result.ok) {
+        return {
+            current: result.current ?? undefined,
+            refused: `The chat could not be put on the chosen model "${wanted}"${session.model?.trim() ? '' : ' (Settings)'}: ${(result.reason ?? 'unknown reason').replace(/[.\s]+$/, '')}. ` +
+                'Nothing was sent. Read the list again under Settings → Model, choose the model there, and start again.',
+        };
+    }
+    return { current: result.current ?? undefined };
 }
 /** Runs one task to completion inside an already-open transport. */
 export async function runTask(transport, session, task, deps) {
@@ -580,12 +592,39 @@ export async function runTask(transport, session, task, deps) {
      */
     let sentCount = 0;
     let inOpening = false;
+    /*
+     * A conversation Copilot had not yet put in its sidebar when it was registered is named before a later
+     * message goes out in it: the row comes some seconds after the first reply, and fifteen were not always
+     * enough (live run 2026-10-05), which left the chat under Copilot's own title, where a later run looking
+     * for it by name could not find it. A few tries, only while the page is on that conversation.
+     */
+    let nameTries = 0;
+    const nameIfStillUnnamed = async (target) => {
+        const chat = session.chat;
+        if (!chat || chat.named !== false || nameTries >= 3)
+            return;
+        if ((await target.currentChatId().catch(() => null)) !== chat.chatId)
+            return;
+        nameTries += 1;
+        const named = await target.nameChat(chat.chatId, chat.name, { waitMs: 5_000 }).catch(() => false);
+        if (!named)
+            return;
+        const { named: _was, ...done } = chat;
+        session.chat = done;
+        await store.updateSession(session.id, (s) => {
+            if (s.chat?.chatId === chat.chatId)
+                s.chat = { ...s.chat, named: undefined };
+        }).catch(() => undefined);
+        await savePointer(log.path('chat.json'), done).catch(() => undefined);
+        sink.event('chat-named-later', { chatId: chat.chatId, name: chat.name, tries: nameTries }, `chat named "${chat.name}" in Copilot's sidebar, now that it is there`);
+    };
     const chatOf = transport;
     transport = new Proxy(chatOf, {
         get(target, key) {
             if (key !== 'sendAndConfirm')
                 return Reflect.get(target, key);
             return async (...args) => {
+                await nameIfStillUnnamed(target);
                 const before = await target.sendAndConfirm(...args);
                 sentCount += 1;
                 const [text, attachments] = args;
@@ -1240,9 +1279,13 @@ export async function runTask(transport, session, task, deps) {
                 const modelNow = await applySessionModel(transport, session, bus, cfg, store, deps.models);
                 if (effectiveModels(session, cfg).model) {
                     await store.updateSession(session.id, (s) => {
-                        s.modelInUse = modelNow;
+                        s.modelInUse = modelNow.current;
                     });
                 }
+                if (modelNow.refused) {
+                    stopCode = 'environment';
+                    return await finish('blocked', modelNow.refused);
+                }
             }
         }
         // --- opening messages -------------------------------------------------------------
@@ -1699,7 +1742,8 @@ export async function runTask(transport, session, task, deps) {
             try {
                 await transport.newChat();
                 if (model) {
-                    const picked = await transport.selectModel(model).catch((e) => ({ ok: false, current: null, reason: e.message }));
+                    const reviewLocator = await deps.models?.locate?.(model).catch(() => undefined);
+                    const picked = await transport.selectModel(model, { locator: reviewLocator }).catch((e) => ({ ok: false, current: null, reason: e.message }));
                     const renamed = await followPageModels('review', model, picked, session, store, deps.models);
                     if (renamed)
                         sink.event('model-renamed', { asked: model, chosen: picked.matched, review: true }, renamed, 'warn');
@@ -2590,9 +2634,12 @@ export async function runSession(sessionId, deps) {
         const modelInUse = await applySessionModel(chat, session, bus, cfg, store, deps.models);
         if (effectiveModels(session, cfg).model) {
             await store.updateSession(sessionId, (s) => {
-                s.modelInUse = modelInUse;
+                s.modelInUse = modelInUse.current;
             });
         }
+        // Refused before a task is marked started: its tasks stay queued, and the run says why.
+        if (modelInUse.refused)
+            throw new Error(modelInUse.refused);
         for (const queuedTask of queued) {
             if (deps.signal?.aborted)
                 break;
@@ -2671,9 +2718,11 @@ export async function runSession(sessionId, deps) {
                 const freshModel = await applySessionModel(chat, session, bus, cfg, store, deps.models);
                 if (effectiveModels(session, cfg).model) {
                     session = await store.updateSession(sessionId, (s) => {
-                        s.modelInUse = freshModel;
+                        s.modelInUse = freshModel.current;
                     });
                 }
+                if (freshModel.refused)
+                    throw new Error(freshModel.refused);
                 const fresh = session.tasks.find((x) => x.id === task.id);
                 if (!fresh)
                     break;