@letta-ai/letta-code 0.24.5 → 0.24.6

package/letta.js

@@ -3269,7 +3269,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@letta-ai/letta-code",
-    version: "0.24.5",
+    version: "0.24.6",
     description: "Letta Code is a CLI tool for interacting with stateful Letta agents from the terminal.",
     type: "module",
     bin: {
@@ -4721,13 +4721,14 @@ var init_timing = __esm(() => {
 // src/agent/client.ts
 var exports_client = {};
 __export(exports_client, {
-  isDesktopLocalProxyUrl: () => isDesktopLocalProxyUrl,
   getServerUrl: () => getServerUrl,
   getMemfsServerUrl: () => getMemfsServerUrl,
+  getMemfsGitProxyRewriteConfig: () => getMemfsGitProxyRewriteConfig,
   getClient: () => getClient,
   consumeLastSDKDiagnostic: () => consumeLastSDKDiagnostic,
   clearLastSDKDiagnostic: () => clearLastSDKDiagnostic,
-  __testOverrideGetClient: () => __testOverrideGetClient
+  __testOverrideGetClient: () => __testOverrideGetClient,
+  LETTA_MEMFS_GIT_PROXY_BASE_URL_ENV: () => LETTA_MEMFS_GIT_PROXY_BASE_URL_ENV
 });
 import { hostname } from "node:os";
 function __testOverrideGetClient(factory) {
@@ -4785,8 +4786,29 @@ function isLocalhostUrl(value) {
     return false;
   }
 }
-function isDesktopLocalProxyUrl(value) {
-  return process.env.LETTA_DESKTOP_DEBUG_PANEL === "1" && isLocalhostUrl(value);
+function trimBaseUrl(value) {
+  return value.trim().replace(/\/+$/, "");
+}
+function getMemfsGitProxyRewriteConfig(env = process.env) {
+  const rawProxyBaseUrl = env[LETTA_MEMFS_GIT_PROXY_BASE_URL_ENV]?.trim();
+  if (!rawProxyBaseUrl || !isLocalhostUrl(rawProxyBaseUrl)) {
+    return null;
+  }
+  const memfsBaseUrl = trimBaseUrl(getMemfsServerUrl());
+  if (!memfsBaseUrl.includes("api.letta.com")) {
+    return null;
+  }
+  const proxyBaseUrl = trimBaseUrl(rawProxyBaseUrl);
+  const proxyPrefix = `${proxyBaseUrl}/v1/git/`;
+  const memfsPrefix = `${memfsBaseUrl}/v1/git/`;
+  return {
+    proxyBaseUrl,
+    memfsBaseUrl,
+    proxyPrefix,
+    memfsPrefix,
+    configKey: `url.${proxyPrefix}.insteadOf`,
+    configValue: memfsPrefix
+  };
 }
 function getMemfsServerUrl() {
   let settings = null;
@@ -4797,10 +4819,6 @@ function getMemfsServerUrl() {
   if (configuredMemfsUrl) {
     return configuredMemfsUrl;
   }
-  const apiUrl = process.env.LETTA_BASE_URL || settings?.env?.LETTA_BASE_URL;
-  if (apiUrl && isDesktopLocalProxyUrl(apiUrl)) {
-    return apiUrl;
-  }
   return LETTA_CLOUD_API_URL;
 }
 async function getClient() {
@@ -4876,7 +4894,7 @@ If you experience this issue multiple times, move ~/.letta to ~/.letta_backup, a
     ...isTimingsEnabled() && { fetch: createTimingFetch(fetch) }
   });
 }
-var SDK_DIAGNOSTIC_MAX_LEN = 400, SDK_DIAGNOSTIC_MAX_LINES = 4, lastSDKDiagnostic = null, _cachedApiKey, _testClientOverride = null, sdkLogger;
+var SDK_DIAGNOSTIC_MAX_LEN = 400, SDK_DIAGNOSTIC_MAX_LINES = 4, lastSDKDiagnostic = null, _cachedApiKey, _testClientOverride = null, sdkLogger, LETTA_MEMFS_GIT_PROXY_BASE_URL_ENV = "LETTA_MEMFS_GIT_PROXY_BASE_URL";
 var init_client2 = __esm(() => {
   init_letta_client();
   init_package();
@@ -38537,6 +38555,7 @@ var init_create = __esm(() => {
 var exports_memoryGit = {};
 __export(exports_memoryGit, {
   unsetMemoryRepositoryUrl: () => unsetMemoryRepositoryUrl,
+  shouldConfigurePersistentMemfsCredentialHelper: () => shouldConfigurePersistentMemfsCredentialHelper,
   setMemoryRepositoryUrl: () => setMemoryRepositoryUrl,
   removeGitMemoryTag: () => removeGitMemoryTag,
   readMemoryRepositoryPushLog: () => readMemoryRepositoryPushLog,
@@ -38548,6 +38567,7 @@ __export(exports_memoryGit, {
   isRetryableGitTransientError: () => isRetryableGitTransientError,
   isMissingCwdGitError: () => isMissingCwdGitError,
   isMemfsRemoteUrlForAgent: () => isMemfsRemoteUrlForAgent,
+  isMemfsGitNetworkCommand: () => isMemfsGitNetworkCommand,
   isGitRepo: () => isGitRepo,
   getMemoryRepositoryUrl: () => getMemoryRepositoryUrl,
   getMemoryRepoDir: () => getMemoryRepoDir,
@@ -38559,6 +38579,7 @@ __export(exports_memoryGit, {
   commitAndSyncMemoryWrite: () => commitAndSyncMemoryWrite,
   cloneMemoryRepo: () => cloneMemoryRepo,
   buildNonInteractiveGitEnv: () => buildNonInteractiveGitEnv,
+  buildMemfsGitProxyArgs: () => buildMemfsGitProxyArgs,
   buildGitAuthArgs: () => buildGitAuthArgs,
   assertMemoryRepoReadyForWrite: () => assertMemoryRepoReadyForWrite,
   addGitMemoryTag: () => addGitMemoryTag,
@@ -38679,6 +38700,22 @@ function buildGitAuthArgs(token) {
     `http.extraHeader=Authorization: Basic ${Buffer.from(`letta:${token}`).toString("base64")}`
   ];
 }
+function isMemfsGitNetworkCommand(args) {
+  return ["clone", "fetch", "pull", "push"].includes(args[0] ?? "");
+}
+function buildMemfsGitProxyArgs(args, env3 = process.env) {
+  if (!isMemfsGitNetworkCommand(args)) {
+    return [];
+  }
+  const rewrite = getMemfsGitProxyRewriteConfig(env3);
+  if (!rewrite) {
+    return [];
+  }
+  return ["-c", `${rewrite.configKey}=${rewrite.configValue}`];
+}
+function shouldConfigurePersistentMemfsCredentialHelper(env3 = process.env) {
+  return getMemfsGitProxyRewriteConfig(env3) === null;
+}
 function buildNonInteractiveGitEnv(env3 = process.env) {
   return {
     ...env3,
@@ -38690,7 +38727,7 @@ function buildNonInteractiveGitEnv(env3 = process.env) {
 }
 async function runGit(cwd2, args, token) {
   const authArgs = token ? buildGitAuthArgs(token) : [];
-  const allArgs = [...authArgs, ...args];
+  const allArgs = [...buildMemfsGitProxyArgs(args), ...authArgs, ...args];
   let loggableArgs = args;
   if (args[0] === "config" && typeof args[1] === "string" && args[1].includes("credential") && args[1].includes(".helper")) {
     loggableArgs = [args[0], args[1], "<redacted>"];
@@ -38754,6 +38791,11 @@ async function runGitWithRetry(cwd2, args, token, options) {
 async function configureLocalCredentialHelper(dir, token) {
   const rawBaseUrl = getMemfsServerUrl();
   const normalizedBaseUrl = normalizeCredentialBaseUrl(rawBaseUrl);
+  if (!shouldConfigurePersistentMemfsCredentialHelper()) {
+    await clearLocalCredentialHelper(dir, rawBaseUrl, normalizedBaseUrl);
+    debugLog("memfs-git", `Skipped persistent credential helper for ${normalizedBaseUrl}; using transient MemFS git proxy transport`);
+    return;
+  }
   let helper;
   if (platform2() === "win32") {
     const helperScriptPath = join7(dir, ".git", "letta-credential-helper.cmd");
@@ -38777,6 +38819,17 @@ echo password=${token}
   }
   debugLog("memfs-git", `Configured local credential helper for ${normalizedBaseUrl}${rawBaseUrl !== normalizedBaseUrl ? ` (and raw ${rawBaseUrl})` : ""}`);
 }
+async function clearLocalCredentialHelper(dir, rawBaseUrl, normalizedBaseUrl) {
+  const keys = new Set([
+    `credential.${normalizedBaseUrl}.helper`,
+    `credential.${rawBaseUrl}.helper`
+  ]);
+  for (const key of keys) {
+    try {
+      await runGit(dir, ["config", "--local", "--unset-all", key]);
+    } catch {}
+  }
+}
 function installPreCommitHook(dir) {
   const hooksDir = join7(dir, ".git", "hooks");
   const hookPath = join7(hooksDir, "pre-commit");
@@ -39027,6 +39080,32 @@ async function fetchMemoryRemote(memoryDir, token) {
     operation: "fetch origin"
   });
 }
+async function getMemoryAheadBehind(memoryDir) {
+  try {
+    const { stdout } = await runGit(memoryDir, [
+      "rev-list",
+      "--left-right",
+      "--count",
+      "HEAD...@{u}"
+    ]);
+    const [aheadRaw, behindRaw] = stdout.trim().split(/\s+/);
+    return {
+      ahead: Number.parseInt(aheadRaw ?? "0", 10) || 0,
+      behind: Number.parseInt(behindRaw ?? "0", 10) || 0
+    };
+  } catch {
+    return null;
+  }
+}
+async function pushCleanPendingMemoryCommitsForWrite(memoryDir, agentId, token) {
+  await prepareMemoryRepoForGitOps(memoryDir, agentId, token);
+  const divergence = await getMemoryAheadBehind(memoryDir);
+  if (divergence && divergence.ahead > 0) {
+    await runGitWithRetry(memoryDir, ["push"], token, {
+      operation: "push pending memory commits"
+    });
+  }
+}
 async function resetMemoryToUpstream(memoryDir, token) {
   await runGit(memoryDir, ["reset", "--hard", "@{u}"], token);
 }
@@ -39092,19 +39171,18 @@ async function recoverMemoryPushConflict(params, token, initialSha) {
     rescueRef
   };
 }
-async function assertMemoryRepoReadyForWrite(memoryDir) {
+async function assertMemoryRepoReadyForWrite(memoryDir, agentId) {
   const status = await runGit(memoryDir, ["status", "--porcelain"]);
   if (status.stdout.trim().length > 0) {
     throw new Error("Memory repo has uncommitted changes. Commit, discard, or sync them before using memory tools.");
   }
+  if (agentId) {
+    const token = await getAuthToken();
+    await pushCleanPendingMemoryCommitsForWrite(memoryDir, agentId, token);
+  }
   try {
-    const { stdout } = await runGit(memoryDir, [
-      "rev-list",
-      "--count",
-      "@{u}..HEAD"
-    ]);
-    const aheadCount = parseInt(stdout.trim(), 10);
-    if (aheadCount > 0) {
+    const divergence = await getMemoryAheadBehind(memoryDir);
+    if (divergence && divergence.ahead > 0) {
       throw new Error("Memory repo has local commits that are not pushed to remote. Sync the repo before using memory tools.");
     }
   } catch (error) {
@@ -49253,9 +49331,9 @@ function getServerHostLabel(serverUrl) {
   }
 }
 async function isLettaMemfsServer() {
-  const { getMemfsServerUrl: getMemfsServerUrl2, isDesktopLocalProxyUrl: isDesktopLocalProxyUrl2 } = await Promise.resolve().then(() => (init_client2(), exports_client));
+  const { getMemfsServerUrl: getMemfsServerUrl2 } = await Promise.resolve().then(() => (init_client2(), exports_client));
   const memfsServerUrl = getMemfsServerUrl2();
-  return memfsServerUrl.includes("api.letta.com") || isDesktopLocalProxyUrl2(memfsServerUrl) || process.env.LETTA_MEMFS_LOCAL === "1" || process.env.LETTA_API_KEY === "local-desktop";
+  return memfsServerUrl.includes("api.letta.com") || process.env.LETTA_MEMFS_LOCAL === "1" || process.env.LETTA_API_KEY === "local-desktop";
 }
 async function getMemfsSyncUnavailableMessage() {
   const { getMemfsServerUrl: getMemfsServerUrl2 } = await Promise.resolve().then(() => (init_client2(), exports_client));
@@ -54655,6 +54733,24 @@ exec ${commandWithArgs} "$@"
   });
   return shimDir;
 }
+function appendGitConfigEnv(env3, key, value) {
+  const rawCount = env3.GIT_CONFIG_COUNT;
+  const count = rawCount && /^\d+$/.test(rawCount) ? Number(rawCount) : 0;
+  env3[`GIT_CONFIG_KEY_${count}`] = key;
+  env3[`GIT_CONFIG_VALUE_${count}`] = value;
+  env3.GIT_CONFIG_COUNT = String(count + 1);
+}
+function applyMemfsGitProxyEnv(env3) {
+  const rewrite = getMemfsGitProxyRewriteConfig(env3);
+  if (!rewrite) {
+    return;
+  }
+  appendGitConfigEnv(env3, rewrite.configKey, rewrite.configValue);
+  env3.GIT_TERMINAL_PROMPT = "0";
+  env3.GCM_INTERACTIVE = "never";
+  env3.GIT_ASKPASS = "";
+  env3.SSH_ASKPASS = "";
+}
 function getShellEnv() {
   const env3 = { ...process.env };
   const pathKey = Object.keys(env3).find((k) => k.toUpperCase() === "PATH") || "PATH";
@@ -54742,6 +54838,7 @@ function getShellEnv() {
   if (!env3.TERM) {
     env3.TERM = "xterm-256color";
   }
+  applyMemfsGitProxyEnv(env3);
   return env3;
 }
 var LETTA_BIN_ARGS_ENV = "LETTA_CODE_BIN_ARGS_JSON";
@@ -56563,14 +56660,14 @@ async function memory(args) {
   }
   const memoryDir = resolveMemoryDir();
   ensureMemoryRepo(memoryDir);
-  await assertMemoryRepoReadyForWrite(memoryDir);
+  const { agentId, agentName } = await getAgentIdentity();
+  await assertMemoryRepoReadyForWrite(memoryDir, agentId);
   const affectedPaths = await applyMemoryCommand(memoryDir, args);
   if (affectedPaths.length === 0) {
     return {
       message: `Memory ${args.command} completed with no changed paths.`
     };
   }
-  const { agentId, agentName } = await getAgentIdentity();
   const commitResult = await commitAndSyncMemoryWrite({
     memoryDir,
     pathspecs: affectedPaths,
@@ -56948,12 +57045,12 @@ async function memory_apply_patch(args) {
   }
   const memoryDir = resolveMemoryDir2();
   ensureMemoryRepo2(memoryDir);
-  await assertMemoryRepoReadyForWrite(memoryDir);
+  const { agentId, agentName } = await getAgentIdentity2();
+  await assertMemoryRepoReadyForWrite(memoryDir, agentId);
   const pathspecs = await applyMemoryPatch(memoryDir, input);
   if (pathspecs.length === 0) {
     return { message: "memory_apply_patch completed with no changed paths." };
   }
-  const { agentId, agentName } = await getAgentIdentity2();
   const commitResult = await commitAndSyncMemoryWrite({
     memoryDir,
     pathspecs,
@@ -159519,9 +159616,9 @@ function getServerHostLabel2(serverUrl) {
   }
 }
 async function isLettaMemfsServer2() {
-  const { getMemfsServerUrl: getMemfsServerUrl2, isDesktopLocalProxyUrl: isDesktopLocalProxyUrl2 } = await Promise.resolve().then(() => (init_client2(), exports_client));
+  const { getMemfsServerUrl: getMemfsServerUrl2 } = await Promise.resolve().then(() => (init_client2(), exports_client));
   const memfsServerUrl = getMemfsServerUrl2();
-  return memfsServerUrl.includes("api.letta.com") || isDesktopLocalProxyUrl2(memfsServerUrl) || process.env.LETTA_MEMFS_LOCAL === "1" || process.env.LETTA_API_KEY === "local-desktop";
+  return memfsServerUrl.includes("api.letta.com") || process.env.LETTA_MEMFS_LOCAL === "1" || process.env.LETTA_API_KEY === "local-desktop";
 }
 async function getMemfsSyncUnavailableMessage2() {
   const { getMemfsServerUrl: getMemfsServerUrl2 } = await Promise.resolve().then(() => (init_client2(), exports_client));
@@ -167981,6 +168078,12 @@ Note: Flags should use double dashes for full names (e.g., --yolo, not -yolo)`);
   }
   const apiKey = process.env.LETTA_API_KEY || settings.env?.LETTA_API_KEY;
   const baseURL = process.env.LETTA_BASE_URL || settings.env?.LETTA_BASE_URL || LETTA_CLOUD_API_URL2;
+  if (isHeadless && baseURL === LETTA_CLOUD_API_URL2 && !process.env.LETTA_API_KEY) {
+    console.error("Missing LETTA_API_KEY");
+    console.error("Headless mode requires an API key set via the LETTA_API_KEY environment variable.");
+    console.error("Get an API key at https://app.letta.com/api-keys");
+    process.exit(1);
+  }
   if (!isHeadless && baseURL === LETTA_CLOUD_API_URL2 && !settings.refreshToken && !apiKey) {
     const { runSetup: runSetup2 } = await init_setup4().then(() => exports_setup);
     await runSetup2();
@@ -167996,11 +168099,6 @@ Error: ${message}`);
     });
   }
   if (!apiKey && baseURL === LETTA_CLOUD_API_URL2) {
-    if (isHeadless) {
-      console.error("Missing LETTA_API_KEY");
-      console.error("Run 'letta' in interactive mode to authenticate or export the missing environment variable");
-      process.exit(1);
-    }
     console.log(`No credentials found. Let's get you set up!
 `);
     const { runSetup: runSetup2 } = await init_setup4().then(() => exports_setup);
@@ -168849,4 +168947,4 @@ Error during initialization: ${message}`);
 }
 main();
 
-//# debugId=CB5FADB2FE73B65E64756E2164756E21
+//# debugId=00A382B05A86170664756E2164756E21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@letta-ai/letta-code",
-  "version": "0.24.5",
+  "version": "0.24.6",
   "description": "Letta Code is a CLI tool for interacting with stateful Letta agents from the terminal.",
   "type": "module",
   "bin": {