axconfig 3.0.1 → 3.2.0

package/dist/get-agent-runtime-environment.d.ts

@@ -9,29 +9,40 @@ import type { AgentCli } from "axshared";
 type GetAgentConfigEnvironmentResult = {
     ok: true;
     env: Record<string, string>;
+    warning: string | undefined;
 } | {
     ok: false;
     error: string;
 };
 /**
- * Get agent-specific environment variables for a custom config directory.
+ * Get agent-specific environment variables for custom directories.
  *
- * Computes the environment variables needed to run an agent with a specific
- * config directory. This handles agents that require the env var to point to
- * a parent directory (e.g., HOME for gemini, XDG_DATA_HOME for opencode).
+ * Computes the environment variables needed to run an agent with specific
+ * config and data directories. This handles agents that require env vars to
+ * point to parent directories (e.g., HOME for gemini, XDG paths for opencode).
+ *
+ * **Agents without separation** (Claude, Codex, Gemini, Copilot):
+ * - `configDirectory` and `dataDirectory` are interchangeable
+ * - Either can be provided alone to set both locations
+ *
+ * **Agents with separation** (OpenCode):
+ * - Directories are independent
+ * - If only `configDirectory` provided, data uses default location
+ * - If only `dataDirectory` provided, config uses default location
  *
  * @param agent - The agent CLI identifier
- * @param configDirectory - The config directory path (must end with expected suffix for some agents)
- * @returns Result with agent-specific env vars, or error if configDirectory is invalid
+ * @param configDirectory - Custom config directory (optional)
+ * @param dataDirectory - Custom data directory (optional)
+ * @returns Result with agent-specific env vars, warning, or error
  *
  * @example
  * // Claude: env var points directly to config dir
  * getAgentConfigEnvironment("claude", "/tmp/test/.claude")
- * // Returns: { ok: true, env: { CLAUDE_CONFIG_DIR: "/tmp/test/.claude" } }
+ * // Returns: { ok: true, env: { CLAUDE_CONFIG_DIR: "/tmp/test/.claude" }, warning: undefined }
  *
- * // Gemini: env var points to parent (HOME), config is in .gemini subdirectory
- * getAgentConfigEnvironment("gemini", "/tmp/test/.gemini")
- * // Returns: { ok: true, env: { HOME: "/tmp/test", GEMINI_FORCE_FILE_STORAGE: "true" } }
+ * // OpenCode with only configDir: data uses default
+ * getAgentConfigEnvironment("opencode", "/tmp/config/opencode")
+ * // Returns: { ok: true, env: { XDG_CONFIG_HOME: "/tmp/config", XDG_DATA_HOME: "/home/user/.local/share" }, warning: "..." }
  */
-declare function getAgentConfigEnvironment(agent: AgentCli, configDirectory: string): GetAgentConfigEnvironmentResult;
+declare function getAgentConfigEnvironment(agent: AgentCli, configDirectory?: string, dataDirectory?: string): GetAgentConfigEnvironmentResult;
 export { getAgentConfigEnvironment, type GetAgentConfigEnvironmentResult };

package/dist/get-agent-runtime-environment.js

@@ -5,44 +5,78 @@
  * with custom config directories. Delegates to axshared for path info.
  */
 import path from "node:path";
-import { buildAgentRuntimeEnvironment, getAgentConfigSubdirectory, } from "axshared";
+import { buildAgentRuntimeEnvironment, getAgentPathInfo, resolveAgentConfigDirectory, resolveAgentDataDirectory, resolveCustomDirectories, } from "axshared";
 /**
- * Get agent-specific environment variables for a custom config directory.
+ * Get agent-specific environment variables for custom directories.
  *
- * Computes the environment variables needed to run an agent with a specific
- * config directory. This handles agents that require the env var to point to
- * a parent directory (e.g., HOME for gemini, XDG_DATA_HOME for opencode).
+ * Computes the environment variables needed to run an agent with specific
+ * config and data directories. This handles agents that require env vars to
+ * point to parent directories (e.g., HOME for gemini, XDG paths for opencode).
+ *
+ * **Agents without separation** (Claude, Codex, Gemini, Copilot):
+ * - `configDirectory` and `dataDirectory` are interchangeable
+ * - Either can be provided alone to set both locations
+ *
+ * **Agents with separation** (OpenCode):
+ * - Directories are independent
+ * - If only `configDirectory` provided, data uses default location
+ * - If only `dataDirectory` provided, config uses default location
  *
  * @param agent - The agent CLI identifier
- * @param configDirectory - The config directory path (must end with expected suffix for some agents)
- * @returns Result with agent-specific env vars, or error if configDirectory is invalid
+ * @param configDirectory - Custom config directory (optional)
+ * @param dataDirectory - Custom data directory (optional)
+ * @returns Result with agent-specific env vars, warning, or error
  *
  * @example
  * // Claude: env var points directly to config dir
  * getAgentConfigEnvironment("claude", "/tmp/test/.claude")
- * // Returns: { ok: true, env: { CLAUDE_CONFIG_DIR: "/tmp/test/.claude" } }
+ * // Returns: { ok: true, env: { CLAUDE_CONFIG_DIR: "/tmp/test/.claude" }, warning: undefined }
  *
- * // Gemini: env var points to parent (HOME), config is in .gemini subdirectory
- * getAgentConfigEnvironment("gemini", "/tmp/test/.gemini")
- * // Returns: { ok: true, env: { HOME: "/tmp/test", GEMINI_FORCE_FILE_STORAGE: "true" } }
+ * // OpenCode with only configDir: data uses default
+ * getAgentConfigEnvironment("opencode", "/tmp/config/opencode")
+ * // Returns: { ok: true, env: { XDG_CONFIG_HOME: "/tmp/config", XDG_DATA_HOME: "/home/user/.local/share" }, warning: "..." }
  */
