Merge pull request #95 from levelcodeai/claude/beautiful-diffie-96e678

fix(cloud): inline edit and Agent Sketch say the session expired — not "No API key set"

Author: ndemianc

extensions/levelcode-ai/aiEdit.js

@@ -11,9 +11,11 @@
 
 const vscode = require('vscode');
 const path = require('path');
+const { SESSION_EXPIRED_MESSAGE } = require('./providers/session');
 
 const SCHEME = 'levelcode-ai';
 const CTX_DIFF_ACTIVE = 'levelcode.ai.diffActive';
+const SIGN_IN = 'Sign in';   // the button on an edit refused for an ended session, labelled as the chat card's is
 
 /** @type {Map<string,string>} virtual-doc uri -> content */
 const contents = new Map();
@@ -105,7 +107,7 @@ function fullLineRange(editor) {
 	return new vscode.Range(sel.start.line, 0, endLine, editor.document.lineAt(endLine).text.length);
 }
 
-/** @param {{aiConfig:()=>any, prepProviderRequest:(o?:any)=>Promise<any>, streamChat:Function}} deps */
+/** @param {{aiConfig:()=>any, prepProviderRequest:(o?:any)=>Promise<any>, streamChat:Function, accountSignIn:()=>Promise<any>}} deps */
 async function editSelection(deps) {
 	const ed = vscode.window.activeTextEditor;
 	if (!ed || ed.selection.isEmpty) {
@@ -136,6 +138,10 @@ async function editSelection(deps) {
 				const onDelta = (d) => { result += d; };
 				const req = await deps.prepProviderRequest({ prompt: true });
 				if (!req.ok) {
+					// An ended LevelCode Cloud session is not a missing key: "No API key set for LevelCode
+					// Cloud." sent the user looking for one they never needed. Say so, in the sentence chat
+					// and the agent send for it, and mark it so the catch below can offer the way back.
+					if (req.reason === 'signedOut') { throw Object.assign(new Error(SESSION_EXPIRED_MESSAGE), { code: 'session_expired' }); }
 					throw new Error(
 						req.reason === 'baseURL' ? 'Set a base URL for the custom OpenAI-compatible provider first (levelcode.ai.baseURL).'
 						: req.reason === 'insecureBaseURL' ? 'Refusing to send your API key over plain http to a non-local host. Use an https (or localhost) base URL.'
@@ -149,7 +155,14 @@ async function editSelection(deps) {
 			}
 		);
 	} catch (e) {
-		vscode.window.showErrorMessage('LevelCode AI edit failed: ' + String((e && e.message) || e));
+		const failed = 'LevelCode AI edit failed: ' + String((e && e.message) || e);
+		// The one failure with its fix a click away: the same browser sign-in the chat's card starts.
+		if (e && e.code === 'session_expired') {
+			const pick = await vscode.window.showErrorMessage(failed, SIGN_IN);
+			if (pick === SIGN_IN) { await deps.accountSignIn(); }
+			return;
+		}
+		vscode.window.showErrorMessage(failed);
 		return;
 	}
 

extensions/levelcode-ai/extension.js

@@ -3233,13 +3233,25 @@ async function webHandoffUrl() {
 		return (data && data.url) || null;
 	} catch (e) { dbg('account.handoff', { error: String((e && e.message) || e) }); return null; }
 }
-/** Persist an editor session: access token (required), optional refresh token, and display profile. */
+/**
+ * Persist an editor session: access token (required), the refresh token if the sign-in brought one,
+ * and the display profile.
+ *
+ * A sign-in REPLACES the session; it does not top one up. A refresh token left over from whatever
+ * was here before is what the new session's first renewal would be made with: refused, it ends the
+ * session that replaced it; still good, it hands this editor the previous account's access token
+ * under the new account's name. So the refresh token is settled first — stored, or forgotten when
+ * there is none — and only then the access token. A sign-in cut short between the two (the editor
+ * closing, a keychain that will not write) must not leave the new access token over the old
+ * refresh token either.
+ */
 async function storeSession(access, refresh, profile) {
 	if (!ctx || !access) { return; }
 	await withSessionLock(async () => {
 		sessionGeneration++;   // a refresh still out for the session this replaces must not touch the new one
-		await ctx.secrets.store(ACCOUNT_TOKEN_KEY, access);
 		if (refresh) { await ctx.secrets.store(ACCOUNT_REFRESH_KEY, refresh); }
+		else { await ctx.secrets.delete(ACCOUNT_REFRESH_KEY); }
+		await ctx.secrets.store(ACCOUNT_TOKEN_KEY, access);
 		cloudSignedIn = true;
 		await ctx.globalState.update(ACCOUNT_PROFILE_KEY, {
 			name: (profile && profile.name) || '', email: (profile && profile.email) || '', plan: (profile && profile.plan) || ''
@@ -3421,7 +3433,8 @@ function activate(context) {
 	registerAiEdit(context, {
 		aiConfig,
 		prepProviderRequest,
-		streamChat: providers.streamChat
+		streamChat: providers.streamChat,
+		accountSignIn   // the "Sign in" on an edit refused because the cloud session ended
 	});
 
 	// Claude as a native Language Model provider (powers VS Code's built-in chat/edit UI).

extensions/levelcode-ai/sketch.js

@@ -21,6 +21,7 @@ const path = require("path");
 const fs = require("fs");
 const providers = require("./providers/index");
 const catalog = require("./providers/catalog");
+const { SESSION_EXPIRED_MESSAGE } = require("./providers/session");
 const { AGENT_GROUPS, AGENTS, AGENT_BY_ID } = require("./sketch/agentCatalog");
 const graph = require("./sketch/graph");
 const pricing = require("./sketch/pricing");
@@ -458,6 +459,24 @@ async function loadWorkspacePatchContext() {
   );
 }
 
+/**
+ * Why prepProviderRequest refused, as this panel says it. An ended LevelCode Cloud session is not a
+ * missing key, and not a provider that is "not ready": it gets the sentence chat and the agent send
+ * for it, so the user goes to sign in instead of hunting for a key they never needed. Any other
+ * reason keeps the caller's wording (`otherwise`).
+ * @param {{reason?:string, label?:string}} req
+ * @param {string} otherwise
+ */
+function notReadyMessage(req, otherwise) {
+  if (req.reason === "signedOut") {
+    return SESSION_EXPIRED_MESSAGE;
+  }
+  if (req.reason === "key") {
+    return "No API key set for " + req.label + ".";
+  }
+  return otherwise;
+}
+
 // ---- the runner -------------------------------------------------------------------------------
 /** @param {{sketch:any, deps:any}} o  deps = { prepProviderRequest } from extension.js */
 async function runSketch(o) {
@@ -497,10 +516,10 @@ async function runSketch(o) {
       clearSlot();
       post({
         type: "runError",
-        message:
-          req.reason === "key"
-            ? "No API key set for " + req.label + "."
-            : "Provider not ready (" + (req.reason || "unknown") + ").",
+        message: notReadyMessage(
+          req,
+          "Provider not ready (" + (req.reason || "unknown") + ").",
+        ),
       });
       return;
     }
@@ -745,10 +764,7 @@ async function boardCommand(o) {
   if (!req.ok) {
     post({
       type: "uiError",
-      message:
-        req.reason === "key"
-          ? "No API key set for " + req.label + "."
-          : "Provider not ready.",
+      message: notReadyMessage(req, "Provider not ready."),
     });
     return;
   }
@@ -923,10 +939,7 @@ async function generateFlow(o) {
   if (!req.ok) {
     post({
       type: "uiError",
-      message:
-        req.reason === "key"
-          ? "No API key set for " + req.label + "."
-          : "Provider not ready.",
+      message: notReadyMessage(req, "Provider not ready."),
     });
     return;
   }