@awak-app/simy-cli 0.5.45 → 0.5.46

package/README.md

@@ -11,6 +11,22 @@ login status, tasks, and updates separately. A Codex login check does not prove
 that a task can execute successfully; permissions and service availability are
 checked when work starts.
 
+The sidebar's **Organization** selector is global across Sessions, Tasks and SQM
+and shows active memberships of the connected SIMY account. Switching opens browser authorization for the selected organization
+and waits for active tasks to finish. Use the same account in the browser; cancel
+an unfinished switch from the sidebar.
+
+**Local SQM**, above the connection status, allows this Mac's Codex / Claude Code
+to claim local SQM reviews. It defaults to off and is saved separately for each
+Web environment, account, and organization. Turning it off stops new claims;
+current analysis finishes and submits its result. The toggle does not grant SQM
+subscription or organization permissions. First-time repository history discovery
+still starts from the web workspace.
+
+**SQM Tasks** shows local SQM reviews from the current agent session, separately
+from ordinary **Tasks**. Up to 50 recent reviews are shown; changing organization
+clears the local view. The web SQM workspace retains the authoritative history.
+
 Closing the window keeps the agent running. Open the app again or choose
 **Show SIMY** from its menu bar icon to return. **Quit SIMY** asks before
 interrupting active tasks. The normal `simy` command remains available.

package/package.json

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

package/src/agent.js

@@ -1,3 +1,4 @@
+import { readSqmEnabled, writeSqmEnabled } from "./desktop-sqm-settings.js";
 import { createServer } from "node:http";
 import { randomBytes } from "node:crypto";
 import { createReadStream } from "node:fs";
