@modelprofile.com/authswitch 4.0.0 → 5.1.0

package/ts/classes.opencodeharness.ts

@@ -53,7 +53,7 @@ export class OpenCodeHarness extends FileHarness {
   public beginLogin(options: IHarnessLoginOptions = { providerId: 'openai', flow: 'device' }) {
     return beginSavedOpenAiLogin(async result => {
       const saved = await this.importCredential('openai', openCodeCredentialFromLogin(result.credential));
-      const account = this.readState().accounts.find(account => account.id === saved.accountId)!;
+      const account = (await this.readState()).accounts.find(account => account.id === saved.accountId)!;
       return { outcome: { lines: [`Saved OpenAI login for ${plainText(account.label)}. Select it to switch OpenCode.`], problems: [] }, account: { id: account.id, label: account.label, slotId: account.slotId } };
     }, options, this.fetcher);
   }

package/ts/classes.operations.ts

@@ -52,6 +52,10 @@ export const assertAuthSwitchMutation: (value: unknown) => asserts value is TAut
   }
 };
 
+/** Whether a mutation replaces the harness's active login, and therefore concerns running instances. */
+export const authSwitchMutationReplacesLogin = (mutationArg: TAuthSwitchMutation): boolean =>
+  mutationArg.action === 'switch' || (mutationArg.action === 'save' && !mutationArg.keepActive);
+
 export const runAuthSwitchMutation = async (harness: IAuthHarness, mutation: TAuthSwitchMutation): Promise<IHarnessOutcome> => {
   assertAuthSwitchMutation(mutation);
   if (harness.id !== mutation.harnessId) throw new Error('Account operation targets a different harness.');

package/ts/classes.tui.ts

@@ -2,7 +2,7 @@ import * as plugins from './plugins.js';
 import type { IAuthHarness, IHarnessOutcome, IHarnessProcess, IHarnessState, IHarnessStopOutcome } from './interfaces.harness.js';
 import { accountBadge, accountDetails, accountPlan, accountQuotaSummary, accountResets, accountState, accountUsageWindows, usageWindowName, until, readAccountRows, type IAccountRow } from './accounts.js';
 import { plainText } from './formatting.js';
-import { AuthSwitchOperations } from './classes.operations.js';
+import { AuthSwitchOperations, authSwitchMutationReplacesLogin, type TAuthSwitchMutation } from './classes.operations.js';
 import { describeHarnessProcesses, describeStopOutcome } from './classes.harnessprocesses.js';
 
 /** Owns account-management actions; terminal rendering and interaction belong to smartconsole. */
@@ -89,6 +89,9 @@ export class AuthSwitchTui {
       }
       for (const line of describeStopOutcome(harness.label, outcome)) ui.logs.append(line);
     };
+    const mutate = (screen: plugins.smartconsole.ITuiContext, mutation: TAuthSwitchMutation): Promise<IHarnessOutcome> =>
+      this.operations.run(harness, mutation, message => screen.confirm(message),
+        authSwitchMutationReplacesLogin(mutation) ? settleInstances(screen) : undefined);
     const save = async (screen: plugins.smartconsole.ITuiContext, keepActiveArg: boolean): Promise<void> => {
       const latest = await harness.readState();
       const activeAccounts = latest.accounts.filter(account => account.isActive);
@@ -97,8 +100,7 @@ export class AuthSwitchTui {
       if (!active || latest.saveUnavailableReason) { footer.setText(latest.saveUnavailableReason ?? 'No active login to save.'); return; }
       if (!await screen.confirm(`Save ${plainText(active.label)}${keepActiveArg ? ' and keep it active' : ' and clear the active login'}?`)) return;
       if (screen.signal.aborted) return;
-      const outcome = await this.operations.run(harness, { harnessId: harness.id, action: 'save', keepActive: keepActiveArg, accountId: active.id },
-        message => screen.confirm(message), keepActiveArg ? undefined : settleInstances(screen));
+      const outcome = await mutate(screen, { harnessId: harness.id, action: 'save', keepActive: keepActiveArg, accountId: active.id });
       await refresh(screen); showOutcome(outcome);
     };
     const switchSelected = async (screen: plugins.smartconsole.ITuiContext): Promise<void> => {
@@ -112,7 +114,7 @@ export class AuthSwitchTui {
         if (latest.saveUnavailableReason) { footer.setText(latest.saveUnavailableReason); return; }
         if (!await screen.confirm(`${plainText(active.label)} is not saved. Save this login before switching?`, { confirmLabel: 'Save first' })) return;
         if (screen.signal.aborted) return;
-        if (!showOutcome(await this.operations.run(harness, { harnessId: harness.id, action: 'save', keepActive: true, accountId: active.id }, message => screen.confirm(message)))) return;
+        if (!showOutcome(await mutate(screen, { harnessId: harness.id, action: 'save', keepActive: true, accountId: active.id }))) return;
         const verified = await harness.readState();
         if (!verified.accounts.some(account => account.isActive && account.isStashed && account.id === active.id)) { footer.setText('The current login could not be verified as saved. Switching was cancelled.'); return; }
       }
@@ -120,8 +122,7 @@ export class AuthSwitchTui {
       const badge = accountBadge(rows.find(row => row.account.id === target.id)?.status);
       if (!await screen.confirm(`Switch ${plainText(harness.label)} to ${plainText(target.label)}${badge}?`, { confirmLabel: 'Switch' })) return;
       if (screen.signal.aborted) return;
-      const outcome = await this.operations.run(harness, { harnessId: harness.id, action: 'switch', accountId: target.id },
-        message => screen.confirm(message), settleInstances(screen));
+      const outcome = await mutate(screen, { harnessId: harness.id, action: 'switch', accountId: target.id });
       await refresh(screen);
       if (showOutcome(outcome)) ui.logs.append(`Now active: ${plainText(target.label)}${badge}`);
     };