-function getAgentConfigEnvironment(agent, configDirectory) {
-    const subdirectory = getAgentConfigSubdirectory(agent);
-    const resolvedConfigDirectory = path.resolve(configDirectory);
-    // Validate subdirectory suffix for agents that require it
-    if (subdirectory !== undefined) {
-        const actualSuffix = path.basename(resolvedConfigDirectory);
-        if (actualSuffix !== subdirectory) {
+function getAgentConfigEnvironment(agent, configDirectory, dataDirectory) {
+    const pathInfo = getAgentPathInfo(agent);
+    // Resolve directories based on agent capabilities
+    const resolved = resolveCustomDirectories(agent, configDirectory, dataDirectory);
+    if (!resolved.ok) {
+        return { ok: false, error: resolved.error };
+    }
+    // Determine effective directories using resolved values or defaults
+    const effectiveConfigDirectory = resolved.configDir
+        ? path.resolve(resolved.configDir)
+        : resolveAgentConfigDirectory(agent);
+    const effectiveDataDirectory = resolved.dataDir
+        ? path.resolve(resolved.dataDir)
+        : resolveAgentDataDirectory(agent);
+    // Validate config subdirectory suffix for agents that require it
+    if (pathInfo.subdirectory !== undefined) {
+        const actualSuffix = path.basename(effectiveConfigDirectory);
+        if (actualSuffix !== pathInfo.subdirectory) {
+            return {
+                ok: false,
+                error: `Config directory for ${agent} must end with '${pathInfo.subdirectory}', got '${actualSuffix}'.\n` +
+                    `Expected path like: /some/path/${pathInfo.subdirectory}`,
+            };
+        }
+    }
+    // Validate data subdirectory suffix for agents that require it
+    const dataSubdirectory = pathInfo.dataSubdirectory ?? pathInfo.subdirectory;
+    if (dataSubdirectory !== undefined) {
+        const actualSuffix = path.basename(effectiveDataDirectory);
+        if (actualSuffix !== dataSubdirectory) {
             return {
                 ok: false,
-                error: `Config directory for ${agent} must end with '${subdirectory}', got '${actualSuffix}'.\n` +
-                    `Expected path like: /some/path/${subdirectory}`,
+                error: `Data directory for ${agent} must end with '${dataSubdirectory}', got '${actualSuffix}'.\n` +
+                    `Expected path like: /some/path/${dataSubdirectory}`,
             };
         }
     }
     return {
         ok: true,
-        env: buildAgentRuntimeEnvironment(agent, resolvedConfigDirectory),
+        env: buildAgentRuntimeEnvironment(agent, effectiveConfigDirectory, effectiveDataDirectory),
+        warning: resolved.warning,
     };
 }
 export { getAgentConfigEnvironment };

package/dist/types.d.ts

@@ -140,11 +140,17 @@ interface ConfigReader {
      */
     subdirectory: string | undefined;
     /**
-     * Build environment variables for running this agent with a custom config directory.
-     * @param basePath - The base path (parent of subdirectory, or config dir if no subdirectory)
+     * Build environment variables for running this agent with custom directories.
+     *
+     * For agents that support separate config and data directories (OpenCode),
+     * both paths can differ. For agents that don't support separation, both
+     * paths will typically be the same.
+     *
+     * @param configBasePath - The base path for configuration
+     * @param dataBasePath - The base path for data
      * @returns Environment variables to set for the agent
      */
-    buildRuntimeEnvironment: (basePath: string) => Record<string, string>;
+    buildRuntimeEnvironment: (configBasePath: string, dataBasePath: string) => Record<string, string>;
     /** Read permissions from agent config and translate to unified format */
     readPermissions: (configDirectory: string) => ReadPermissionsResult;
     /** Read model from agent config */

package/package.json

@@ -2,7 +2,7 @@
   "name": "axconfig",
   "author": "Łukasz Jerciński",
   "license": "MIT",
-  "version": "3.0.1",
+  "version": "3.2.0",
   "description": "Unified configuration management for AI coding agents - common API for permissions, settings, and config across Claude Code, Codex, Gemini CLI, and OpenCode",
   "repository": {
     "type": "git",
@@ -68,7 +68,7 @@
   "dependencies": {
     "@commander-js/extra-typings": "^14.0.0",
     "@iarna/toml": "^2.2.5",
-    "axshared": "^1.3.0",
+    "axshared": "^1.5.0",
     "commander": "^14.0.2"
   },
   "devDependencies": {