@@ -162,6 +163,7 @@ export async function startAgent({
   dependencies = {},
   quiet = false,
 } = {}) {
+  sessionRoot ??= defaultSessionRoot();
   const apiOrigin = resolveWebOrigin(webOrigin);
   const registry = new LocalRunRegistry();
   const codingRunStateRoot = codingRunsRoot(sessionRoot);
@@ -178,7 +180,7 @@ export async function startAgent({
         join(dirname(taskStorageRoot), "attachment-staging"),
     });
   await localTaskAttachmentStore.cleanupExpired?.();
-  const authNonce = randomBytes(16).toString("base64url");
+  let authNonce = randomBytes(16).toString("base64url");
   const sqmAgentIntegration = dependencies.sqmAgentIntegration || {
     inspect: () => inspectSqmAgentSkill({ home: dependencies.home }),
     install: (options) => installSqmAgentSkill({ home: dependencies.home, ...options }),
@@ -188,6 +190,11 @@ export async function startAgent({
   // as its device (see /v1/auth/complete), so keep it after it is cleared.
   let reclaimableSession = null;
   if (session && sessionRequiresWebAuthorization(session, apiOrigin)) session = null;
+  let sqmEnabled = await readSqmEnabled(sessionRoot, apiOrigin, session);
+  let organizationItems = [];
+  let organizationState = "unknown";
+  let organizationRefresh = null;
+  let pendingOrganization = null;
   await cleanupExpiredRuns();
   for (const task of await restoreLocalTasks({ root: taskStorageRoot })) {
     localTaskRegistry.create(task);
@@ -217,9 +224,14 @@ export async function startAgent({
   let availableCapabilities;
   let providerStatuses = { codex: { state: "unknown" }, claude: { state: "unknown" } };
   const refreshAvailableCapabilities = () => {
-    availableCapabilities = withCliContract({ ...contractSourceCapabilities, ...(providerStatuses ? { provider_statuses: providerStatuses } : {}) }, installMode, {
-      authenticated:
-        isSessionValid(session, Date.now(), apiOrigin) && Boolean(session?.device_id),
+    const features = contractSourceCapabilities.features;
+    availableCapabilities = withCliContract({
+      ...contractSourceCapabilities,
+      ...(features ? { features: { ...features, ...(Object.hasOwn(features, "sqm_local_review")
+        ? { sqm_local_review: features.sqm_local_review === true && sqmEnabled && !pendingOrganization } : {}) } } : {}),
+      ...(providerStatuses ? { provider_statuses: providerStatuses } : {}),
+    }, installMode, {
+      authenticated: isSessionValid(session, Date.now(), apiOrigin) && Boolean(session?.device_id),
     });
     return availableCapabilities;
   };
@@ -382,8 +394,43 @@ export async function startAgent({
     }
   };
 
-  const requestDesktopLogin = () => {
-    if (isSessionValid(session, Date.now(), apiOrigin)) return null;
+  const organizationBusy = () => Boolean(sqmLocalReviewWorker?.snapshot?.().polling ||
+    durableLocalTaskWorker?.snapshot?.().polling || durableLocalTaskWorker?.snapshot?.().active_turn_id ||
+    desktopTaskStatus([registry, directRegistry, localTaskRegistry]).activeCount);
+  const refreshOrganizations = async () => {
+    if (!isSessionValid(session, Date.now(), apiOrigin)) return;
+    if (organizationRefresh) return organizationRefresh;
+    const requestedSession = session;
+    organizationState = "loading";
+    organizationRefresh = (async () => {
+      try {
+        const response = await (dependencies.fetch || globalThis.fetch)(webApiUrl("organizations", {
+          webOrigin: apiOrigin, apiBaseUrl: requestedSession.api_base_url,
+        }), { headers: webApiHeaders({ token: requestedSession.token }), signal: AbortSignal.timeout(10_000) });
+        if (!response.ok) throw new Error("Organization lookup unavailable.");
+        const payload = await response.json();
+        if (!Array.isArray(payload.organizations)) throw new Error("Invalid organization list.");
+        if (session !== requestedSession) return;
+        organizationItems = payload.organizations.filter(org => typeof org.id === "string" && typeof org.name === "string")
+          .slice(0, 100).map(org => ({ id: org.id, name: org.name.slice(0, 120) }));
+        organizationState = "ready";
+      } catch {
+        if (session === requestedSession) organizationState = "unavailable";
+      } finally { organizationRefresh = null; notifyDesktopStatusChange(); }
+    })();
+    return organizationRefresh;
+  };
+  const requestDesktopLogin = (organizationId = null) => {
+    if (organizationId) {
+      if (!isSessionValid(session, Date.now(), apiOrigin)) throw new Error("Sign in before switching organizations.");
+      if (organizationState !== "ready" || !organizationItems.some(org => org.id === organizationId)) throw new Error("Refresh the organization list before selecting an organization.");
+      if (organizationBusy()) throw Object.assign(new Error("Wait for running tasks to finish before switching organizations."), { code: "desktop_organization_busy" });
+      authNonce = randomBytes(16).toString("base64url");
+      pendingOrganization = { id: organizationId, accountId: session.account_id };
+      loginUrl = null;
+      refreshAvailableCapabilities();
+      notifyDesktopStatusChange();
+    } else if (isSessionValid(session, Date.now(), apiOrigin)) return null;
     if (!loginUrl) {
       loginUrl = new URL("/local-cli/connect", apiOrigin);
       loginUrl.searchParams.set("port", String(port));
@@ -391,6 +438,7 @@ export async function startAgent({
       loginUrl.searchParams.set("cli_version", CLI_VERSION);
       loginUrl.searchParams.set("api_contract_version", String(CLI_API_CONTRACT_VERSION));
       if (installMode) loginUrl.searchParams.set("install_mode", installMode);
+      if (organizationId) loginUrl.searchParams.set("org_id", organizationId);
     }
     return loginUrl.toString();
   };
@@ -561,8 +609,8 @@ export async function startAgent({
         } else {
           await publishVerifiedProviders();
         }
-        if (shuttingDown) return false;
-        const sqmResult = sqmLocalReviewWorker
+        if (shuttingDown || pendingOrganization) return false;
+        const sqmResult = sqmEnabled && sqmLocalReviewWorker
           ? await sqmLocalReviewWorker.poll()
           : null;
         if (shuttingDown) return false;
@@ -715,7 +763,8 @@ export async function startAgent({
       api: sqmApi,
       beginWork: () => acquireUpdateWork(updateManager),
       runReview: dependencies.runSqmLocalReview,
-      getProvider: () => ["codex", "claude"].find(
+      onChange: notifyDesktopStatusChange,
+      getProvider: () => availableCapabilities?.features?.sqm_local_review !== true ? null : ["codex", "claude"].find(
         (provider) => availableCapabilities?.backends?.[provider] === true &&
           providerStatuses[provider]?.state === "ready",
       ) || null,
@@ -996,6 +1045,14 @@ export async function startAgent({
           });
           return;
         }
+        const nextOrganization = body.organization_id ?? body.org_id;
+        const nextAccount = body.account_id ?? body.auth_user_id;
+        const changingScope = session && (session.organization_id !== nextOrganization || session.account_id !== nextAccount);
+        if ((changingScope && organizationBusy()) || (pendingOrganization &&
+            (pendingOrganization.id !== nextOrganization || pendingOrganization.accountId !== nextAccount))) {
+          json(res, 409, { error: "Organization authorization does not match, or tasks are still running." });
+          return;
+        }
         const previousSession = session ?? reclaimableSession;
         reclaimableSession = null;
         session = {
@@ -1024,6 +1081,8 @@ export async function startAgent({
           session.device_id &&
           previousSession.device_id !== session.device_id &&
           previousSession.api_origin &&
+          (previousSession.account_id ?? null) === (session.account_id ?? null) &&
+          (previousSession.organization_id ?? null) === (session.organization_id ?? null) &&
           previousApiBaseUrl(previousSession) === session.api_base_url
         ) {
           try {
@@ -1047,6 +1106,14 @@ export async function startAgent({
           }
         }
         await writeSession(apiOrigin, session, sessionRoot);
+        authNonce = randomBytes(16).toString("base64url");
+        pendingOrganization = null;
+        sqmEnabled = await readSqmEnabled(sessionRoot, apiOrigin, session);
+        if (changingScope) sqmLocalReviewWorker?.resetHistory?.();
+        organizationState = "unknown";
+        organizationItems = [];
+        void refreshOrganizations();
+        refreshAvailableCapabilities();
         startHeartbeatTimer();
         loginUrl = null;
         registry.emit("change", registry.list());
@@ -2061,6 +2128,7 @@ export async function startAgent({
   });
   const getDesktopStatus = async () => {
     const auth = desktopAuthStatus(session, { webOrigin: apiOrigin });
+    if (auth.state === "signed_in" && organizationState === "unknown") void refreshOrganizations();
     if (deferStartupSynchronization && !shuttingDown) {
       // Cached checks return immediately; expired checks refresh in the
       // background without making the desktop frame wait for subprocesses.
@@ -2077,6 +2145,13 @@ export async function startAgent({
       auth,
       connection: connectionStatus.snapshot({ authenticated: auth.state === "signed_in" }),
       tasks: desktopTaskStatus([registry, directRegistry, localTaskRegistry]),
+      organizations: { state: organizationState, items: organizationItems, selectedId: session?.organization_id ?? null,
+        switching: Boolean(pendingOrganization), canSwitch: auth.state === "signed_in" && !organizationBusy() },
+      sqm: { enabled: sqmEnabled, canEnable: auth.state === "signed_in" && Boolean(session?.account_id && session?.organization_id) && !pendingOrganization,
+        activeJobId: sqmLocalReviewWorker?.snapshot?.().active_job_id ?? null,
+        issue: sqmLocalReviewWorker?.snapshot?.().issue ?? null,
+        providerReady: [codex, claude].some(provider => provider?.state === "ready") },
+      sqmTasks: sqmLocalReviewWorker?.desktopTasks?.() ?? { activeCount: 0, items: [] },
       update: updateManager?.snapshot?.() ?? null,
       codex,
       claude,
@@ -2098,8 +2173,20 @@ export async function startAgent({
       return requestDesktopLogin();
     },
     requestDesktopLogin,
+    refreshOrganizations,
+    cancelOrganizationSelection() { authNonce = randomBytes(16).toString("base64url"); pendingOrganization = null; loginUrl = null; refreshAvailableCapabilities(); notifyDesktopStatusChange(); },
+    async setSqmEnabled(enabled) {
+      if (!isSessionValid(session, Date.now(), apiOrigin) || pendingOrganization) throw new Error("Sign in to an organization first.");
+      const settingsSession = session;
+      await writeSqmEnabled(sessionRoot, apiOrigin, settingsSession, enabled);
+      if (session !== settingsSession) return;
+      sqmEnabled = enabled;
+      refreshAvailableCapabilities();
+      notifyDesktopStatusChange();
+      void heartbeat().catch(error => reportHeartbeatError(error, quiet));
+    },
     getDesktopStatus,
-    getDesktopTask: (key) => desktopTaskDetail([registry, directRegistry, localTaskRegistry], key),
+    getDesktopTask: (key) => sqmLocalReviewWorker?.desktopTaskDetail?.(key) ?? desktopTaskDetail([registry, directRegistry, localTaskRegistry], key),
     async refreshDesktopStatus() {
       if (isSessionValid(session, Date.now(), apiOrigin)) {
         await heartbeat().catch((error) => reportHeartbeatError(error, quiet));

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.45";
+export const CLI_VERSION = "0.5.46";
 export const CLI_API_CONTRACT_VERSION = 10;
 
 export function withCliContract(

package/src/desktop-host.js

@@ -37,6 +37,21 @@ const silentLogger = { log() {}, error() {} };
 // exceed 128 KiB, including after a signed runtime handoff.
 const MAX_DESKTOP_FRAME_BYTES = 8 * 1024 * 1024;
 
+function desktopActionError(action, error) {
+  if (typeof action === "string" && action.startsWith("session_")) {
+    return action.startsWith("session_action_") ? associationActionError(error) : sessionActionError(error);
+  }
+  if (["organization_select", "organization_cancel", "organizations_refresh"].includes(action)) {
+    return error?.code === "desktop_organization_busy"
+      ? "Wait for running tasks to finish before switching organizations."
+      : "Could not switch organization. Refresh organizations and try again.";
+  }
+  if (action === "sqm_set_enabled") {
+    return "Could not save SQM settings. Check your SIMY connection and try again.";
+  }
+  return "Action could not finish. Refresh the status and try again; active tasks must finish before quitting.";
+}
+
 export async function startDesktopHost({ input = process.stdin, output = process.stdout, env = process.env,
   dependencies = {}, exit = (code) => { process.exitCode = code; } } = {}) {
   const emit = (event) => output.write(`${JSON.stringify(event)}\n`);
@@ -270,12 +285,16 @@ export async function startDesktopHost({ input = process.stdin, output = process
           refreshSessions(true);
           void actionAssociations.tick().then(publish).catch(() => {});
         }
-        else if (action === "login") {
-          const url = await agent.requestDesktopLogin();
+        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") {
+          if (action === "organization_select" && (typeof command.organizationId !== "string" || !command.organizationId)) throw new Error("Select an organization first.");
+          const url = await agent.requestDesktopLogin(action === "organization_select" ? command.organizationId : null);
           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) throw new Error("Could not open the login page.");
+            if (!result.opened) { agent.cancelOrganizationSelection?.(); throw new Error("Could not open the login page."); }
           }
         } else if (action === "check_update") await updater.checkNow();
         else if (action === "update") {
@@ -376,15 +395,14 @@ export async function startDesktopHost({ input = process.stdin, output = process
         }
         else if (action === "quit") {
           const status = await agent.getDesktopStatus();
-          if (status.tasks.activeCount > 0 && command.force !== true) throw new Error("Tasks are still running. Confirm before quitting.");
+          if ((status.tasks.activeCount + (status.sqmTasks?.activeCount || 0)) > 0 && command.force !== true) throw new Error("Tasks are still running. Confirm before quitting.");
           emit({ type: "result", id: command.id, ok: true });
           await close(); exit(0); return;
         } else throw new Error("Unsupported desktop action.");
         emit({ type: "result", id: command.id, ok: true });
         await publish();
       } catch (error) {
-        emit({ type: "result", id: command.id, ok: false, message: String(command.action || "").startsWith("session_")
-          ? (String(command.action).startsWith("session_action_") ? associationActionError(error) : sessionActionError(error)) : "Action could not finish. Refresh the status and try again; active tasks must finish before quitting." });
+        emit({ type: "result", id: command.id, ok: false, message: desktopActionError(command.action, error) });
       }
     }).catch(() => {});
   });

package/src/desktop-sqm-settings.js

@@ -0,0 +1,23 @@
+import { createHash } from 'node:crypto';
+import { mkdir, readFile, rename, writeFile } from 'node:fs/promises';
+import { join } from 'node:path';
+
+export function sqmSettingsPath(root, origin, session) {
+  if (!session?.account_id || !session?.organization_id) return null;
+  const key = createHash('sha256').update(JSON.stringify([origin, session.account_id, session.organization_id])).digest('hex');
+  return join(root, 'sqm-settings', `${key}.json`);
+}
+export async function readSqmEnabled(root, origin, session) {
+  const path = sqmSettingsPath(root, origin, session);
+  if (!path) return false;
+  try { return JSON.parse(await readFile(path, 'utf8')).enabled === true; }
+  catch (error) { if (error.code === 'ENOENT' || error instanceof SyntaxError) return false; throw error; }
+}
+export async function writeSqmEnabled(root, origin, session, enabled) {
+  const path = sqmSettingsPath(root, origin, session);
+  if (!path || typeof enabled !== 'boolean') throw new Error('Sign in to an organization before enabling SQM.');
+  await mkdir(join(root, 'sqm-settings'), { recursive: true, mode: 0o700 });
+  const temporary = `${path}.${process.pid}.tmp`;
+  await writeFile(temporary, JSON.stringify({ enabled }), { mode: 0o600 });
+  await rename(temporary, path);
+}

package/src/sqm/review-worker.js

@@ -83,11 +83,19 @@ export function createSqmLocalReviewWorker({
   runReview = (request, provider) => runStructuredProviderReview(provider, request),
   beginWork = () => () => {},
   onError = () => {},
+  onChange = () => {},
 } = {}) {
   if (!api || typeof api.request !== "function") throw new TypeError("api.request is required");
   let activeJobId = null;
   let pollPromise = null;
   let closed = false;
+  let issue = null;
+  const history = [];
+  const updateTask = (id, state) => {
+    const item = history.find(item => item.id === id);
+    if (item) item.state = state;
+    onChange();
+  };
 
   const leaseBody = (claim, provider) => ({
     executor_provider: provider,
@@ -99,6 +107,10 @@ export function createSqmLocalReviewWorker({
 
   const processClaim = async (claim, provider) => {
     activeJobId = claim.job_id;
+    history.unshift({ id: claim.job_id, key: `sqm:${claim.job_id}`, label: `SQM · ${String(claim.job_id).slice(0, 8)}`,
+      state: "running", provider, startedAt: new Date().toISOString() });
+    history.splice(50);
+    onChange();
     let heartbeatTimer = null;
     const heartbeat = () => {
       void api.request({ action: "heartbeat", ...leaseBody(claim, provider) }).catch(onError);
@@ -113,25 +125,37 @@ export function createSqmLocalReviewWorker({
         analysis_output: analysis.output,
         executor_model: analysis.model,
       });
-      if (advanced.completed) return advanced;
+      if (advanced.completed) { updateTask(claim.job_id, "completed"); return advanced; }
       const adjudication = await runReview(advanced.request, provider);
-      return api.request({
+      const completed = await api.request({
         action: "complete",
         ...leaseBody(claim, provider),
         analysis_output: analysis.output,
         adjudication_output: adjudication.output,
         executor_model: adjudication.model || analysis.model,
       });
+      updateTask(claim.job_id, "completed");
+      return completed;
+    } catch (error) {
+      updateTask(claim.job_id, "failed");
+      throw error;
     } finally {
       if (heartbeatTimer) clearInterval(heartbeatTimer);
       activeJobId = null;
+      onChange();
     }
   };
 
   return {
     snapshot() {
-      return { active_job_id: activeJobId, closed };
+      return { active_job_id: activeJobId, polling: Boolean(pollPromise), closed, issue };
+    },
+    desktopTasks() { return { activeCount: activeJobId ? 1 : 0, items: history.map(item => ({ ...item })) }; },
+    desktopTaskDetail(key) {
+      const item = history.find(item => item.key === key);
+      return item ? { key, instruction: `SQM local review · ${item.provider}`, result: item.state === "completed" ? "SQM review submitted." : "", error: item.state === "failed" ? "Local review failed. Check the SQM workspace for retry status." : "", links: [] } : null;
     },
+    resetHistory() { if (!pollPromise) { history.splice(0); issue = null; } },
     poll() {
       if (closed || pollPromise) return pollPromise || Promise.resolve(null);
       const provider = getProvider();
@@ -146,16 +170,19 @@ export function createSqmLocalReviewWorker({
           worker_id: workerId,
           lease_seconds: leaseSeconds,
         });
+        if (issue) { issue = null; onChange(); }
         if (!claim?.claimed) return null;
         return processClaim(claim, provider);
       })()
         .catch((error) => {
+          issue = error.status === 403 ? "forbidden" : error.status === 401 ? "signed_out" : "unavailable";
           onError(error);
           return null;
         })
         .finally(() => {
           pollPromise = null;
           releaseWork();
+          onChange();
         });
       return pollPromise;
     },