@bitkyc08/opencodex 2.43.0 → 2.44.0

package/src/cli/integrations.ts

@@ -1,5 +1,6 @@
 import {
   CliUsageError,
+  RuntimeApiError,
   csv,
   printData,
   rejectArgs,
@@ -28,10 +29,25 @@ const GROK_USAGE = `Usage:
   ocx grok apply [--json]`;
 
 const CLIENT_USAGE = `Usage:
-  ocx integration client [status] [--client <id>] [--json]
-  ocx integration client <enable|disable> --client <id> [--overwrite-conflict] [--json]
-  ocx integration client history [--client <id>] [--json]
-  ocx integration client restore --op <opId> [--confirm-drift] [--json]`;
+  ocx integration client [status] [--client <id>] [--profile <id>] [--json]
+  ocx integration client <enable|disable> --client <id> [--profile <id>] [--overwrite-conflict] [--json]
+  ocx integration client history [--client <id>] [--profile <id>] [--json]
+  ocx integration client restore --op <opId> [--client aside --profile <id>] [--confirm-drift] [--json]
+  --profile selects one Aside account-backed profile; omitted Aside toggles affect all profiles.`;
+
+function validateAsideProfile(profile: string | undefined, client: string | undefined): void {
+  if (profile === undefined) return;
+  if (client !== "aside") throw new CliUsageError("--profile requires --client aside", CLIENT_USAGE);
+  if (!/^(0|[1-9][0-9]*)$/.test(profile) || !Number.isSafeInteger(Number(profile))) {
+    throw new CliUsageError("--profile must be a nonnegative integer account ID", CLIENT_USAGE);
+  }
+
+}
+
+function clientIntegrationPath(client: string, profile?: string): string {
+  const base = `/api/client-integrations/${encodeURIComponent(client)}`;
+  return client === "aside" ? `${base}/profiles${profile === undefined ? "" : `/${encodeURIComponent(profile)}`}` : base;
+}
 
 function parseMap(raw: string): Record<string, string> {
   if (raw === "-") return {};
@@ -163,16 +179,23 @@ export async function handleClientIntegrationCommand(
     const args = [...argv];
     const action = (args.shift() ?? "status").toLowerCase();
     const wantsJson = takeFlag(args, "--json");
+    const profile = takeOption(args, "--profile");
 
     if (action === "status" || action === "show" || action === "list") {
       const client = takeOption(args, "--client");
+      validateAsideProfile(profile, client);
       rejectArgs(args, CLIENT_USAGE);
       const path = client
-        ? `/api/client-integrations/${encodeURIComponent(client)}`
+        ? clientIntegrationPath(client, profile)
         : "/api/client-integrations";
       const result = await runtimeRequest(path, {}, deps);
       const rows = (result as { clients?: Array<Record<string, unknown>> }).clients;
-      printData(result, wantsJson, rows
+      const profiles = (result as { profiles?: Array<Record<string, unknown>> }).profiles;
+      printData(result, wantsJson, profiles
+        ? profiles.length > 0
+          ? profiles.map(row => `${String(row.profileId)}  ${String(row.name ?? "Aside")}: ${row.enabled ? "on" : "off"} (${String(row.state)})${row.current ? " [current]" : ""}`)
+          : [String((result as { error?: string }).error ?? "No Aside profiles found.")]
+        : rows
         ? rows.map(row => `${String(row.clientId)}: ${String(row.state)}${row.installed ? "" : " (not installed)"}`)
         : summaryLines(result));
       return;
@@ -180,9 +203,11 @@ export async function handleClientIntegrationCommand(
 
     if (action === "history" || action === "journal") {
       const client = takeOption(args, "--client");
+      validateAsideProfile(profile, client);
       rejectArgs(args, CLIENT_USAGE);
-      const query = client ? `?client=${encodeURIComponent(client)}` : "";
-      const result = await runtimeRequest(`/api/client-integrations/journal${query}`, {}, deps);
+      const path = client === "aside" ? `${clientIntegrationPath(client, profile)}/journal`
+        : `/api/client-integrations/journal${client ? `?client=${encodeURIComponent(client)}` : ""}`;
+      const result = await runtimeRequest(path, {}, deps);
       const operations = (result as { operations?: Array<Record<string, unknown>> }).operations ?? [];
       printData(result, wantsJson, operations.length === 0
         ? ["No integration operations recorded yet."]
@@ -190,7 +215,8 @@ export async function handleClientIntegrationCommand(
           // `snapshot` is resolved against the disk by the route, so "expired"
           // here means the bytes are genuinely gone, not merely old.
           const backup = row.snapshot === "expired" ? "backup expired" : `op ${String(row.opId)}`;
-          return `${String(row.at)}  ${String(row.clientId)}  ${String(row.kind)}  (${backup})`;
+          const owner = row.profileId === undefined ? String(row.clientId) : `${String(row.clientId)}:${String(row.profileId)}`;
+          return `${String(row.at)}  ${owner}  ${String(row.kind)}  (${backup})`;
         }));
       return;
     }
@@ -198,9 +224,12 @@ export async function handleClientIntegrationCommand(
     if (action === "restore") {
       const opId = takeOption(args, "--op") ?? takeOption(args, "--op-id");
       const confirmDrift = takeFlag(args, "--confirm-drift");
+      const client = takeOption(args, "--client");
+      validateAsideProfile(profile, client);
+      if (client !== undefined && profile === undefined) throw new CliUsageError("restore --client requires --profile", CLIENT_USAGE);
       rejectArgs(args, CLIENT_USAGE);
       if (!opId) throw new CliUsageError("--op <opId> is required", CLIENT_USAGE);
-      const result = await runtimeRequest("/api/client-integrations/restore", {
+      const result = await runtimeRequest(profile === undefined ? "/api/client-integrations/restore" : `${clientIntegrationPath("aside", profile)}/restore`, {
         method: "POST",
         body: JSON.stringify({ opId, confirmDrift }),
       }, deps);
@@ -212,6 +241,7 @@ export async function handleClientIntegrationCommand(
       throw new CliUsageError(`unknown client integration command ${action}`, CLIENT_USAGE);
     }
     const client = takeOption(args, "--client");
+    validateAsideProfile(profile, client);
     /*
      * The conflict escape hatch, spelled the way `restore --confirm-drift` is: the
      * refusal is the default and the waiver has to be typed.
@@ -232,7 +262,7 @@ export async function handleClientIntegrationCommand(
     if (overwriteConflict && action === "disable") {
       throw new CliUsageError("--overwrite-conflict applies only to enable", CLIENT_USAGE);
     }
-    const result = await runtimeRequest(`/api/client-integrations/${encodeURIComponent(client)}`, {
+    const result = await runtimeRequest(clientIntegrationPath(client, profile), {
       method: "PUT",
       // Sent only when asked for, so a proxy on an older build sees the request it
       // has always seen rather than an unknown field.
@@ -240,7 +270,11 @@ export async function handleClientIntegrationCommand(
         ? { enabled: true, overwriteConflict: true }
         : { enabled: action === "enable" }),
     }, deps);
-    printData(result, wantsJson, [String((result as Record<string, unknown>).message ?? `${client} ${action}d.`)]);
+    const batch = result as { ok?: boolean; message?: string; results?: Array<Record<string, unknown>> };
+    printData(result, wantsJson, batch.results
+      ? batch.results.map(row => `aside:${String(row.profileId)}  ${String(row.message ?? (row.ok ? "updated" : "refused"))}${row.residual === true ? " Recovery did not finish." : ""}${typeof row.snapshotPath === "string" ? ` Backup: ${row.snapshotPath}` : ""}`)
+      : [String(batch.message ?? `${client} ${action}d.`)]);
+    if (batch.ok === false) throw new RuntimeApiError(batch.message ?? "Some Aside profiles could not be updated", 207, result);
   });
 }
 

package/src/cli/opencode.ts

@@ -39,7 +39,7 @@ import type {
   OpencodeProviderBlocks,
   OpencodeV2ProviderBlock,
 } from "../clients/config-export";
-import { visibleNativeSlugs } from "../codex/catalog";
+import { filterCatalogVisibleModels, visibleNativeSlugs } from "../codex/catalog";
 import { commandInvocation } from "../lib/win-exec";
 import { loadServiceTokenFromFile, serviceApiTokenFilePath } from "../lib/service-secrets";
 import { providerCodexAccountMode } from "../providers/registry";
@@ -376,12 +376,17 @@ export function opencodeCatalogFromProxyRows(
   config: OcxConfig,
 ): OpencodeCatalogModel[] {
   const omitNative = providerCodexAccountMode("openai", config.providers?.openai) === "direct";
+  const routedRows = rows.filter((row): row is OpencodeProxyModelRow & { provider: string; id: string } =>
+    row.native !== true && typeof row.provider === "string" && typeof row.id === "string");
+  const visibleRouted = new Set<OpencodeProxyModelRow>(filterCatalogVisibleModels(routedRows, config));
   const seen = new Set<string>();
   const catalog: OpencodeCatalogModel[] = [];
   for (const row of rows) {
     const namespaced = row.namespaced?.trim();
     if (!namespaced || row.disabled === true) continue;
     if (omitNative && row.native === true) continue;
+    if (row.native !== true && typeof row.provider === "string" && typeof row.id === "string"
+      && !visibleRouted.has(row)) continue;
     if (seen.has(namespaced)) continue;
     seen.add(namespaced);
     catalog.push({
@@ -632,14 +637,14 @@ export function opencodeNotFoundHint(
 }
 
 export async function cmdOpencode(args: string[]): Promise<number> {
-  const config = loadConfig();
-  const live = await ensureProxyForOpencode(config);
+  const startupConfig = loadConfig();
+  const live = await ensureProxyForOpencode(startupConfig);
   if (!live) {
     console.error("❌ Proxy did not become healthy after starting.");
     return 1;
   }
 
-  const apiKey = opencodeApiKey(config);
+  const apiKey = opencodeApiKey(startupConfig);
   let proxyModels: OpencodeProxyModelRow[];
   try {
     proxyModels = await fetchOpencodeProxyModels(live, apiKey);
@@ -648,6 +653,8 @@ export async function cmdOpencode(args: string[]): Promise<number> {
     console.error(`❌ Could not fetch the model catalog from the proxy: ${reason}`);
     return 1;
   }
+  // /api/models may have completed and persisted initial provider selection.
+  const config = loadConfig();
   const catalog = opencodeCatalogFromProxyRows(proxyModels, config);
   const blocks = buildOpencodeProviderBlocksFromCatalog(live.port, catalog, live.hostname, config);
   const baseUrl = blocks.v1.options.baseURL;

package/src/cli/runtime-api.ts

@@ -44,7 +44,7 @@ export class RuntimeApiError extends Error {
 
 export async function runtimeBaseUrl(deps: RuntimeApiDeps = {}): Promise<string> {
   if (deps.baseUrl) return deps.baseUrl.replace(/\/$/, "");
-  const live = await findLiveProxy();
+  const live = await (deps.findLiveProxy ?? findLiveProxy)();
   if (!live) throw new RuntimeApiError("Proxy is not running. Start it with: ocx start", 503, null);
   return `http://${probeHostname(live.hostname)}:${live.port}`;
 }
