replicas-cli 0.2.544 → 0.2.546

package/README.md

@@ -36,7 +36,7 @@ Display current authenticated user.
 Display current organization.
 
 ### `replicas org switch`
-Switch between organizations.
+Choose the organization used by organization-scoped commands. The selection persists across sessions.
 
 ### `replicas connect <workspace-name>`
 Connect to a workspace via SSH.

package/dist/index.cjs

@@ -7408,10 +7408,15 @@ function writeConfig(config3) {
     throw error51;
   }
 }
-function deleteConfig() {
-  if (import_fs.default.existsSync(CONFIG_FILE)) {
-    import_fs.default.unlinkSync(CONFIG_FILE);
-  }
+function clearAuthentication() {
+  const config3 = readConfig();
+  if (!config3) return;
+  writeConfig({
+    ...config3,
+    access_token: "",
+    refresh_token: "",
+    expires_at: 0
+  });
 }
 function isAuthenticated() {
   const config3 = readConfig();
@@ -7431,6 +7436,7 @@ function setOrganizationId(organizationId) {
     throw new Error("No config file found. Please login first.");
   }
   config3.organization_id = organizationId;
+  config3.organization_selection_confirmed = true;
   writeConfig(config3);
 }
 function clearOrganizationId() {
@@ -7439,12 +7445,20 @@ function clearOrganizationId() {
     return;
   }
   delete config3.organization_id;
+  delete config3.organization_selection_confirmed;
   writeConfig(config3);
 }
 function getOrganizationId() {
   const config3 = readConfig();
   return config3?.organization_id || null;
 }
+function getConfirmedOrganizationId() {
+  const config3 = readConfig();
+  return config3?.organization_selection_confirmed === true ? config3.organization_id || null : null;
+}
+function isOrganizationSelectionConfirmed() {
+  return readConfig()?.organization_selection_confirmed === true;
+}
 function setIdeCommand(ideCommand) {
   const config3 = readConfig();
   if (!config3) {
@@ -7553,7 +7567,7 @@ async function refreshToken() {
 }
 async function getValidToken() {
   const config3 = readConfig();
-  if (!config3) {
+  if (!config3?.access_token) {
     throw new NotAuthenticatedError();
   }
   if (isTokenExpired(config3.expires_at)) {
@@ -7631,6 +7645,7 @@ var AGENT = {
   CURSOR: "cursor",
   DEEPSEEK: "deepseek",
   FX: "fx",
+  KIMI: "kimi",
   OPENCODE: "opencode",
   PI: "pi",
   RELAY: "relay"
@@ -7672,6 +7687,11 @@ var AGENT_PROVIDER_OPTIONS = [
     label: "fx",
     description: "Use fx for tasks"
   },
+  {
+    value: "kimi",
+    label: "Kimi Code",
+    description: "Use Kimi Code for tasks"
+  },
   {
     value: "opencode",
     label: "Opencode",
@@ -7696,6 +7716,7 @@ var THINKING_LEVELS_BY_AGENT = {
   cursor: STANDARD_THINKING_LEVELS,
   deepseek: STANDARD_THINKING_LEVELS,
   fx: STANDARD_THINKING_LEVELS,
+  kimi: STANDARD_THINKING_LEVELS,
   opencode: STANDARD_THINKING_LEVELS,
   pi: STANDARD_THINKING_LEVELS,
   relay: [...STANDARD_THINKING_LEVELS, "ultracode"]
@@ -7719,6 +7740,8 @@ function getProviderDisplayName(provider, variant = "short") {
       return variant === "long" ? "DeepSeek Harness" : "DeepSeek";
     case "fx":
       return "fx";
+    case "kimi":
+      return variant === "long" ? "Kimi Code" : "Kimi";
     case "opencode":
       return "Opencode";
     case "pi":
@@ -7787,6 +7810,9 @@ var AGENT_CREDENTIAL_METHODS_IN_ORDER = {
   [AGENT.FX]: [
     { method: CREDENTIAL_METHOD.AI_GATEWAY, credentialType: CREDENTIAL_TYPE.AI_GATEWAY_API_KEY }
   ],
+  [AGENT.KIMI]: [
+    { method: CREDENTIAL_METHOD.AI_GATEWAY, credentialType: CREDENTIAL_TYPE.AI_GATEWAY_API_KEY }
+  ],
   [AGENT.OPENCODE]: [
     { method: CREDENTIAL_METHOD.OPENCODE_GO, credentialType: CREDENTIAL_TYPE.OPENCODE_GO_API_KEY },
     { method: CREDENTIAL_METHOD.ASTER, credentialType: CREDENTIAL_TYPE.ASTER_API_KEY },
@@ -22401,6 +22427,7 @@ var DEFAULT_OPENCODE_MODEL = "z-ai/glm-5.2";
 var DEEPSEEK_V4_PRO_MODEL = "deepseek/deepseek-v4-pro-0813";
 var DEEPSEEK_V4_FLASH_MODEL = "deepseek/deepseek-v4-flash-0731";
 var DEFAULT_FX_MODEL = "zai/glm-5.2";
+var DEFAULT_KIMI_MODEL = "moonshotai/kimi-k2.6";
 var OPENROUTER_MODELS = [
   DEFAULT_OPENCODE_MODEL,
   DEEPSEEK_V4_PRO_MODEL,
@@ -22487,6 +22514,7 @@ var AGENT_MODELS = {
   ],
   deepseek: prioritizeDeepseekModels(OPENROUTER_MODELS),
   fx: [DEFAULT_FX_MODEL],
+  kimi: [DEFAULT_KIMI_MODEL],
   opencode: [...OPENROUTER_MODELS, ...ASTER_MODELS],
   pi: [...OPENROUTER_MODELS, ...ASTER_MODELS],
   relay: [CLAUDE_FABLE_5_MODEL, CLAUDE_OPUS_5_MODEL, CLAUDE_OPUS_4_8_MODEL, CLAUDE_SONNET_5_MODEL]
@@ -24378,7 +24406,7 @@ var headlessFilesystemAgentResultSchema = external_exports.object({
 });
 
 // ../shared/src/cli-version.ts
-var CLI_VERSION = "0.2.544";
+var CLI_VERSION = "0.2.546";
 
 // ../shared/src/version.ts
 function compareVersions(v1, v2) {
@@ -25494,71 +25522,146 @@ function parseDeepseekEvents(events) {
   return messages;
 }
 
-// ../shared/src/display-message/parsers/fx-parser.ts
-function getFxTextChunk(update, kind) {
+// ../shared/src/display-message/parsers/acp-parser.ts
+var FX_CONTEXT_DIAGNOSTIC = /^\[context\] skill catalog omitted .*?(?:\r?\n|$)/;
+function getAcpTextChunk(update, kind) {
   if (!isRecord(update) || update.sessionUpdate !== kind || !isRecord(update.content) || update.content.type !== "text") return null;
-  return typeof update.content.text === "string" && update.content.text ? update.content.text : null;
+  return typeof update.content.text === "string" && update.content.text.length > 0 ? update.content.text : null;
 }
-function parseFxEvents(events) {
+function isProviderEvent(event, provider, suffix) {
+  return event.type === `acp-${suffix}` && (event.payload.provider === void 0 || event.payload.provider === provider) || event.type === `${provider}-${suffix}`;
+}
+function parseAcpEvents(events, provider) {
   const messages = [];
+  const activeChunks = {};
+  const resolvedInputs = /* @__PURE__ */ new Map();
+  let chunkSequence = 0;
   for (const event of events) {
-    const content = getUserMessage(event);
-    if (content !== null) {
-      if (content.trim()) {
+    const userContent = getUserMessage(event);
+    if (userContent !== null) {
+      activeChunks.agent_message_chunk = void 0;
+      activeChunks.agent_thought_chunk = void 0;
+      if (userContent.trim()) {
         messages.push({
-          id: getUserMessageId(event) ?? `fx-user-${event.timestamp}`,
+          id: getUserMessageId(event) ?? `${provider}-user-${event.timestamp}`,
           type: "user",
-          content,
+          content: userContent,
           timestamp: event.timestamp
         });
       }
       continue;
     }
-    if (event.type === "fx-error") {
+    if (isProviderEvent(event, provider, "error")) {
       messages.push({
-        id: `fx-error-${event.timestamp}`,
+        id: `${provider}-error-${event.timestamp}`,
         type: "error",
-        message: typeof event.payload.message === "string" ? event.payload.message : "fx failed",
+        message: typeof event.payload.message === "string" ? event.payload.message : `${provider} failed`,
         timestamp: event.timestamp
       });
       continue;
     }
-    if (event.type === "fx-turn-complete") {
+    if (isProviderEvent(event, provider, "turn-complete")) {
       for (const message of messages) {
         if (message.type === "reasoning" && message.status === "in_progress") message.status = "completed";
       }
+      activeChunks.agent_message_chunk = void 0;
+      activeChunks.agent_thought_chunk = void 0;
+      continue;
+    }
+    if (event.type === "replicas-tool-input-request" && typeof event.payload.toolUseId === "string" && typeof event.payload.requestId === "string") {
+      const message = messages.find((candidate) => candidate.type === "tool_call" && candidate.id === `${provider}-tool-${event.payload.toolUseId}`);
+      if (message && (Array.isArray(event.payload.options) || Array.isArray(event.payload.questions))) {
+        const resolved = resolvedInputs.get(event.payload.toolUseId);
+        message.inputRequest = {
+          requestId: event.payload.requestId,
+          status: resolved?.selectionId === "aborted" ? "aborted" : resolved ? "resolved" : "pending",
+          ...Array.isArray(event.payload.options) ? { options: event.payload.options } : {},
+          ...Array.isArray(event.payload.questions) ? { questions: event.payload.questions } : {},
+          ...resolved ? { selectionId: resolved.selectionId } : {},
+          ...resolved?.selectionSummary ? { selectionSummary: resolved.selectionSummary } : {}
+        };
+      }
+      continue;
+    }
+    if (event.type === "replicas-tool-input-resolved" && typeof event.payload.toolUseId === "string" && typeof event.payload.selectionId === "string") {
+      const resolved = {
+        selectionId: event.payload.selectionId,
+        ...typeof event.payload.selectionSummary === "string" ? { selectionSummary: event.payload.selectionSummary } : {}
+      };
+      resolvedInputs.set(event.payload.toolUseId, resolved);
+      const message = messages.find((candidate) => candidate.type === "tool_call" && candidate.id === `${provider}-tool-${event.payload.toolUseId}`);
+      if (message?.inputRequest) {
+        message.inputRequest = {
+          ...message.inputRequest,
+          status: resolved.selectionId === "aborted" ? "aborted" : "resolved",
+          ...resolved
+        };
+      }
       continue;
     }
-    if (event.type !== "fx-session-update" || !isRecord(event.payload.update)) continue;
+    if (!isProviderEvent(event, provider, "session-update") || !isRecord(event.payload.update)) continue;
     const update = event.payload.update;
     const kind = update.sessionUpdate;
     if (kind === "agent_message_chunk" || kind === "agent_thought_chunk") {
-      const content2 = getFxTextChunk(update, kind);
-      if (!content2) continue;
-      const id = typeof update.messageId === "string" ? `fx-${update.messageId}` : `fx-${kind}-${event.timestamp}`;
+      const content = getAcpTextChunk(update, kind);
+      if (content === null) continue;
+      const explicitId = typeof update.messageId === "string" && update.messageId.length > 0 ? `${provider}-${kind}-${update.messageId}` : null;
+      const id = explicitId ?? activeChunks[kind] ?? `${provider}-${kind}-${chunkSequence++}`;
+      activeChunks[kind] = id;
+      const otherKind = kind === "agent_message_chunk" ? "agent_thought_chunk" : "agent_message_chunk";
+      if (!explicitId) activeChunks[otherKind] = void 0;
       const existing = messages.find((message) => message.id === id);
-      const text = `${existing && "content" in existing && typeof existing.content === "string" ? existing.content : ""}${content2}`;
+      const text = `${existing && "content" in existing && typeof existing.content === "string" ? existing.content : ""}${content}`.replace(provider === "fx" ? FX_CONTEXT_DIAGNOSTIC : /$^/, "");
+      if (!text) continue;
       upsertDisplayMessage(messages, kind === "agent_thought_chunk" ? { id, type: "reasoning", content: text, status: "in_progress", timestamp: existing?.timestamp ?? event.timestamp } : { id, type: "agent", content: text, timestamp: existing?.timestamp ?? event.timestamp });
       continue;
     }
+    activeChunks.agent_message_chunk = void 0;
+    activeChunks.agent_thought_chunk = void 0;
     if ((kind === "tool_call" || kind === "tool_call_update") && typeof update.toolCallId === "string") {
-      const id = `fx-tool-${update.toolCallId}`;
+      const id = `${provider}-tool-${update.toolCallId}`;
       const existing = messages.find((message) => message.id === id && message.type === "tool_call");
       const status = update.status === "completed" || update.status === "failed" ? update.status === "failed" ? "failed" : "completed" : "in_progress";
+      const contentOutput = Array.isArray(update.content) && update.content.length > 0 ? stringifyDisplayValue(update.content) : void 0;
       upsertDisplayMessage(messages, createCallDisplayMessage({
         id,
-        server: "fx",
-        tool: typeof update.name === "string" ? update.name : typeof update.title === "string" ? update.title : existing?.tool ?? "tool",
+        server: provider,
+        tool: typeof update.name === "string" && update.name ? update.name : typeof update.title === "string" && update.title ? update.title : existing?.tool ?? (typeof update.kind === "string" ? update.kind : "tool"),
         input: update.rawInput === void 0 ? existing?.input : isRecord(update.rawInput) ? update.rawInput : stringifyDisplayValue(update.rawInput),
-        output: update.rawOutput === void 0 ? existing?.output : stringifyDisplayValue(update.rawOutput),
+        output: update.rawOutput === void 0 ? contentOutput ?? existing?.output : stringifyDisplayValue(update.rawOutput),
         status,
-        timestamp: event.timestamp
+        timestamp: existing?.timestamp ?? event.timestamp
       }));
+      continue;
+    }
+    const plan = kind === "plan" ? update : isRecord(update.plan) ? update.plan : void 0;
+    if ((kind === "plan" || kind === "plan_update") && plan && Array.isArray(plan.entries)) {
+      const items = plan.entries.flatMap((entry) => {
+        if (!isRecord(entry) || typeof entry.content !== "string") return [];
+        const itemStatus = entry.status === "completed" || entry.status === "in_progress" ? entry.status : "pending";
+        return [{
+          text: entry.content,
+          completed: entry.status === "completed",
+          itemStatus
+        }];
+      });
+      upsertDisplayMessage(messages, {
+        id: `${provider}-plan-${typeof plan.planId === "string" ? plan.planId : "current"}`,
+        type: "todo_list",
+        items,
+        status: items.every((item) => item.completed) ? "completed" : "in_progress",
+        timestamp: event.timestamp
+      });
     }
   }
   return messages;
 }
 
+// ../shared/src/display-message/parsers/fx-parser.ts
+function parseFxEvents(events) {
+  return parseAcpEvents(events, "fx");
+}
+
 // ../shared/src/display-message/parsers/opencode-parser.ts
 function timestampFromMs(value, fallback) {
   return typeof value === "number" && Number.isFinite(value) ? new Date(value).toISOString() : fallback;
@@ -26726,6 +26829,9 @@ function parseAgentEvents(events, agentType) {
   if (agentType === "fx") {
     return parseFxEvents(events);
   }
+  if (agentType === "kimi") {
+    return parseAcpEvents(events, "kimi");
+  }
   if (agentType === "opencode") {
     return parseOpencodeEvents(events);
   }
@@ -26924,45 +27030,7 @@ async function readSseStream(body, onEvent, shouldContinue = () => true) {
 // src/lib/monolith-url.ts
 var MONOLITH_URL = process.env.REPLICAS_MONOLITH_URL || process.env.MONOLITH_URL || "https://api.tryreplicas.com";
 
-// src/lib/api.ts
-async function buildOrgAuthHeaders() {
-  const extraHeaders = {};
-  if (isAgentMode()) {
-    const agent = readAgentConfig();
-    if (!agent) {
-      throw new Error("Agent mode config is incomplete");
-    }
-    extraHeaders["X-Workspace-Id"] = agent.workspace_id;
-    return { bearer: agent.engine_secret, extraHeaders };
-  }
-  const bearer = await getValidToken();
-  const organizationId = getOrganizationId();
-  if (!organizationId) {
-    throw new Error(
-      'No organization selected. Please run "replicas org switch" to select an organization.'
-    );
-  }
-  extraHeaders["Replicas-Org-Id"] = organizationId;
-  return { bearer, extraHeaders };
-}
-async function authenticatedFetch(url2, options) {
-  const token = await getValidToken();
-  if (!token) {
-    throw new Error("No access token available");
-  }
-  return apiFetch(url2, {
-    "Authorization": `Bearer ${token}`,
-    ...options?.headers || {}
-  }, options);
-}
-async function orgAuthenticatedFetch(url2, options) {
-  const { bearer, extraHeaders } = await buildOrgAuthHeaders();
-  return apiFetch(url2, {
-    "Authorization": `Bearer ${bearer}`,
-    ...extraHeaders,
-    ...options?.headers || {}
-  }, options);
-}
+// src/lib/authenticated-api.ts
 var ApiError = class extends Error {
   constructor(message, status) {
     super(message);
@@ -26975,39 +27043,24 @@ async function throwResponseError(response) {
   throw new ApiError(error51.error || `Request failed with status ${response.status}`, response.status);
 }
 async function apiFetch(url2, headers, options) {
-  const requestHeaders = {
-    "Content-Type": "application/json",
-    ...headers
-  };
-  const absoluteUrl = `${MONOLITH_URL}${url2}`;
-  const requestInit = {
+  const requestHeaders = new Headers({ "Content-Type": "application/json", ...headers });
+  new Headers(options?.headers).forEach((value, key) => requestHeaders.set(key, value));
+  const response = await fetchWithRedirects(`${MONOLITH_URL}${url2}`, {
     ...options,
     headers: requestHeaders,
     body: options?.body !== void 0 ? JSON.stringify(options.body) : void 0
-  };
-  const response = await fetchWithRedirects(absoluteUrl, requestInit);
+  });
   if (!response.ok) {
     await throwResponseError(response);
   }
   return response.json();
 }
-async function orgAuthenticatedSseStream(url2, options) {
-  const { bearer, extraHeaders } = await buildOrgAuthHeaders();
-  const response = await fetch(`${MONOLITH_URL}${url2}`, {
-    method: "POST",
-    headers: {
-      "Authorization": `Bearer ${bearer}`,
-      "Content-Type": "application/json",
-      "Accept": "text/event-stream",
-      ...extraHeaders
-    },
-    body: JSON.stringify(options.body)
-  });
-  if (!response.ok || !response.body) {
-    await throwResponseError(response);
-    return;
+async function authenticatedFetch(url2, options) {
+  const token = await getValidToken();
+  if (!token) {
+    throw new Error("No access token available");
   }
-  await readSseStream(response.body, options.onEvent);
+  return apiFetch(url2, { Authorization: `Bearer ${token}` }, options);
 }
 
 // src/lib/organization.ts
@@ -27018,7 +27071,11 @@ async function fetchOrganizations() {
   return response.organizations;
 }
 async function fetchActiveRole() {
-  return orgAuthenticatedFetch("/v1/organization/membership").then((response) => response.role).catch(() => null);
+  const organizationId = getConfirmedOrganizationId();
+  if (!organizationId) return null;
+  return authenticatedFetch("/v1/organization/membership", {
+    headers: { "Replicas-Org-Id": organizationId }
+  }).then((response) => response.role).catch(() => null);
 }
 async function setActiveOrganization(organizationId) {
   const organizations = await fetchOrganizations();
@@ -27031,7 +27088,14 @@ async function setActiveOrganization(organizationId) {
 async function findActiveOrganization() {
   const organizations = await fetchOrganizations();
   const currentId = getOrganizationId();
-  return { organizations, organization: organizations.find((org2) => org2.id === currentId) ?? null };
+  const storedOrganization = organizations.find((org2) => org2.id === currentId) ?? null;
+  if (currentId && !storedOrganization) {
+    clearOrganizationId();
+  }
+  return {
+    organizations,
+    organization: isOrganizationSelectionConfirmed() ? storedOrganization : null
+  };
 }
 async function promptForOrganization(organizations, currentId) {
   const { organizationId } = await (0, import_prompts3.default)({
@@ -27046,30 +27110,30 @@ async function promptForOrganization(organizations, currentId) {
   });
   return organizations.find((org2) => org2.id === organizationId) ?? null;
 }
-async function ensureOrganization(options = {}) {
+async function ensureOrganizationSelection(options = {}) {
   const { organizations, organization } = await findActiveOrganization();
   if (organizations.length === 0) {
     throw new Error("You are not a member of any organization. Please contact support.");
   }
   if (organization) {
-    return { organization, total: organizations.length, role: await fetchActiveRole() };
+    return { organization, total: organizations.length };
   }
-  const canAsk = options.interactive === true && organizations.length > 1 && !!process.stdin.isTTY;
+  const canAsk = options.interactive === true && !!process.stdin.isTTY;
   if (canAsk) {
     const chosen = await promptForOrganization(organizations, null);
     if (!chosen) {
-      clearOrganizationId();
-      return { organization: null, total: organizations.length, role: null };
+      return { organization: null, total: organizations.length };
     }
     setOrganizationId(chosen.id);
-    return { organization: chosen, total: organizations.length, role: await fetchActiveRole() };
+    return { organization: chosen, total: organizations.length };
   }
-  const [newestOrganization] = organizations;
-  setOrganizationId(newestOrganization.id);
+  return { organization: null, total: organizations.length };
+}
+async function ensureOrganization(options = {}) {
+  const selection = await ensureOrganizationSelection(options);
   return {
-    organization: newestOrganization,
-    total: organizations.length,
-    role: await fetchActiveRole()
+    ...selection,
+    role: selection.organization ? await fetchActiveRole() : null
   };
 }
 async function resolveActiveOrganization() {
@@ -27124,7 +27188,7 @@ async function resolveAuthFlowTarget(identity) {
   }
   const [replicasAccount, active] = await Promise.all([
     getCurrentUser().then((user) => user.email).catch(() => null),
-    resolveActiveOrganization()
+    ensureOrganization({ interactive: true })
   ]);
   return {
     ...identity,
@@ -27320,6 +27384,7 @@ async function loginCommand() {
           refresh_token: refreshToken2,
           expires_at: parseInt(expiresAt, 10),
           organization_id: existingConfig?.organization_id,
+          organization_selection_confirmed: existingConfig?.organization_selection_confirmed,
           ide_command: existingConfig?.ide_command
         };
         try {
@@ -27408,7 +27473,7 @@ function logoutCommand() {
     console.log(import_chalk3.default.yellow("You are not logged in."));
     return;
   }
-  deleteConfig();
+  clearAuthentication();
   console.log(import_chalk3.default.green("\u2713 Successfully logged out!"));
 }
 
@@ -27476,6 +27541,54 @@ async function connectSSH(token, host, proxyCommand) {
 var import_chalk5 = __toESM(require("chalk"));
 var import_prompts5 = __toESM(require("prompts"));
 
+// src/lib/api.ts
+async function buildOrgAuthHeaders() {
+  const extraHeaders = {};
+  if (isAgentMode()) {
+    const agent = readAgentConfig();
+    if (!agent) {
+      throw new Error("Agent mode config is incomplete");
+    }
+    extraHeaders["X-Workspace-Id"] = agent.workspace_id;
+    return { bearer: agent.engine_secret, extraHeaders };
+  }
+  const bearer = await getValidToken();
+  const selectedId = getConfirmedOrganizationId();
+  const organizationId = selectedId ?? (await ensureOrganizationSelection({ interactive: true })).organization?.id;
+  if (!organizationId) {
+    throw new Error(
+      'No organization selected. Please run "replicas org switch" to select an organization.'
+    );
+  }
+  extraHeaders["Replicas-Org-Id"] = organizationId;
+  return { bearer, extraHeaders };
+}
+async function orgAuthenticatedFetch(url2, options) {
+  const { bearer, extraHeaders } = await buildOrgAuthHeaders();
+  return apiFetch(url2, {
+    "Authorization": `Bearer ${bearer}`,
+    ...extraHeaders
+  }, options);
+}
+async function orgAuthenticatedSseStream(url2, options) {
+  const { bearer, extraHeaders } = await buildOrgAuthHeaders();
+  const response = await fetch(`${MONOLITH_URL}${url2}`, {
+    method: "POST",
+    headers: {
+      "Authorization": `Bearer ${bearer}`,
+      "Content-Type": "application/json",
+      "Accept": "text/event-stream",
+      ...extraHeaders
+    },
+    body: JSON.stringify(options.body)
+  });
+  if (!response.ok || !response.body) {
+    await throwResponseError(response);
+    return;
+  }
+  await readSseStream(response.body, options.onEvent);
+}
+
 // src/lib/git.ts
 var import_child_process2 = require("child_process");
 var import_path2 = __toESM(require("path"));
@@ -27770,7 +27883,7 @@ async function orgCommand() {
     process.exit(1);
   }
   try {
-    const currentOrgId = getOrganizationId();
+    const currentOrgId = getConfirmedOrganizationId();
     const organizations = await fetchOrganizations();
     if (!currentOrgId) {
       console.log(import_chalk8.default.yellow("\n  No organization selected."));
@@ -27779,6 +27892,7 @@ async function orgCommand() {
     }
     const currentOrg = organizations.find((org2) => org2.id === currentOrgId);
     if (!currentOrg) {
+      clearOrganizationId();
       console.log(import_chalk8.default.yellow("\n  The selected organization is no longer available to you."));
       console.log(import_chalk8.default.gray('  Run "replicas org switch" to select another.\n'));
       return;
@@ -27813,7 +27927,7 @@ async function orgSwitchCommand() {
       console.log(import_chalk8.default.gray("  Please contact support.\n"));
       return;
     }
-    const currentOrgId = getOrganizationId();
+    const currentOrgId = getConfirmedOrganizationId();
     let selectedId = organizations[0].id;
     if (organizations.length > 1) {
       const chosen = await promptForOrganization(organizations, currentOrgId);
@@ -28062,7 +28176,7 @@ async function runCodexOAuthFlow(totalSteps) {
 // src/lib/credential-upload.ts
 var import_chalk10 = __toESM(require("chalk"));
 var UPLOAD_STEPS = 1;
-async function withAuthRecovery(operation, assertStillApproved) {
+async function withAuthRecovery(operation, afterReauthentication) {
   try {
     return { result: await operation(), reauthenticated: false };
   } catch (error51) {
@@ -28073,8 +28187,8 @@ async function withAuthRecovery(operation, assertStillApproved) {
     console.log(import_chalk10.default.yellow(`
   ${message}`));
     await loginCommand();
-    await assertStillApproved();
-    console.log(import_chalk10.default.gray("  Retrying credential upload..."));
+    await afterReauthentication?.();
+    console.log(import_chalk10.default.gray("  Retrying..."));
     return { result: await operation(), reauthenticated: true };
   }
 }
@@ -28101,7 +28215,7 @@ async function runCredentialAuthFlow(options, flow) {
     if (options.org === true && options.user === true) {
       throw new Error("Pass either --org or --user, not both.");
     }
-    const target = await resolveAuthFlowTarget(identity);
+    const { result: target } = await withAuthRecovery(() => resolveAuthFlowTarget(identity));
     if (!isUserScoped && !target.organization) {
       throw new Error(
         "Could not determine which organization to save to. Re-run the command, or use --user to save to your personal account."
@@ -30841,6 +30955,38 @@ function parseBooleanOption(value) {
 }
 var program = new import_commander.Command();
 program.name("replicas").description("CLI for managing Replicas workspaces").version(CLI_VERSION);
+var organizationOptionalCommands = /* @__PURE__ */ new Set([
+  "computer",
+  "claude-auth",
+  "codex-auth",
+  "config",
+  "init",
+  "login",
+  "logout",
+  "media",
+  "mothership",
+  "org",
+  "service",
+  "whoami"
+]);
+program.hook("preAction", async (_command, actionCommand) => {
+  let rootCommand = actionCommand;
+  while (rootCommand.parent && rootCommand.parent !== program) {
+    rootCommand = rootCommand.parent;
+  }
+  if (isAgentMode() || !isAuthenticated() || organizationOptionalCommands.has(rootCommand.name())) return;
+  try {
+    const { organization } = await ensureOrganizationSelection({ interactive: true });
+    if (!organization) {
+      throw new Error('No organization selected. Run "replicas org switch" to select one.');
+    }
+  } catch (error51) {
+    console.error(import_chalk22.default.red(`
+\u2717 ${error51 instanceof Error ? error51.message : "Unknown error"}
+`));
+    process.exit(1);
+  }
+});
 function registerSlackCommands(parent) {
   const slack = parent.command("slack").description("Manage Slack thread routing");
   const slackThread = slack.command("thread").description("Attach or switch the Slack thread that routes to a workspace");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "replicas-cli",
-  "version": "0.2.544",
+  "version": "0.2.546",
   "description": "CLI for managing Replicas workspaces - SSH into cloud dev environments with automatic port forwarding",
   "main": "dist/index.cjs",
   "bin": {