openpond-code 0.1.3 → 0.2.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # openpond-code
 
+## 0.2.0
+
+### Minor Changes
+
+- b6e5f07: added multi accounts
+
+## 0.1.4
+
+### Patch Changes
+
+- bb79cf8: cleaned up naming
+
 ## 0.1.3
 
 ### Patch Changes

package/README.md

@@ -20,11 +20,15 @@ Login (stores key in `~/.openpond/config.json`):
 openpond login
 # or (non-interactive)
 openpond login --api-key opk_...
+# or save under an account profile
+openpond login --account production --api-key opk_prod_...
+openpond login --account secondary --api-key opk_secondary_...
 ```
 
 Commands:
 
 ```bash
+openpond --account production apps list
 openpond tool list <handle>/<repo>
 openpond tool run <handle>/<repo> <tool> --body '{"foo":"bar"}'
 openpond deploy watch <handle>/<repo> --branch main
@@ -45,6 +49,12 @@ openpond apps positions tx --method GET --params '{"status":"open"}'
 openpond opentool init --dir .
 ```
 
+Global account selection:
+
+- `--account <name>` (alias `--profile <name>`) selects which stored account/API key to use.
+- `OPENPOND_ACCOUNT=<name>` sets the default selected account for a shell/session.
+- If omitted, CLI uses the last active stored account.
+
 Command reference:
 
 - `openpond login`: prompt for API key and save to `~/.openpond/config.json`.
@@ -99,8 +109,8 @@ await client.apps.agentCreate(
 );
 ```
 
-You can override hosts with `baseUrl`, `apiUrl`, and `toolUrl` in `createClient`, or
-via `OPENPOND_BASE_URL`, `OPENPOND_API_URL`, and `OPENPOND_TOOL_URL`.
+You can override hosts with `apiUrl` and `toolUrl` in `createClient`, or
+via `OPENPOND_API_URL` and `OPENPOND_TOOL_URL`.
 
 Examples live in `examples`.
 

package/dist/api.d.ts

@@ -105,7 +105,6 @@ export type AppListItem = {
     gitRepo: string | null;
     gitProvider: string | null;
     gitHost: string | null;
-    internalToolName: string | null;
     defaultBranch: string | null;
     createdAt: string;
     updatedAt: string;

package/dist/cli.js

@@ -434,6 +434,15 @@ import os2 from "node:os";
 import path2 from "node:path";
 var GLOBAL_DIRNAME = ".openpond";
 var GLOBAL_CONFIG_FILENAME = "config.json";
+var DEFAULT_ACCOUNT_HANDLE = "default";
+var ACCOUNT_SCOPED_KEYS = [
+  "apiKey",
+  "baseUrl",
+  "token",
+  "deviceCode",
+  "appId",
+  "conversationId"
+];
 function getGlobalConfigPath() {
   return path2.join(os2.homedir(), GLOBAL_DIRNAME, GLOBAL_CONFIG_FILENAME);
 }
@@ -445,29 +454,254 @@ async function loadConfigFile(filePath) {
     return {};
   }
 }
