@awak-app/simy-cli 0.5.62 → 0.5.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awak-app/simy-cli",
-  "version": "0.5.62",
+  "version": "0.5.63",
   "description": "Local SIMY executor for non-coding Local Tasks and Agentic Loop runs.",
   "type": "module",
   "bin": {

package/src/agent.js

@@ -199,6 +199,7 @@ export async function startAgent({
   let organizationState = "unknown";
   let organizationRefresh = null;
   let pendingOrganization = null;
+  let desktopLoginPending = false;
   await cleanupExpiredRuns();
   for (const task of await restoreLocalTasks({ root: taskStorageRoot })) {
     localTaskRegistry.create(task);
@@ -469,7 +470,9 @@ export async function startAgent({
     })();
     return organizationRefresh;
   };
-  const requestDesktopLogin = (organizationId = null) => {
+  const requestDesktopLogin = (organizationId = null, { passive = false } = {}) => {
+    // Reopening the verification page must keep the original nonce and scope.
+    if (!organizationId && pendingOrganization) return loginUrl?.toString() ?? null;
     let organizationSlug = null;
     if (organizationId) {
       if (!isSessionValid(session, Date.now(), apiOrigin)) throw new Error("Sign in before switching organizations.");
@@ -486,8 +489,10 @@ export async function startAgent({
       notifyDesktopStatusChange();
     } else if (isSessionValid(session, Date.now(), apiOrigin)) {
       if (!enforceDesktopAccess || desktopAccess.snapshot().state !== 'signed_out') return null;
-      authNonce = randomBytes(16).toString("base64url");
-      loginUrl = null;
+      if (!passive || !loginUrl) {
+        authNonce = randomBytes(16).toString("base64url");
+        loginUrl = null;
+      }
     }
     if (!loginUrl) {
       loginUrl = new URL("/local-cli/connect", apiOrigin);
@@ -501,6 +506,7 @@ export async function startAgent({
         loginUrl.searchParams.set('org_slug', organizationSlug);
       }
     }
+    if (!passive) { desktopLoginPending = true; notifyDesktopStatusChange(); }
     return loginUrl.toString();
   };
 
@@ -691,6 +697,8 @@ export async function startAgent({
             if (session?.device_id && session.token) reclaimableSession = session;
             session = null;
             loginUrl = null;
+            pendingOrganization = null;
+            desktopLoginPending = false;
             refreshAvailableCapabilities();
             requestDesktopLogin();
           }
@@ -1194,6 +1202,7 @@ export async function startAgent({
         await writeSession(apiOrigin, session, sessionRoot);
         authNonce = randomBytes(16).toString("base64url");
         pendingOrganization = null;
+        desktopLoginPending = false;
         sqmEnabled = await readSqmEnabled(sessionRoot, apiOrigin, session);
         if (changingScope) sqmLocalReviewWorker?.resetHistory?.();
         organizationState = "unknown";
@@ -2156,7 +2165,7 @@ export async function startAgent({
   }
 
   if (!isSessionValid(session, Date.now(), apiOrigin)) {
-    requestDesktopLogin();
+    requestDesktopLogin(null, { passive: true });
     if (!quiet) {
       console.log(`Sign in to SIMY: ${loginUrl.toString()}`);
       console.log(`Session file: ${sessionPath(apiOrigin, sessionRoot)}`);
@@ -2242,6 +2251,7 @@ export async function startAgent({
       version: CLI_VERSION,
       webOrigin: apiOrigin,
       auth,
+      authorization: { pending: Boolean(pendingOrganization || desktopLoginPending) },
       ...(enforceDesktopAccess ? { access: { ...desktopAccess.snapshot(), revision: desktopScopeRevision() } } : {}),
       connection: connectionStatus.snapshot({ authenticated: auth.state === "signed_in" }),
       tasks: desktopTaskStatus([registry, directRegistry, localTaskRegistry]),
@@ -2256,7 +2266,8 @@ export async function startAgent({
       codex,
       claude,
       providers: { codex, claude },
-      loginUrl: auth.state === "signed_in" ? null : requestDesktopLogin(),
+      // URLs stay inside the host; native UI reopens the current request by action.
+      loginUrl: auth.state === "signed_in" ? null : requestDesktopLogin(null, { passive: true }),
     };
   };
   return {
@@ -2270,9 +2281,10 @@ export async function startAgent({
     shutdown,
     webOrigin: apiOrigin,
     get loginUrl() {
-      return requestDesktopLogin();
+      return requestDesktopLogin(null, { passive: true });
     },
     requestDesktopLogin,
+    getPendingAuthorizationUrl: () => pendingOrganization || desktopLoginPending ? loginUrl?.toString() ?? null : null,
     async refreshDesktopAccess() {
       const previous = desktopAccess.snapshot().state;
       const result = await desktopAccess.refresh(true);
@@ -2284,7 +2296,7 @@ export async function startAgent({
     getDesktopAccess: () => ({ ...desktopAccess.snapshot(), revision: desktopScopeRevision() }),
     requireDesktopAccess: authorizeDesktopWork,
     refreshOrganizations,
-    cancelOrganizationSelection() { authNonce = randomBytes(16).toString("base64url"); pendingOrganization = null; loginUrl = null; refreshAvailableCapabilities(); notifyDesktopStatusChange(); },
+    cancelOrganizationSelection() { authNonce = randomBytes(16).toString("base64url"); pendingOrganization = null; desktopLoginPending = false; loginUrl = null; refreshAvailableCapabilities(); notifyDesktopStatusChange(); },
     async setSqmEnabled(enabled) {
       if (enabled) await authorizeDesktopWork();
       if (!isSessionValid(session, Date.now(), apiOrigin) || pendingOrganization) throw new Error("Sign in to an organization first.");

package/src/cli-contract.js

@@ -13,7 +13,7 @@ import {
 } from "./durable-local-task-steps-contract.js";
 import { buildExecutionCapabilityContract } from "./execution-capability-contract.js";
 
-export const CLI_VERSION = "0.5.62";
+export const CLI_VERSION = "0.5.63";
 export const CLI_API_CONTRACT_VERSION = 10;
 
 export function withCliContract(

package/src/desktop-access.js

@@ -7,7 +7,7 @@ export function validDesktopAccessPath(path, slug) {
   return path === expected || path === `${expected}/`;
 }
 export const desktopAccessReady = value => value?.state === 'ready';
-const recoveryActions = new Set(['refresh', 'reconnect', 'login', 'organization_select', 'organization_cancel', 'organizations_refresh',
+const recoveryActions = new Set(['refresh', 'reconnect', 'login', 'authorization_open', 'organization_select', 'organization_cancel', 'organizations_refresh',
   'check_update', 'update', 'quit', 'delivery_stop', 'delivery_pause', 'delivery_reject',
   'desktop_access_refresh', 'desktop_access_settings', 'desktop_access_members']);
 export function desktopActionAllowed(access, command) {

package/src/desktop-host.js

@@ -39,6 +39,7 @@ const silentLogger = { log() {}, error() {} };
 const MAX_DESKTOP_FRAME_BYTES = 8 * 1024 * 1024;
 
 function desktopActionError(action, error) {
+  if (action === 'authorization_open' || error?.code === 'desktop_browser_unavailable') return "Could not open your browser. Open the verification link again, or check your default browser.";
   if (error?.code === "desktop_access_required") return "Sign in to an organization with SQM and Developer access before using SIMY.";
   if (action === "session_deadline_decide") return error?.code === "conflict"
     ? "Deadline changed; refresh before deciding." : "The deadline is unavailable. Refresh this conversation before deciding.";
@@ -436,16 +437,22 @@ export async function startDesktopHost({ input = process.stdin, output = process
         else if (action === "organizations_refresh") await agent.refreshOrganizations();
         else if (action === "sqm_set_enabled") await agent.setSqmEnabled(command.enabled);
         else if (action === "organization_cancel") agent.cancelOrganizationSelection();
-        else if (action === "login" || action === "organization_select") {
+        else if (action === "login" || action === "organization_select" || action === "authorization_open") {
           if (action === "organization_select" && (typeof command.organizationId !== "string" || !command.organizationId)) throw new Error("Select an organization first.");
           if (action === "organization_select" && activeQueuedAction && !["refresh", "reconnect", "task_detail", "organizations_refresh", "check_update"].includes(activeQueuedAction)) {
             throw Object.assign(new Error("Wait for the current action to finish before switching organizations."), { code: "desktop_organization_busy" });
           }
-          const url = await agent.requestDesktopLogin(action === "organization_select" ? command.organizationId : null);
+          const url = action === "authorization_open" ? agent.getPendingAuthorizationUrl?.()
+            : await agent.requestDesktopLogin(action === "organization_select" ? command.organizationId : null);
+          if (action === 'authorization_open' && !url) throw new Error('No pending authorization.');
           if (url) {
             if (new URL(url).origin !== webOrigin) throw new Error("Invalid login origin.");
-            const result = await (dependencies.openLogin || openAuthorizationUrl)(url, { logger: silentLogger });
-            if (!result.opened) { agent.cancelOrganizationSelection?.(); throw new Error("Could not open the login page."); }
+            // Keep the pending request after an OS/browser failure so the user can
+            // use the visible fallback without silently canceling authorization.
+            try {
+              const result = await (dependencies.openLogin || openAuthorizationUrl)(url, { logger: silentLogger });
+              if (!result.opened) throw new Error('Browser unavailable.');
+            } catch { throw Object.assign(new Error('Browser unavailable.'), { code: 'desktop_browser_unavailable' }); }
           }
         } else if (action === "check_update") await updater.checkNow();
         else if (action === "update") {
@@ -560,7 +567,7 @@ export async function startDesktopHost({ input = process.stdin, output = process
         emit({ type: "result", id: command.id, ok: false, message: desktopActionError(command.action, error) });
       }
     };
-    if (["login", "organization_select", "organization_cancel"].includes(command.action)) {
+    if (["login", "organization_select", "organization_cancel", "authorization_open"].includes(command.action)) {
       authorizationQueue = authorizationQueue.then(execute).catch(() => {});
     } else {
       queue = queue.then(async () => {