@@ -79,7 +79,12 @@ function responseMessage(body: unknown, status: number): string {
   if (reason && reason !== primary) parts.push(`reason: ${reason}`);
   const hint = stringField(record, "hint");
   if (hint && hint !== primary) parts.push(`hint: ${hint}`);
-  return parts.join("\n").slice(0, 1200);
+  const snapshotPath = stringField(record, "snapshotPath");
+  const recovery = [
+    ...(snapshotPath ? [`Backup: ${snapshotPath.slice(0, 32768)}`] : []),
+    ...(record.residual === true ? ["Automatic recovery did not finish; check the client configuration before retrying."] : []),
+  ];
+  return [parts.join("\n").slice(0, 1200), ...recovery].join("\n");
 }
 
 export async function runtimeRequest<T = unknown>(

package/src/cli/uninstall-client-state.ts

@@ -0,0 +1,78 @@
+import { getConfigDir } from "../config";
+import { disconnectClient } from "../client/connect";
+import { readClientConnectionState, sameClientConnectionOwner } from "../client/state";
+import { assertClientLifecycleHeld, withClientLifecycle } from "../client/lifecycle-lock";
+import { inspectRemoteDesktopCleanup, readDesktopDisconnectReceipt } from "../claude/desktop-remote-store";
+import { removeOwnedConfigState, type ConfigRemovalResult } from "../lib/config-ownership";
+import { sharedTeardownAuthorized, type UninstallObservation } from "./uninstall-plan";
+
+export interface UninstallClientStateDeps {
+  readConnection: typeof readClientConnectionState;
+  inspectDesktop: typeof inspectRemoteDesktopCleanup;
+  readReceipt: typeof readDesktopDisconnectReceipt;
+  disconnect: (options?: Parameters<typeof disconnectClient>[0]) => Promise<unknown>;
+  withLifecycle: typeof withClientLifecycle;
+  remove: () => ConfigRemovalResult;
+}
+
+const defaults: UninstallClientStateDeps = {
+  readConnection: readClientConnectionState,
+  inspectDesktop: inspectRemoteDesktopCleanup,
+  readReceipt: readDesktopDisconnectReceipt,
+  disconnect: options => disconnectClient(options),
+  withLifecycle: withClientLifecycle,
+  remove: () => removeOwnedConfigState(getConfigDir()),
+};
+
+/** Restore connection-owned client artifacts before removing their ownership/recovery records. */
+export async function removeOwnedConfigAfterDesktopCleanup(
+  observed: UninstallObservation,
+  deps: UninstallClientStateDeps = defaults,
+): Promise<ConfigRemovalResult> {
+  if (!sharedTeardownAuthorized(observed)) {
+    throw new Error("Client cleanup refused: service or proxy teardown is not proven.");
+  }
+  const state = deps.readConnection();
+  if (state.kind !== "connected" && state.kind !== "disconnected") {
+    throw new Error("Client cleanup refused: connection state is invalid or mismatched.");
+  }
+  const desktop = deps.inspectDesktop();
+  const receipt = deps.readReceipt();
+  if (desktop.kind === "unsafe" || receipt.kind === "unsafe") {
+    throw new Error("Client cleanup refused: Desktop recovery state is unsafe.");
+  }
+  const interrupted = receipt.kind === "valid" && receipt.value.phase !== "complete" ? receipt.value : undefined;
+  if ((state.kind === "connected" && desktop.kind !== "absent" && !sameClientConnectionOwner(state.value, desktop.owner))
+    || (interrupted && state.kind === "connected" && !sameClientConnectionOwner(state.value, interrupted.owner))
+    || (interrupted && desktop.kind !== "absent" && !sameClientConnectionOwner(desktop.owner, interrupted.owner))) {
+    throw new Error("Client cleanup refused: Desktop recovery ownership is mismatched.");
+  }
+  if (state.kind === "connected" || interrupted) {
+    // Disconnect owns its N/L/C ordering. Do not hold L across this call, and
+    // preserve the frozen catalog choice when resuming an interrupted operation.
+    await deps.disconnect({
+      expectedOwner: state.kind === "connected" ? {
+        serverUrl: state.value.serverUrl, apiKeyId: state.value.apiKeyId, connectedAt: state.value.connectedAt,
+      } : interrupted!.owner,
+      ...(interrupted ? { keepCatalog: interrupted.keepCatalog } : {}),
+    });
+  } else if (desktop.kind !== "absent") {
+    throw new Error("Client cleanup refused: finish Desktop recovery before uninstalling.");
+  }
+
+  // A connection can appear while asynchronous cleanup is finishing. The final
+  // inspection and actual remover share L, but never hold C while deleting its DB.
+  return deps.withLifecycle(async held => {
+    assertClientLifecycleHeld(held);
+    const latest = deps.readConnection();
+    const latestDesktop = deps.inspectDesktop();
+    const latestReceipt = deps.readReceipt();
+    if (latest.kind !== "disconnected"
+      || latestDesktop.kind !== "absent"
+      || latestReceipt.kind === "unsafe"
+      || (latestReceipt.kind === "valid" && latestReceipt.value.phase !== "complete")) {
+      throw new Error("Client cleanup refused: connection or Desktop state changed before removal.");
+    }
+    return deps.remove();
+  });
+}