@4yi-dev/cli 0.1.10 → 0.1.12

package/README.md

@@ -32,7 +32,11 @@ Both packages install the `4yi` command. The dev package points at `https://xcla
 
 `4yi code` installs OpenCode under `~/.4yi/vendor/opencode`, writes an OpenCode config under `~/.4yi/opencode/opencode.json`, and launches OpenCode with a 4YI provider.
 
-`4yi connect claude` and `4yi connect codex` first check for the corresponding local CLI. If it is missing, 4YI asks before installing the official npm package. Pass `--yes` to approve that CLI installation non-interactively. Desktop apps are detected and reported, but are never installed automatically.
+`4yi connect claude` and `4yi connect codex` first check for the corresponding local CLI. If it is missing, 4YI asks before installing the official npm package. Pass `--yes` to approve that CLI installation non-interactively. Desktop apps are detected but are never installed automatically.
+
+On macOS, `4yi connect claude` also configures an installed Claude Desktop through its official third-party Gateway mode. The Desktop credential helper reads the current token from `~/.4yi/config.json`; the token is not copied into Claude's configuration. Quit and reopen Claude Desktop only after its active tasks finish. Third-party mode has a separate session list from the normal Claude profile. Run `4yi restore claude`, then reopen Claude Desktop, to return to the previous profile and session list.
+
+`--scope project` changes only the project's Claude Code settings and never changes the global Claude Desktop profile.
 
 For local development:
 

package/bin/4yi.mjs

@@ -11,6 +11,7 @@ if (command === "help" || command === "--help" || command === "-h") {
   console.log("  4yi code --model X  pin model X as the default for future sessions");
   console.log("  4yi connect <claude|codex|all>  connect existing coding tools to 4YI");
   console.log("    --yes                         install a missing CLI without prompting");
+  console.log("    Claude on macOS also configures installed Claude Desktop 3P Gateway mode");
   console.log("  4yi status [claude|codex|all]   inspect the current connection");
   console.log("  4yi restore <claude|codex|all>  restore the latest protected config");
   process.exit(0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@4yi-dev/cli",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "description": "4YI command-line launcher for OAuth login and OpenCode runtime",
   "type": "module",
   "bin": {

package/src/connect.mjs

@@ -20,6 +20,8 @@ const CODEX_ROOT_START = "# >>> 4yi-cli codex-root";
 const CODEX_ROOT_END = "# <<< 4yi-cli codex-root";
 const CODEX_PROVIDER_START = "# >>> 4yi-cli codex-provider";
 const CODEX_PROVIDER_END = "# <<< 4yi-cli codex-provider";
+const CLAUDE_DESKTOP_PROFILE_ID = "4e8e29f6-e0ba-4a2f-8a5f-4e2dcf95f3f0";
+const CLAUDE_DESKTOP_PROFILE_FILE = `${CLAUDE_DESKTOP_PROFILE_ID}.json`;
 const TOOL_METADATA = {
   claude: {
     label: "Claude Code",
@@ -51,22 +53,39 @@ export async function prepareConnectionTools({ target = "all", autoInstall = fal
   }
 }
 
-export function connectionPaths({ home = os.homedir(), cwd = process.cwd(), codexHome = process.env.CODEX_HOME } = {}) {
+export function connectionPaths({
+  home = os.homedir(),
+  cwd = process.cwd(),
+  codexHome = process.env.CODEX_HOME,
+  platform = process.platform,
+} = {}) {
   const codexDir = codexHome || path.join(home, ".codex");
-  return {
+  const paths = {
     claudeUser: path.join(home, ".claude", "settings.json"),
     claudeProject: path.join(cwd, ".claude", "settings.local.json"),
     codexConfig: path.join(codexDir, "config.toml"),
     codexCatalog: path.join(codexDir, "model-catalogs", "4yi.json"),
   };
+  if (platform === "darwin") {
+    const desktopDir = path.join(home, "Library", "Application Support", "Claude-3p");
+    const libraryDir = path.join(desktopDir, "configLibrary");
+    Object.assign(paths, {
+      claudeDesktopDir: desktopDir,
+      claudeDesktopConfig: path.join(desktopDir, "claude_desktop_config.json"),
+      claudeDesktopLibraryMeta: path.join(libraryDir, "_meta.json"),
+      claudeDesktopProfile: path.join(libraryDir, CLAUDE_DESKTOP_PROFILE_FILE),
+      claudeDesktopCredentialHelper: path.join(home, ".4yi", "helpers", "claude-desktop-credential"),
+    });
+  }
+  return paths;
 }
 
-function atomicWrite(file, value) {
+function atomicWrite(file, value, mode = 0o600) {
   ensureDir(path.dirname(file));
   const temp = `${file}.${process.pid}.${Date.now()}.tmp`;
-  fs.writeFileSync(temp, value, { mode: 0o600 });
+  fs.writeFileSync(temp, value, { mode });
   fs.renameSync(temp, file);
-  try { fs.chmodSync(file, 0o600); } catch { /* Windows may ignore POSIX modes. */ }
+  try { fs.chmodSync(file, mode); } catch { /* Windows may ignore POSIX modes. */ }
 }
 
 function timestamp() {
@@ -216,6 +235,103 @@ function chooseModel(models, preferred, keyword) {
   return match || models[0];
 }
 
+function readJsonObject(file) {
+  if (!fs.existsSync(file) || fs.statSync(file).size === 0) return {};
+  const value = JSON.parse(fs.readFileSync(file, "utf8"));
+  if (!value || Array.isArray(value) || typeof value !== "object") {
+    throw new Error(`${file} must contain a JSON object.`);
+  }
+  return value;
+}
+
+function claudeDesktopCredentialHelper() {
+  return `#!/bin/sh
+set -eu
+
+config_file="$HOME/.4yi/config.json"
+if [ ! -f "$config_file" ]; then
+  echo "4YI session not found. Run: 4yi login" >&2
+  exit 1
+fi
+
+token=$(/usr/bin/plutil -extract token raw -o - "$config_file" 2>/dev/null) || {
+  echo "4YI session is invalid. Run: 4yi login" >&2
+  exit 1
+}
+
+if [ -z "$token" ] || [ "$token" = "null" ]; then
+  echo "4YI session is missing a token. Run: 4yi login" >&2
+  exit 1
+fi
+
+printf '%s' "$token"
+`;
+}
+
+function configureClaudeDesktop({
+  home,
+  claudeBaseUrl,
+  backupGroup,
+  stdout,
+  platform = process.platform,
+  env = process.env,
+  exists = fs.existsSync,
+} = {}) {
+  if (platform !== "darwin") return { configured: false, supported: false };
+
+  const detected = desktopAppCandidates("claude", { home, platform, env }).some((candidate) => exists(candidate));
+  if (!detected) {
+    stdout("Claude App was not detected in a standard install location. Claude Code is connected; Claude Desktop was not changed.");
+    return { configured: false, supported: true, detected: false };
+  }
+
+  let gatewayUrl;
+  try {
+    gatewayUrl = new URL(claudeBaseUrl);
+  } catch {
+    stdout(`Claude Desktop was not configured because its Gateway URL is invalid: ${claudeBaseUrl}`);
+    return { configured: false, supported: true, detected: true };
+  }
+  if (gatewayUrl.protocol !== "https:") {
+    stdout("Claude Desktop was not configured because official 3P Gateway mode requires an HTTPS endpoint.");
+    return { configured: false, supported: true, detected: true };
+  }
+
+  const paths = connectionPaths({ home, platform });
+  const files = [
+    paths.claudeDesktopConfig,
+    paths.claudeDesktopLibraryMeta,
+    paths.claudeDesktopProfile,
+    paths.claudeDesktopCredentialHelper,
+  ];
+  for (const file of files) backupFile("claude", file, home, backupGroup);
+
+  const gateway = gatewayUrl.toString().replace(/\/+$/, "");
+  const inference = {
+    inferenceProvider: "gateway",
+    inferenceGatewayBaseUrl: gateway,
+    inferenceCredentialKind: "helper-script",
+    inferenceCredentialHelper: paths.claudeDesktopCredentialHelper,
+    inferenceGatewayAuthScheme: "bearer",
+    disableEssentialTelemetry: true,
+    disableNonessentialTelemetry: true,
+  };
+  const desktopConfig = { ...readJsonObject(paths.claudeDesktopConfig), deploymentMode: "3p", ...inference };
+  const libraryMeta = { ...readJsonObject(paths.claudeDesktopLibraryMeta), appliedId: CLAUDE_DESKTOP_PROFILE_ID };
+  const profile = { ...readJsonObject(paths.claudeDesktopProfile), ...inference };
+
+  // Activate last so Claude never observes a selected profile before its
+  // credential helper and config-library entry are durable on disk.
+  atomicWrite(paths.claudeDesktopCredentialHelper, claudeDesktopCredentialHelper(), 0o700);
+  atomicWrite(paths.claudeDesktopProfile, `${JSON.stringify(profile, null, 2)}\n`);
+  atomicWrite(paths.claudeDesktopLibraryMeta, `${JSON.stringify(libraryMeta, null, 2)}\n`);
+  atomicWrite(paths.claudeDesktopConfig, `${JSON.stringify(desktopConfig, null, 2)}\n`);
+
+  stdout(`Connected Claude Desktop (official 3P Gateway): ${paths.claudeDesktopProfile}`);
+  stdout("Quit and reopen Claude Desktop when no tasks are running. It will use a separate 3P session list; `4yi restore claude` switches back to the previous profile.");
+  return { configured: true, supported: true, detected: true, paths };
+}
+
 async function loadClaudeModels(session, claudeBaseUrl) {
   const base = claudeBaseUrl.replace(/\/+$/, "");
   const response = await requestJson(base, "/v1/models", { token: session.token });
@@ -224,8 +340,8 @@ async function loadClaudeModels(session, claudeBaseUrl) {
   return models;
 }
 
-async function connectClaude({ session, home, cwd, scope, claudeBaseUrl, stdout }) {
-  const paths = connectionPaths({ home, cwd });
+async function connectClaude({ session, home, cwd, scope, claudeBaseUrl, stdout, tooling = {} }) {
+  const paths = connectionPaths({ home, cwd, platform: tooling.platform });
   const files = scope === "project" ? [paths.claudeProject] : scope === "both" ? [paths.claudeUser, paths.claudeProject] : [paths.claudeUser];
   const models = await loadClaudeModels(session, claudeBaseUrl);
   const defaultModel = chooseModel(models, "claude-sonnet-4-6", "sonnet");
@@ -236,11 +352,7 @@ async function connectClaude({ session, home, cwd, scope, claudeBaseUrl, stdout
   const backupGroup = timestamp();
   for (const file of files) {
     const backup = backupFile("claude", file, home, backupGroup);
-    let data = {};
-    if (fs.existsSync(file) && fs.statSync(file).size > 0) {
-      data = JSON.parse(fs.readFileSync(file, "utf8"));
-      if (!data || Array.isArray(data) || typeof data !== "object") throw new Error(`${file} must contain a JSON object.`);
-    }
+    const data = readJsonObject(file);
     const env = data.env && !Array.isArray(data.env) && typeof data.env === "object" ? data.env : {};
     Object.assign(env, {
       ANTHROPIC_BASE_URL: claudeBaseUrl.replace(/\/+$/, ""),
@@ -260,6 +372,11 @@ async function connectClaude({ session, home, cwd, scope, claudeBaseUrl, stdout
     stdout(`Backup: ${backup}`);
   }
   stdout(`Available Claude models: ${models.join(", ")}`);
+  if (scope === "project") {
+    stdout("Claude Desktop was not changed because --scope project only configures this project.");
+  } else {
+    configureClaudeDesktop({ home, claudeBaseUrl, backupGroup, stdout, ...tooling });
+  }
 }
 
 function removeManagedBlock(text, start, end) {
@@ -311,6 +428,16 @@ function buildCodexCatalog(models, template) {
       description: `${planModel.display_name || planModel.id} via 4YI Gateway with OpenAI Responses tool support.`,
       supported_in_api: true,
       use_responses_lite: false,
+      // The template is whatever `codex debug models --bundled` returns on this
+      // machine, and that is not a stable schema: 0.147 carries this field,
+      // 0.150 omits it, and connect installs the latest codex -- so it upgrades
+      // its own template source into the version that drops it. Codex.app
+      // requires it and will not start without one, so it is set here rather
+      // than inherited. The endpoint is authoritative when it answers; `true`
+      // is the fallback because every model this catalog can describe is served
+      // through the Responses ingress, which requires `parallel_tool_calls` on
+      // each request.
+      supports_parallel_tool_calls: planModel.supports_parallel_tool_calls ?? true,
       tool_mode: undefined,
     })).map((model) => {
       delete model.tool_mode;
@@ -406,8 +533,7 @@ export async function connect({ target = "all", session, home = os.homedir(), cw
     await prepareConnectionTools({ target: normalized, autoInstall: options.autoInstall, stdout, tooling });
   }
   if (normalized === "claude" || normalized === "all") {
-    await connectClaude({ session, home, cwd, scope, claudeBaseUrl: urls.claudeBaseUrl, stdout });
-    reportDesktopApp("claude", { ...tooling, home, stdout });
+    await connectClaude({ session, home, cwd, scope, claudeBaseUrl: urls.claudeBaseUrl, stdout, tooling });
   }
   if (normalized === "codex" || normalized === "all") {
     await connectCodex({ session, home, codexHome, codexBaseUrl: urls.codexBaseUrl, stdout, skipCheck: options.skipCheck, tooling });
@@ -426,12 +552,52 @@ function readClaudeStatus(file) {
   }
 }
 
-export function connectionStatus({ target = "all", home = os.homedir(), cwd = process.cwd(), codexHome = process.env.CODEX_HOME, scope = "user", stdout = console.log } = {}) {
+function readClaudeDesktopStatus(paths) {
+  const base = {
+    config: paths.claudeDesktopConfig,
+    profile: paths.claudeDesktopProfile,
+    connected: false,
+  };
+  try {
+    const config = readJsonObject(paths.claudeDesktopConfig);
+    const meta = readJsonObject(paths.claudeDesktopLibraryMeta);
+    const profile = readJsonObject(paths.claudeDesktopProfile);
+    const selected = meta.appliedId === CLAUDE_DESKTOP_PROFILE_ID;
+    const connected = config.deploymentMode === "3p"
+      && selected
+      && profile.inferenceProvider === "gateway"
+      && profile.inferenceCredentialKind === "helper-script"
+      && profile.inferenceGatewayAuthScheme === "bearer"
+      && profile.inferenceCredentialHelper === paths.claudeDesktopCredentialHelper
+      && fs.existsSync(paths.claudeDesktopCredentialHelper);
+    return {
+      ...base,
+      connected,
+      deploymentMode: config.deploymentMode,
+      selected,
+      baseUrl: profile.inferenceGatewayBaseUrl,
+      credential: profile.inferenceCredentialKind,
+    };
+  } catch (error) {
+    return { ...base, error: error.message };
+  }
+}
+
+export function connectionStatus({
+  target = "all",
+  home = os.homedir(),
+  cwd = process.cwd(),
+  codexHome = process.env.CODEX_HOME,
+  scope = "user",
+  platform = process.platform,
+  stdout = console.log,
+} = {}) {
   const normalized = normalizeTarget(target);
-  const paths = connectionPaths({ home, cwd, codexHome });
+  const paths = connectionPaths({ home, cwd, codexHome, platform });
   if (normalized === "claude" || normalized === "all") {
     const files = scope === "project" ? [paths.claudeProject] : scope === "both" ? [paths.claudeUser, paths.claudeProject] : [paths.claudeUser];
     for (const file of files) stdout(`Claude Code: ${JSON.stringify(readClaudeStatus(file))}`);
+    if (paths.claudeDesktopConfig) stdout(`Claude Desktop: ${JSON.stringify(readClaudeDesktopStatus(paths))}`);
   }
   if (normalized === "codex" || normalized === "all") {
     const text = fs.existsSync(paths.codexConfig) ? fs.readFileSync(paths.codexConfig, "utf8") : "";
@@ -473,7 +639,11 @@ export const __testing = {
   ensureToolCli,
   executableName,
   reportDesktopApp,
+  configureClaudeDesktop,
+  claudeDesktopCredentialHelper,
+  readClaudeDesktopStatus,
   removeManagedBlock,
   removeCodexRootAssignments,
   CLAUDE_MANAGED_ENV_KEYS,
+  CLAUDE_DESKTOP_PROFILE_ID,
 };

package/src/opencode.mjs

@@ -10,6 +10,7 @@ const DEFAULT_CONTEXT_LIMIT = 200000;
 const DEFAULT_OUTPUT_LIMIT = 8192;
 
 function isClaudeModel(model) {
+  if (model?.family === "claude") return true;
   const id = model?.id || "";
   const name = model?.display_name || "";
   return /claude/i.test(id) || /claude/i.test(name);
@@ -23,14 +24,23 @@ function modelOutputLimit(model) {
   return model.output_limit || model.max_output_tokens || model.max_tokens || DEFAULT_OUTPUT_LIMIT;
 }
 
+function modelPickerName(model) {
+  const displayName = model.display_name || model.id;
+  if (model.family === "claude") {
+    return `Claude · ${displayName.replace(/^(?:anthropic[ ._-]*)?claude[ ._-]*/i, "")}`;
+  }
+  if (model.family === "codex") return `Codex · ${displayName}`;
+  return displayName;
+}
+
 export function buildOpenCodeConfig({ modelConfig, preferredModel = null, tokenEnv = "FOURYI_CLI_TOKEN", orgEnv = "FOURYI_ORG_ID" }) {
-  // Register EVERY model the server returned so OpenCode's native switcher
-  // (`Tab` / `/models`) can move between them. Claude stays the default.
+  // Register every server-approved coding model so OpenCode's native switcher
+  // (`Tab` / `/models`) can move between Claude and Codex. Claude stays the default.
   const list = modelConfig.models || [];
   const models = {};
   for (const model of list) {
     const entry = {
-      name: model.display_name || model.id,
+      name: modelPickerName(model),
       limit: {
         context: modelContextLimit(model),
         output: modelOutputLimit(model),
@@ -111,7 +121,7 @@ export function ensureOpenCodeRuntime({ home = os.homedir(), stdout = console.lo
 
 export async function runCode({ session, home = os.homedir(), argv = [], stdout = console.log, preferredModel = null } = {}) {
   if (!session?.token) throw new Error("Not signed in. Run `4yi login`.");
-  const modelConfig = await requestJson(session.baseUrl, "/api/cli/models", { token: session.token });
+  const modelConfig = await requestJson(session.baseUrl, "/api/cli/models?runtime=opencode", { token: session.token });
   const list = modelConfig.models || [];
   if (list.length === 0) throw new Error("No chat models available for this organization.");