-async function loadGlobalConfig() {
-  return loadConfigFile(getGlobalConfigPath());
+function hasOwn(value, key) {
+  return Object.prototype.hasOwnProperty.call(value, key);
 }
-async function loadConfig() {
-  return loadGlobalConfig();
+function normalizeHandle(value) {
+  if (typeof value !== "string")
+    return null;
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : null;
 }
-async function saveGlobalConfig(next) {
-  const filePath = getGlobalConfigPath();
-  await fs2.mkdir(path2.dirname(filePath), { recursive: true });
-  const current = await loadGlobalConfig();
-  const merged = { ...current };
-  for (const [key, value] of Object.entries(next)) {
-    if (value === undefined)
+function handleEquals(left, right) {
+  return left.trim().toLowerCase() === right.trim().toLowerCase();
+}
+function findAccountIndex(accounts, handle) {
+  return accounts.findIndex((candidate) => handleEquals(candidate.handle, handle));
+}
+function sanitizeSession(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return;
+  }
+  const input = value;
+  const out = {};
+  if (typeof input.token === "string")
+    out.token = input.token;
+  if (typeof input.deviceCode === "string" || input.deviceCode === null) {
+    out.deviceCode = input.deviceCode;
+  }
+  if (typeof input.appId === "string" || input.appId === null) {
+    out.appId = input.appId;
+  }
+  if (typeof input.conversationId === "string" || input.conversationId === null) {
+    out.conversationId = input.conversationId;
+  }
+  return Object.keys(out).length > 0 ? out : undefined;
+}
+function sanitizeAccount(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value))
+    return null;
+  const input = value;
+  const handle = normalizeHandle(typeof input.handle === "string" ? input.handle : undefined);
+  if (!handle)
+    return null;
+  const out = { handle };
+  if (typeof input.apiKey === "string")
+    out.apiKey = input.apiKey;
+  if (typeof input.baseUrl === "string")
+    out.baseUrl = input.baseUrl;
+  if (typeof input.environment === "string")
+    out.environment = input.environment;
+  const session = sanitizeSession(input.session);
+  if (session)
+    out.session = session;
+  return out;
+}
+function extractLegacySession(raw) {
+  const session = {};
+  if (typeof raw.token === "string")
+    session.token = raw.token;
+  if (typeof raw.deviceCode === "string" || raw.deviceCode === null) {
+    session.deviceCode = raw.deviceCode;
+  }
+  if (typeof raw.appId === "string" || raw.appId === null) {
+    session.appId = raw.appId;
+  }
+  if (typeof raw.conversationId === "string" || raw.conversationId === null) {
+    session.conversationId = raw.conversationId;
+  }
+  return Object.keys(session).length > 0 ? session : undefined;
+}
+function extractLegacyAccount(raw, handle) {
+  const out = { handle };
+  if (typeof raw.apiKey === "string")
+    out.apiKey = raw.apiKey;
+  if (typeof raw.baseUrl === "string")
+    out.baseUrl = raw.baseUrl;
+  const session = extractLegacySession(raw);
+  if (session)
+    out.session = session;
+  return out;
+}
+function normalizeGlobalConfig(raw) {
+  const normalized = {};
+  if (typeof raw.lspEnabled === "boolean")
+    normalized.lspEnabled = raw.lspEnabled;
+  if (raw.executionMode === "local" || raw.executionMode === "hosted") {
+    normalized.executionMode = raw.executionMode;
+  }
+  if (raw.mode === "general" || raw.mode === "builder") {
+    normalized.mode = raw.mode;
+  }
+  const accounts = [];
+  const sourceAccounts = Array.isArray(raw.accounts) ? raw.accounts : [];
+  for (const candidate of sourceAccounts) {
+    const account = sanitizeAccount(candidate);
+    if (!account)
       continue;
-    if (value === null) {
-      delete merged[key];
-    } else {
-      merged[key] = value;
+    if (findAccountIndex(accounts, account.handle) !== -1)
+      continue;
+    accounts.push(account);
+  }
+  if (accounts.length === 0) {
+    const legacyHandle = normalizeHandle(raw.activeHandle) || DEFAULT_ACCOUNT_HANDLE;
+    accounts.push(extractLegacyAccount(raw, legacyHandle));
+  }
+  const requested = normalizeHandle(raw.activeHandle);
+  const resolvedHandle = requested && findAccountIndex(accounts, requested) !== -1 ? accounts[findAccountIndex(accounts, requested)].handle : accounts[0].handle;
+  normalized.accounts = accounts;
+  normalized.activeHandle = resolvedHandle;
+  return normalized;
+}
+function resolveRequestedHandle(global, explicitAccount) {
+  const accounts = global.accounts ?? [];
+  const requested = normalizeHandle(explicitAccount) || normalizeHandle(process.env.OPENPOND_ACCOUNT) || normalizeHandle(global.activeHandle) || accounts[0]?.handle || DEFAULT_ACCOUNT_HANDLE;
+  const idx = findAccountIndex(accounts, requested);
+  return idx === -1 ? requested : accounts[idx].handle;
+}
+function ensureAccount(accounts, handle) {
+  const idx = findAccountIndex(accounts, handle);
+  if (idx !== -1) {
+    return accounts[idx];
+  }
+  const next = { handle };
+  accounts.push(next);
+  return next;
+}
+function cleanupAccount(account) {
+  if (account.session && Object.keys(account.session).length === 0) {
+    delete account.session;
+  }
+}
+function applyScopedKey(account, key, value, options) {
+  const shouldDelete = value === null || value === undefined && options.undefinedDeletes;
+  switch (key) {
+    case "apiKey": {
+      if (shouldDelete) {
+        delete account.apiKey;
+        return;
+      }
+      if (typeof value === "string") {
+        account.apiKey = value;
+      }
+      return;
     }
+    case "baseUrl": {
+      if (shouldDelete) {
+        delete account.baseUrl;
+        return;
+      }
+      if (typeof value === "string") {
+        account.baseUrl = value;
+      }
+      return;
+    }
+    case "token":
+    case "deviceCode":
+    case "appId":
+    case "conversationId": {
+      if (!account.session)
+        account.session = {};
+      if (shouldDelete) {
+        delete account.session[key];
+        cleanupAccount(account);
+        return;
+      }
+      if (typeof value === "string" || value === null) {
+        account.session[key] = value;
+      }
+      cleanupAccount(account);
+      return;
+    }
+  }
+}
+function applyAccountPatch(global, source, options) {
+  const hasScopedPatch = ACCOUNT_SCOPED_KEYS.some((key) => hasOwn(source, key));
+  if (!hasScopedPatch)
+    return false;
+  const accounts = global.accounts ?? [];
+  const handle = resolveRequestedHandle(global, source.activeHandle);
+  const account = ensureAccount(accounts, handle);
+  for (const key of ACCOUNT_SCOPED_KEYS) {
+    if (!hasOwn(source, key))
+      continue;
+    applyScopedKey(account, key, source[key], options);
+  }
+  global.accounts = accounts;
+  global.activeHandle = handle;
+  return true;
+}
+function applyTopLevelPatch(global, source) {
+  if (hasOwn(source, "lspEnabled")) {
+    if (typeof source.lspEnabled === "boolean") {
+      global.lspEnabled = source.lspEnabled;
+    } else if (source.lspEnabled === null) {
+      delete global.lspEnabled;
+    }
+  }
+  if (hasOwn(source, "executionMode")) {
+    if (source.executionMode === "local" || source.executionMode === "hosted") {
+      global.executionMode = source.executionMode;
+    } else if (source.executionMode === null) {
+      delete global.executionMode;
+    }
+  }
+  if (hasOwn(source, "mode")) {
+    if (source.mode === "general" || source.mode === "builder") {
+      global.mode = source.mode;
+    } else if (source.mode === null) {
+      delete global.mode;
+    }
+  }
+  if (typeof source.activeHandle === "string" && source.activeHandle.trim().length > 0) {
+    const requested = resolveRequestedHandle(global, source.activeHandle);
+    global.activeHandle = requested;
   }
-  const payload = JSON.stringify(merged, null, 2);
+}
+async function writeGlobalConfig(next) {
+  const filePath = getGlobalConfigPath();
+  await fs2.mkdir(path2.dirname(filePath), { recursive: true });
+  const payload = JSON.stringify(next, null, 2);
   await fs2.writeFile(filePath, payload, "utf-8");
 }
+async function loadGlobalConfig() {
+  const raw = await loadConfigFile(getGlobalConfigPath());
+  return normalizeGlobalConfig(raw);
+}
+async function loadConfig(options = {}) {
+  const global = await loadGlobalConfig();
+  const accounts = global.accounts ?? [];
+  const requested = resolveRequestedHandle(global, options.account);
+  const idx = findAccountIndex(accounts, requested);
+  const account = idx === -1 ? null : accounts[idx];
+  const session = account?.session;
+  return {
+    ...global,
+    activeHandle: requested,
+    apiKey: account?.apiKey,
+    baseUrl: account?.baseUrl,
+    token: session?.token,
+    deviceCode: session?.deviceCode,
+    appId: session?.appId,
+    conversationId: session?.conversationId
+  };
+}
+async function saveGlobalConfig(next) {
+  const current = await loadGlobalConfig();
+  applyTopLevelPatch(current, next);
+  applyAccountPatch(current, next, { undefinedDeletes: false });
+  await writeGlobalConfig(current);
+}
 
 // src/stream.ts
 function normalizeDataFrames(raw) {
@@ -644,7 +878,7 @@ function formatStreamItem(item) {
 // src/cli-package.ts
 function parseArgs(argv) {
   const args = [...argv];
-  const command = args.shift() || "";
+  let command = "";
   const options = {};
   const rest = [];
   while (args.length > 0) {
@@ -655,11 +889,25 @@ function parseArgs(argv) {
       const value = args[0] && !args[0].startsWith("--") ? args.shift() : "true";
       options[key] = value;
     } else {
-      rest.push(next);
+      if (!command) {
+        command = next;
+      } else {
+        rest.push(next);
+      }
     }
   }
   return { command, options, rest };
 }
+function resolveAccountOption(options) {
+  const raw = typeof options.account === "string" ? options.account : typeof options.profile === "string" ? options.profile : null;
+  if (!raw)
+    return null;
+  const trimmed = raw.trim();
+  if (!trimmed || trimmed === "true") {
+    throw new Error("account must be a non-empty value");
+  }
+  return trimmed;
+}
 function resolveBaseUrl(config) {
   const envBase = process.env.OPENPOND_BASE_URL;
   const base = envBase || config.baseUrl || "https://openpond.ai";
@@ -759,7 +1007,7 @@ async function ensureApiKey(config, baseUrl) {
   if (existing)
     return existing;
   const apiKey = await promptForApiKey();
-  await saveGlobalConfig({ apiKey, baseUrl });
+  await saveGlobalConfig({ apiKey, baseUrl, activeHandle: config.activeHandle });
   console.log("saved api key to ~/.openpond/config.json");
   return apiKey;
 }
@@ -906,8 +1154,6 @@ async function resolveAppTarget(apiBase, apiKey, target) {
     const candidates = [
       app.repo,
       app.gitRepo,
-      app.internalToolName,
-      app.name,
       app.id
     ].map(normalizeRepoName);
     return candidates.includes(normalizedRepo);
@@ -1003,8 +1249,11 @@ function printHelp() {
   console.log("  openpond apps positions tx [--method <GET|POST>] [--body <json>] [--params <json>]");
   console.log("  openpond opentool <init|validate|build> [args]");
   console.log("");
+  console.log("Global options:");
+  console.log("  --account <name> (alias: --profile <name>)");
+  console.log("");
   console.log("Env:");
-  console.log("  OPENPOND_API_KEY, OPENPOND_BASE_URL, OPENPOND_API_URL, OPENPOND_TOOL_URL");
+  console.log("  OPENPOND_API_KEY, OPENPOND_ACCOUNT, OPENPOND_API_URL, OPENPOND_TOOL_URL");
 }
 async function runLogin(options) {
   const config = await loadConfig();
@@ -1017,7 +1266,7 @@ async function runLogin(options) {
   if (!apiKey.startsWith("opk_")) {
     console.log("warning: API keys usually start with opk_.");
   }
-  await saveGlobalConfig({ apiKey, baseUrl });
+  await saveGlobalConfig({ apiKey, baseUrl, activeHandle: config.activeHandle });
   console.log("saved api key to ~/.openpond/config.json");
 }
 async function runToolList(options, target) {
@@ -1354,7 +1603,7 @@ async function runAppsList(options) {
   }
   for (const app of filtered) {
     const owner = app.handle || app.gitOwner || "unknown";
-    const repo = app.repo || app.gitRepo || app.name || app.id;
+    const repo = app.repo || app.gitRepo || app.id;
     const status = app.latestDeployment?.status || "no-deploy";
     const branch = app.latestDeployment?.gitBranch || app.defaultBranch || "-";
     console.log(`${owner}/${repo}  ${status}  ${branch}  ${app.id}`);
@@ -1663,6 +1912,10 @@ async function runAppsTradeFacts(options) {
 }
 async function main() {
   const { command, options, rest } = parseArgs(process.argv.slice(2));
+  const selectedAccount = resolveAccountOption(options);
+  if (selectedAccount) {
+    process.env.OPENPOND_ACCOUNT = selectedAccount;
+  }
   if (!command || command === "help") {
     printHelp();
     return;

package/dist/config.d.ts

@@ -1,4 +1,19 @@
+export type LocalSessionConfig = {
+    token?: string;
+    deviceCode?: string | null;
+    appId?: string | null;
+    conversationId?: string | null;
+};
+export type LocalAccountConfig = {
+    handle: string;
+    apiKey?: string;
+    baseUrl?: string;
+    environment?: string;
+    session?: LocalSessionConfig;
+};
 export type LocalConfig = {
+    accounts?: LocalAccountConfig[];
+    activeHandle?: string;
     baseUrl?: string;
     apiKey?: string;
     token?: string;
@@ -9,8 +24,11 @@ export type LocalConfig = {
     executionMode?: "local" | "hosted";
     mode?: "general" | "builder";
 };
+export type LoadConfigOptions = {
+    account?: string;
+};
 export declare function getConfigPath(): string;
 export declare function loadGlobalConfig(): Promise<LocalConfig>;
-export declare function loadConfig(): Promise<LocalConfig>;
+export declare function loadConfig(options?: LoadConfigOptions): Promise<LocalConfig>;
 export declare function saveConfig(next: LocalConfig): Promise<void>;
 export declare function saveGlobalConfig(next: LocalConfig): Promise<void>;

package/dist/index.js

@@ -827,6 +827,15 @@ import os2 from "node:os";
 import path2 from "node:path";
 var GLOBAL_DIRNAME = ".openpond";
 var GLOBAL_CONFIG_FILENAME = "config.json";
+var DEFAULT_ACCOUNT_HANDLE = "default";
+var ACCOUNT_SCOPED_KEYS = [
+  "apiKey",
+  "baseUrl",
+  "token",
+  "deviceCode",
+  "appId",
+  "conversationId"
+];
 function getConfigPath() {
   return getGlobalConfigPath();
 }
@@ -841,34 +850,259 @@ async function loadConfigFile(filePath) {
     return {};
   }
 }
-async function loadGlobalConfig() {
-  return loadConfigFile(getGlobalConfigPath());
+function hasOwn(value, key) {
+  return Object.prototype.hasOwnProperty.call(value, key);
+}
+function normalizeHandle(value) {
+  if (typeof value !== "string")
+    return null;
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : null;
 }
-async function loadConfig() {
-  return loadGlobalConfig();
+function handleEquals(left, right) {
+  return left.trim().toLowerCase() === right.trim().toLowerCase();
 }
-async function saveConfig(next) {
+function findAccountIndex(accounts, handle) {
+  return accounts.findIndex((candidate) => handleEquals(candidate.handle, handle));
+}
+function sanitizeSession(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return;
+  }
+  const input = value;
+  const out = {};
+  if (typeof input.token === "string")
+    out.token = input.token;
+  if (typeof input.deviceCode === "string" || input.deviceCode === null) {
+    out.deviceCode = input.deviceCode;
+  }
+  if (typeof input.appId === "string" || input.appId === null) {
+    out.appId = input.appId;
+  }
+  if (typeof input.conversationId === "string" || input.conversationId === null) {
+    out.conversationId = input.conversationId;
+  }
+  return Object.keys(out).length > 0 ? out : undefined;
+}
+function sanitizeAccount(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value))
+    return null;
+  const input = value;
+  const handle = normalizeHandle(typeof input.handle === "string" ? input.handle : undefined);
+  if (!handle)
+    return null;
+  const out = { handle };
+  if (typeof input.apiKey === "string")
+    out.apiKey = input.apiKey;
+  if (typeof input.baseUrl === "string")
+    out.baseUrl = input.baseUrl;
+  if (typeof input.environment === "string")
+    out.environment = input.environment;
+  const session = sanitizeSession(input.session);
+  if (session)
+    out.session = session;
+  return out;
+}
+function extractLegacySession(raw) {
+  const session = {};
+  if (typeof raw.token === "string")
+    session.token = raw.token;
+  if (typeof raw.deviceCode === "string" || raw.deviceCode === null) {
+    session.deviceCode = raw.deviceCode;
+  }
+  if (typeof raw.appId === "string" || raw.appId === null) {
+    session.appId = raw.appId;
+  }
+  if (typeof raw.conversationId === "string" || raw.conversationId === null) {
+    session.conversationId = raw.conversationId;
+  }
+  return Object.keys(session).length > 0 ? session : undefined;
+}
+function extractLegacyAccount(raw, handle) {
+  const out = { handle };
+  if (typeof raw.apiKey === "string")
+    out.apiKey = raw.apiKey;
+  if (typeof raw.baseUrl === "string")
+    out.baseUrl = raw.baseUrl;
+  const session = extractLegacySession(raw);
+  if (session)
+    out.session = session;
+  return out;
+}
+function normalizeGlobalConfig(raw) {
+  const normalized = {};
+  if (typeof raw.lspEnabled === "boolean")
+    normalized.lspEnabled = raw.lspEnabled;
+  if (raw.executionMode === "local" || raw.executionMode === "hosted") {
+    normalized.executionMode = raw.executionMode;
+  }
+  if (raw.mode === "general" || raw.mode === "builder") {
+    normalized.mode = raw.mode;
+  }
+  const accounts = [];
+  const sourceAccounts = Array.isArray(raw.accounts) ? raw.accounts : [];
+  for (const candidate of sourceAccounts) {
+    const account = sanitizeAccount(candidate);
+    if (!account)
+      continue;
+    if (findAccountIndex(accounts, account.handle) !== -1)
+      continue;
+    accounts.push(account);
+  }
+  if (accounts.length === 0) {
+    const legacyHandle = normalizeHandle(raw.activeHandle) || DEFAULT_ACCOUNT_HANDLE;
+    accounts.push(extractLegacyAccount(raw, legacyHandle));
+  }
+  const requested = normalizeHandle(raw.activeHandle);
+  const resolvedHandle = requested && findAccountIndex(accounts, requested) !== -1 ? accounts[findAccountIndex(accounts, requested)].handle : accounts[0].handle;
+  normalized.accounts = accounts;
+  normalized.activeHandle = resolvedHandle;
+  return normalized;
+}
+function resolveRequestedHandle(global, explicitAccount) {
+  const accounts = global.accounts ?? [];
+  const requested = normalizeHandle(explicitAccount) || normalizeHandle(process.env.OPENPOND_ACCOUNT) || normalizeHandle(global.activeHandle) || accounts[0]?.handle || DEFAULT_ACCOUNT_HANDLE;
+  const idx = findAccountIndex(accounts, requested);
+  return idx === -1 ? requested : accounts[idx].handle;
+}
+function ensureAccount(accounts, handle) {
+  const idx = findAccountIndex(accounts, handle);
+  if (idx !== -1) {
+    return accounts[idx];
+  }
+  const next = { handle };
+  accounts.push(next);
+  return next;
+}
+function cleanupAccount(account) {
+  if (account.session && Object.keys(account.session).length === 0) {
+    delete account.session;
+  }
+}
+function applyScopedKey(account, key, value, options) {
+  const shouldDelete = value === null || value === undefined && options.undefinedDeletes;
+  switch (key) {
+    case "apiKey": {
+      if (shouldDelete) {
+        delete account.apiKey;
+        return;
+      }
+      if (typeof value === "string") {
+        account.apiKey = value;
+      }
+      return;
+    }
+    case "baseUrl": {
+      if (shouldDelete) {
+        delete account.baseUrl;
+        return;
+      }
+      if (typeof value === "string") {
+        account.baseUrl = value;
+      }
+      return;
+    }
+    case "token":
+    case "deviceCode":
+    case "appId":
+    case "conversationId": {
+      if (!account.session)
+        account.session = {};
+      if (shouldDelete) {
+        delete account.session[key];
+        cleanupAccount(account);
+        return;
+      }
+      if (typeof value === "string" || value === null) {
+        account.session[key] = value;
+      }
+      cleanupAccount(account);
+      return;
+    }
+  }
+}
+function applyAccountPatch(global, source, options) {
+  const hasScopedPatch = ACCOUNT_SCOPED_KEYS.some((key) => hasOwn(source, key));
+  if (!hasScopedPatch)
+    return false;
+  const accounts = global.accounts ?? [];
+  const handle = resolveRequestedHandle(global, source.activeHandle);
+  const account = ensureAccount(accounts, handle);
+  for (const key of ACCOUNT_SCOPED_KEYS) {
+    if (!hasOwn(source, key))
+      continue;
+    applyScopedKey(account, key, source[key], options);
+  }
+  global.accounts = accounts;
+  global.activeHandle = handle;
+  return true;
+}
+function applyTopLevelPatch(global, source) {
+  if (hasOwn(source, "lspEnabled")) {
+    if (typeof source.lspEnabled === "boolean") {
+      global.lspEnabled = source.lspEnabled;
+    } else if (source.lspEnabled === null) {
+      delete global.lspEnabled;
+    }
+  }
+  if (hasOwn(source, "executionMode")) {
+    if (source.executionMode === "local" || source.executionMode === "hosted") {
+      global.executionMode = source.executionMode;
+    } else if (source.executionMode === null) {
+      delete global.executionMode;
+    }
+  }
+  if (hasOwn(source, "mode")) {
+    if (source.mode === "general" || source.mode === "builder") {
+      global.mode = source.mode;
+    } else if (source.mode === null) {
+      delete global.mode;
+    }
+  }
+  if (typeof source.activeHandle === "string" && source.activeHandle.trim().length > 0) {
+    const requested = resolveRequestedHandle(global, source.activeHandle);
+    global.activeHandle = requested;
+  }
+}
+async function writeGlobalConfig(next) {
   const filePath = getGlobalConfigPath();
   await fs2.mkdir(path2.dirname(filePath), { recursive: true });
-  const payload = JSON.stringify(Object.fromEntries(Object.entries(next).filter(([, value]) => value !== undefined && value !== null)), null, 2);
+  const payload = JSON.stringify(next, null, 2);
   await fs2.writeFile(filePath, payload, "utf-8");
 }
+async function loadGlobalConfig() {
+  const raw = await loadConfigFile(getGlobalConfigPath());
+  return normalizeGlobalConfig(raw);
+}
+async function loadConfig(options = {}) {
+  const global = await loadGlobalConfig();
+  const accounts = global.accounts ?? [];
+  const requested = resolveRequestedHandle(global, options.account);
+  const idx = findAccountIndex(accounts, requested);
+  const account = idx === -1 ? null : accounts[idx];
+  const session = account?.session;
+  return {
+    ...global,
+    activeHandle: requested,
+    apiKey: account?.apiKey,
+    baseUrl: account?.baseUrl,
+    token: session?.token,
+    deviceCode: session?.deviceCode,
+    appId: session?.appId,
+    conversationId: session?.conversationId
+  };
+}
+async function saveConfig(next) {
+  const global = normalizeGlobalConfig(next);
+  applyTopLevelPatch(global, next);
+  applyAccountPatch(global, next, { undefinedDeletes: true });
+  await writeGlobalConfig(global);
+}
 async function saveGlobalConfig(next) {
-  const filePath = getGlobalConfigPath();
-  await fs2.mkdir(path2.dirname(filePath), { recursive: true });
   const current = await loadGlobalConfig();
-  const merged = { ...current };
-  for (const [key, value] of Object.entries(next)) {
-    if (value === undefined)
-      continue;
-    if (value === null) {
-      delete merged[key];
-    } else {
-      merged[key] = value;
-    }
-  }
-  const payload = JSON.stringify(merged, null, 2);
-  await fs2.writeFile(filePath, payload, "utf-8");
+  applyTopLevelPatch(current, next);
+  applyAccountPatch(current, next, { undefinedDeletes: false });
+  await writeGlobalConfig(current);
 }
 
 // src/index.ts
@@ -952,8 +1186,6 @@ async function resolveAppTarget(params) {
     const candidates = [
       app.repo,
       app.gitRepo,
-      app.internalToolName,
-      app.name,
       app.id
     ].map(normalizeRepoName);
     return candidates.includes(normalizedRepo);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openpond-code",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "description": "OpenPond CLI (API key only)",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",