@volter/supercode-frontend-vscode 0.1.40 → 0.1.41

package/dist/extension.js

@@ -435,6 +435,16 @@ export async function activate(context) {
     // reports them, and never taken for the conversation the host manages.
     const attachedIds = new Set();
     const managed = () => frontends.all.find((connection) => !attachedIds.has(connection.id));
+    // The host runs one conversation at a time, so a running or waiting turn refuses a new or another chat. This is
+    // the sentence that refusal says to the person; each caller picks the one place it is shown (see its uses).
+    const busyRefusal = (active, action) => {
+        if (!active)
+            return;
+        if (active.session.pendingRequests.size)
+            return `The current chat is waiting for your answer. Answer it or cancel the turn before ${action}.`;
+        if (active.session.descriptor?.turn_state === 'busy')
+            return `A turn is still running in the current chat. Let it finish or cancel it before ${action}.`;
+    };
     // The attached runtime the person is looking at: the Chat names its harness, not the host's.
     let focusedAttached;
     let approvalAvailable = false;
@@ -676,9 +686,11 @@ export async function activate(context) {
             return existing.pending;
         const pending = applying.then(async () => {
             const active = managed();
-            if (active && active.id !== id && (active.session.descriptor?.turn_state === 'busy' || active.session.pendingRequests.size))
-                throw new Error('Finish or cancel the active turn before opening another conversation.');
             if (active && active.id !== id) {
+                // Thrown as is: the workbench shows a focus command's error, and a send writes it into the chat.
+                const refusal = busyRefusal(active, 'opening another conversation');
+                if (refusal)
+                    throw new Error(refusal);
                 // Capture the exact saved transcript while its runtime still belongs
                 // to the host. Subsequent background content reads need no activation.
                 await saveManagedHistory(active);
@@ -716,8 +728,12 @@ export async function activate(context) {
         if (!controls)
             throw new Error('This host does not expose harness or model configuration.');
         const active = managed();
-        if (active?.session.descriptor?.turn_state === 'busy' || active?.session.pendingRequests.size)
-            throw new Error('Finish or cancel the current turn before starting a new chat.');
+        // A send from a blank chat lands here, and the workbench does not show its error: say it, then refuse.
+        const refusal = busyRefusal(active, 'starting a new chat');
+        if (refusal) {
+            void vscode.window.showWarningMessage(refusal);
+            throw new Error(refusal);
+        }
         if (active)
             await saveManagedHistory(active);
         const state = await controls.select(selection);
@@ -728,9 +744,13 @@ export async function activate(context) {
     const openNewChat = async () => {
         if (!controls || !granted.has('chatSessionsProvider'))
             throw new Error('This host does not expose native conversation creation.');
-        const active = managed();
-        if (active?.session.descriptor?.turn_state === 'busy' || active?.session.pendingRequests.size)
-            throw new Error('Finish or cancel the current turn before starting a new chat.');
+        // Its callers (the new-chat pickers) swallow the cancellation, so the warning is the one message shown. An error
+        // would reach the person as a bare "Canceled" or not at all through the contributed-command boundary.
+        const refusal = busyRefusal(managed(), 'starting a new chat');
+        if (refusal) {
+            void vscode.window.showWarningMessage(refusal);
+            throw new vscode.CancellationError();
+        }
         // Code-OSS materializes this untitled session on first send, awaiting our
         // newChatSessionItemHandler before accepting/clearing the draft. Never boot
         // beside the old widget and reveal another resource after it accepts input.
@@ -791,20 +811,23 @@ export async function activate(context) {
     const chooseNewChat = async (pick) => {
         if (pendingDraft?.choosing)
             throw new Error('Finish choosing an agent before starting another chat.');
-        // Open before the picker: a send can beat its result across the extension-
-        // host boundary. Materialization awaits this exact draft's choice too.
-        const draft = await openNewChat();
-        const picking = (async () => {
-            const choice = await pick();
-            if (activeDraft() !== draft)
-                throw new vscode.CancellationError();
-            draft.choice = choice;
-            controlsChanged.fire();
-            if (choice.kind !== 'agent')
-                throw new vscode.CancellationError();
-        })();
-        draft.choosing = picking;
+        let draft;
+        let picking;
         try {
+            // Open before the picker: a send can beat its result across the extension-
+            // host boundary. Materialization awaits this exact draft's choice too.
+            // Inside the try: a busy refusal is a cancellation already explained.
+            const opened = draft = await openNewChat();
+            picking = (async () => {
+                const choice = await pick();
+                if (activeDraft() !== opened)
+                    throw new vscode.CancellationError();
+                opened.choice = choice;
+                controlsChanged.fire();
+                if (choice.kind !== 'agent')
+                    throw new vscode.CancellationError();
+            })();
+            opened.choosing = picking;
             await picking;
         }
         catch (error) {
@@ -812,9 +835,9 @@ export async function activate(context) {
                 throw error;
         }
         finally {
-            if (draft.choosing === picking)
+            if (draft && draft.choosing === picking)
                 draft.choosing = undefined;
-            if (draft.choice?.kind === 'signIn') {
+            if (draft?.choice?.kind === 'signIn') {
                 void refreshSetup().catch(error => log.warn(`Could not refresh sign-in: ${String(error)}`)).finally(pollSetup);
             }
         }
@@ -967,17 +990,20 @@ export async function activate(context) {
             return { kind: 'agent', selection: { harness: harness.id, model: '', effort: '' } };
         });
     }));
-    context.subscriptions.push(vscode.commands.registerCommand('supercode.frontend.configureModel', async (resource, sessionId) => {
+    context.subscriptions.push(vscode.commands.registerCommand('supercode.frontend.configureModel', async (resource, _sessionId) => {
         if (!controls || focusedAttached)
             throw new Error('Model settings require a host-managed conversation.');
         await controls.refresh();
-        // The native session-options picker prepends its exact resource to command arguments.
-        const bound = resource ? boundId(resource) : undefined;
-        if (resource && (!bound || (sessionId && bound !== sessionId)))
-            throw new Error('Model settings have no matching conversation binding.');
+        // The native session-options picker prepends its widget's resource to command arguments, so the resource is the
+        // conversation the person clicked from. `sessionId` is not used: the workbench keeps one option-group list per
+        // session type, last written by whichever input state updated, so any chat's dropdown can carry another
+        // conversation's id. A resource with no binding (a blank draft) is no conversation; only the command palette,
+        // which passes no resource, falls back to the active one. Either way the choice opens a new chat.
+        const bound = resource ? boundId(resource) : controls.state.activeSession ?? undefined;
         // The conversation it was opened from sets the agent and the current values; with none open (a fresh project,
-        // the command palette) the person picks the agent first. Either way the choice opens a new chat.
-        const selected = controls.state.sessions.find(session => session.id === (bound ?? controls.state.activeSession));
+        // the command palette) the person picks the agent first. A running turn refuses the new chat before any picker
+        // opens, and says so (`openNewChat`).
+        const selected = controls.state.sessions.find(session => session.id === bound);
         // An agent that still needs sign-in is set up from the agent picker first, as there.
         const needsSignIn = new Set((controls.state.setup?.actions ?? []).filter(action => action.kind === 'login').map(action => action.harness));
         const configurable = controls.state.harnesses.filter(harness => CONFIGURABLE_HARNESSES.includes(harness.id) && !needsSignIn.has(harness.id));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@volter/supercode-frontend-vscode",
   "displayName": "Volter Harness",
-  "version": "0.1.40",
+  "version": "0.1.41",
   "type": "module",
   "description": "VS Code chat-view frontend for an existing Volter Harness SDK runtime",
   "publisher": "volter-ai-dev",