codexmate 0.0.3 → 0.0.4

package/cli.js

@@ -2,7 +2,8 @@
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
-const toml = require('@iarna/toml');
+const toml = require('@iarna/toml');
+const JSON5 = require('json5');
 const { exec, execSync } = require('child_process');
 const http = require('http');
 const https = require('https');
@@ -13,16 +14,19 @@ const PORT = 3737;
 // ============================================================================
 // 配置
 // ============================================================================
-const CONFIG_DIR = path.join(os.homedir(), '.codex');
-const CONFIG_FILE = path.join(CONFIG_DIR, 'config.toml');
-const AUTH_FILE = path.join(CONFIG_DIR, 'auth.json');
-const MODELS_FILE = path.join(CONFIG_DIR, 'models.json');
-const CURRENT_MODELS_FILE = path.join(CONFIG_DIR, 'provider-current-models.json');
-const INIT_MARK_FILE = path.join(CONFIG_DIR, 'codexmate-init.json');
-const CODEX_SESSIONS_DIR = path.join(CONFIG_DIR, 'sessions');
-const CLAUDE_DIR = path.join(os.homedir(), '.claude');
-const CLAUDE_SETTINGS_FILE = path.join(CLAUDE_DIR, 'settings.json');
-const CLAUDE_PROJECTS_DIR = path.join(os.homedir(), '.claude', 'projects');
+const CONFIG_DIR = path.join(os.homedir(), '.codex');
+const CONFIG_FILE = path.join(CONFIG_DIR, 'config.toml');
+const AUTH_FILE = path.join(CONFIG_DIR, 'auth.json');
+const MODELS_FILE = path.join(CONFIG_DIR, 'models.json');
+const CURRENT_MODELS_FILE = path.join(CONFIG_DIR, 'provider-current-models.json');
+const INIT_MARK_FILE = path.join(CONFIG_DIR, 'codexmate-init.json');
+const CODEX_SESSIONS_DIR = path.join(CONFIG_DIR, 'sessions');
+const OPENCLAW_DIR = path.join(os.homedir(), '.openclaw');
+const OPENCLAW_CONFIG_FILE = path.join(OPENCLAW_DIR, 'openclaw.json');
+const OPENCLAW_WORKSPACE_DIR = path.join(OPENCLAW_DIR, 'workspace');
+const CLAUDE_DIR = path.join(os.homedir(), '.claude');
+const CLAUDE_SETTINGS_FILE = path.join(CLAUDE_DIR, 'settings.json');
+const CLAUDE_PROJECTS_DIR = path.join(os.homedir(), '.claude', 'projects');
 
 const DEFAULT_MODELS = ['gpt-5.3-codex', 'gpt-5.1-codex-max', 'gpt-4-turbo', 'gpt-4'];
 const SPEED_TEST_TIMEOUT_MS = 8000;
@@ -34,8 +38,8 @@ const SESSION_TITLE_READ_BYTES = 64 * 1024;
 const CODEXMATE_MANAGED_MARKER = '# codexmate-managed: true';
 const SESSION_LIST_CACHE_TTL_MS = 4000;
 const SESSION_SUMMARY_READ_BYTES = 256 * 1024;
-const SESSION_CONTENT_READ_BYTES = SESSION_SUMMARY_READ_BYTES;
-const DEFAULT_CONTENT_SCAN_LIMIT = 10;
+const SESSION_CONTENT_READ_BYTES = SESSION_SUMMARY_READ_BYTES;
+const DEFAULT_CONTENT_SCAN_LIMIT = 10;
 const SESSION_SCAN_FACTOR = 4;
 const SESSION_SCAN_MIN_FILES = 800;
 const MAX_SESSION_PATH_LIST_SIZE = 2000;
@@ -228,11 +232,11 @@ function readAgentsFile(params = {}) {
     }
 }
 
-function applyAgentsFile(params = {}) {
-    const filePath = resolveAgentsFilePath(params);
-    const dirCheck = validateAgentsBaseDir(filePath);
-    if (dirCheck.error) {
-        return { error: dirCheck.error };
+function applyAgentsFile(params = {}) {
+    const filePath = resolveAgentsFilePath(params);
+    const dirCheck = validateAgentsBaseDir(filePath);
+    if (dirCheck.error) {
+        return { error: dirCheck.error };
     }
 
     const content = typeof params.content === 'string' ? params.content : '';
@@ -243,10 +247,165 @@ function applyAgentsFile(params = {}) {
     try {
         fs.writeFileSync(filePath, finalContent, 'utf-8');
         return { success: true, path: filePath };
-    } catch (e) {
-        return { error: `写入 AGENTS.md 失败: ${e.message}` };
-    }
-}
+    } catch (e) {
+        return { error: `写入 AGENTS.md 失败: ${e.message}` };
+    }
+}
+
+function resolveHomePath(input) {
+    const raw = typeof input === 'string' ? input.trim() : '';
+    if (!raw) return '';
+    if (raw === '~') return os.homedir();
+    if (raw.startsWith('~/') || raw.startsWith('~\\')) {
+        return path.join(os.homedir(), raw.slice(2));
+    }
+    return raw;
+}
+
+function resolveOpenclawWorkspaceDir(config) {
+    const workspace = config
+        && config.agents
+        && config.agents.defaults
+        && typeof config.agents.defaults.workspace === 'string'
+        ? config.agents.defaults.workspace
+        : '';
+    const resolved = resolveHomePath(workspace);
+    if (!resolved) {
+        return OPENCLAW_WORKSPACE_DIR;
+    }
+    if (path.isAbsolute(resolved)) {
+        return resolved;
+    }
+    return path.join(OPENCLAW_DIR, resolved);
+}
+
+function readOpenclawConfigFile() {
+    const filePath = OPENCLAW_CONFIG_FILE;
+    if (!fs.existsSync(filePath)) {
+        return {
+            exists: false,
+            path: filePath,
+            content: '',
+            lineEnding: os.EOL === '\r\n' ? '\r\n' : '\n'
+        };
+    }
+
+    try {
+        const raw = fs.readFileSync(filePath, 'utf-8');
+        return {
+            exists: true,
+            path: filePath,
+            content: stripUtf8Bom(raw),
+            lineEnding: detectLineEnding(raw)
+        };
+    } catch (e) {
+        return { error: `读取 OpenClaw 配置失败: ${e.message}` };
+    }
+}
+
+function parseOpenclawConfigText(content) {
+    const raw = stripUtf8Bom(typeof content === 'string' ? content : '');
+    if (!raw.trim()) {
+        return { ok: false, error: 'OpenClaw 配置内容不能为空' };
+    }
+    try {
+        const parsed = JSON5.parse(raw);
+        if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+            return { ok: false, error: '配置格式错误（根节点必须是对象）' };
+        }
+        return { ok: true, data: parsed };
+    } catch (e) {
+        return { ok: false, error: `配置解析失败: ${e.message}` };
+    }
+}
+
+function getOpenclawWorkspaceInfo() {
+    const readResult = readOpenclawConfigFile();
+    let workspaceDir = OPENCLAW_WORKSPACE_DIR;
+    let configError = readResult.error || '';
+    if (!configError && readResult.exists && readResult.content.trim()) {
+        const parsed = parseOpenclawConfigText(readResult.content);
+        if (parsed.ok) {
+            workspaceDir = resolveOpenclawWorkspaceDir(parsed.data);
+        } else {
+            configError = parsed.error || '';
+        }
+    }
+    return {
+        workspaceDir,
+        configError,
+        configPath: readResult.path || OPENCLAW_CONFIG_FILE
+    };
+}
+
+function readOpenclawAgentsFile() {
+    const workspaceInfo = getOpenclawWorkspaceInfo();
+    const baseDir = workspaceInfo.workspaceDir;
+    const filePath = path.join(baseDir, AGENTS_FILE_NAME);
+
+    if (!fs.existsSync(baseDir)) {
+        return {
+            exists: false,
+            path: filePath,
+            content: '',
+            lineEnding: os.EOL === '\r\n' ? '\r\n' : '\n',
+            workspaceDir: baseDir,
+            configError: workspaceInfo.configError,
+            baseDirMissing: true
+        };
+    }
+
+    const readResult = readAgentsFile({ baseDir });
+    return {
+        ...readResult,
+        workspaceDir: baseDir,
+        configError: workspaceInfo.configError
+    };
+}
+
+function applyOpenclawAgentsFile(params = {}) {
+    const workspaceInfo = getOpenclawWorkspaceInfo();
+    const baseDir = workspaceInfo.workspaceDir;
+    ensureDir(baseDir);
+    const result = applyAgentsFile({
+        ...params,
+        baseDir
+    });
+    return {
+        ...result,
+        workspaceDir: baseDir,
+        configError: workspaceInfo.configError
+    };
+}
+
+function applyOpenclawConfig(params = {}) {
+    const content = typeof params.content === 'string' ? params.content : '';
+    const lineEnding = params.lineEnding === '\r\n' ? '\r\n' : '\n';
+    const normalized = normalizeLineEnding(content, lineEnding);
+    const parsed = parseOpenclawConfigText(normalized);
+    if (!parsed.ok) {
+        return { success: false, error: parsed.error };
+    }
+
+    try {
+        ensureDir(OPENCLAW_DIR);
+        const backupPath = backupFileIfNeededOnce(OPENCLAW_CONFIG_FILE);
+        fs.writeFileSync(OPENCLAW_CONFIG_FILE, normalized, 'utf-8');
+        const result = {
+            success: true,
+            targetPath: OPENCLAW_CONFIG_FILE
+        };
+        if (backupPath) {
+            result.backupPath = backupPath;
+        }
+        return result;
+    } catch (e) {
+        return {
+            success: false,
+            error: e.message || '写入 OpenClaw 配置失败'
+        };
+    }
+}
 
 function readJsonObjectFromFile(filePath, fallback = {}) {
     if (!fs.existsSync(filePath)) {
@@ -996,23 +1155,23 @@ function scanSessionContentForQuery(session, tokens, options = {}) {
         ? Math.max(0, Number(options.snippetLimit))
         : 0;
 
-    const messages = [];
-    for (const record of records) {
-        const message = extractMessageFromRecord(record, session.source);
-        if (!message || !message.text) {
-            continue;
-        }
-        messages.push(message);
-    }
-
-    const filteredMessages = roleFilter === 'system'
-        ? messages
-        : removeLeadingSystemMessage(messages);
-
-    let count = 0;
-    const snippets = [];
-
-    for (const message of filteredMessages) {
+    const messages = [];
+    for (const record of records) {
+        const message = extractMessageFromRecord(record, session.source);
+        if (!message || !message.text) {
+            continue;
+        }
+        messages.push(message);
+    }
+
+    const filteredMessages = roleFilter === 'system'
+        ? messages
+        : removeLeadingSystemMessage(messages);
+
+    let count = 0;
+    const snippets = [];
+
+    for (const message of filteredMessages) {
         if (roleFilter !== 'all' && message.role !== roleFilter) {
             continue;
         }
@@ -1039,11 +1198,11 @@ function applySessionQueryFilter(sessions, options = {}) {
     }
 
     const mode = normalizeQueryMode(options.queryMode);
-    const scope = normalizeQueryScope(options.queryScope);
-    const roleFilter = normalizeRoleFilter(options.roleFilter);
-    const contentScanLimit = Number.isFinite(Number(options.contentScanLimit))
-        ? Math.max(1, Number(options.contentScanLimit))
-        : DEFAULT_CONTENT_SCAN_LIMIT;
+    const scope = normalizeQueryScope(options.queryScope);
+    const roleFilter = normalizeRoleFilter(options.roleFilter);
+    const contentScanLimit = Number.isFinite(Number(options.contentScanLimit))
+        ? Math.max(1, Number(options.contentScanLimit))
+        : DEFAULT_CONTENT_SCAN_LIMIT;
     const contentScanBytes = Number.isFinite(Number(options.contentScanBytes))
         ? Math.max(1024, Number(options.contentScanBytes))
         : SESSION_CONTENT_READ_BYTES;
@@ -1095,7 +1254,7 @@ function applySessionQueryFilter(sessions, options = {}) {
 
     return results;
 }
-function collectRecentJsonlFiles(rootDir, options = {}) {
+function collectRecentJsonlFiles(rootDir, options = {}) {
     if (!fs.existsSync(rootDir)) {
         return [];
     }
@@ -1553,18 +1712,18 @@ function listAllSessions(params = {}) {
         sessions = sessions.filter(item => matchesSessionPathFilter(item, normalizedPathFilter));
     }
 
-    let result = sessions;
-    if (hasQuery) {
-        result = applySessionQueryFilter(result, {
-            tokens: queryTokens,
-            queryMode: params.queryMode,
-            queryScope: params.queryScope,
-            roleFilter: params.roleFilter,
-            contentScanLimit: params.contentScanLimit,
-            contentScanBytes: params.contentScanBytes
-        });
-    }
-    result = mergeAndLimitSessions(result, limit);
+    let result = sessions;
+    if (hasQuery) {
+        result = applySessionQueryFilter(result, {
+            tokens: queryTokens,
+            queryMode: params.queryMode,
+            queryScope: params.queryScope,
+            roleFilter: params.roleFilter,
+            contentScanLimit: params.contentScanLimit,
+            contentScanBytes: params.contentScanBytes
+        });
+    }
+    result = mergeAndLimitSessions(result, limit);
     if (!hasQuery) {
         setSessionListCache(cacheKey, result);
     }
@@ -2853,15 +3012,27 @@ function cmdStart() {
                         case 'apply-config-template':
                             result = applyConfigTemplate(params || {});
                             break;
-                        case 'get-agents-file':
-                            result = readAgentsFile(params || {});
-                            break;
-                        case 'apply-agents-file':
-                            result = applyAgentsFile(params || {});
-                            break;
-                        case 'switch':
-                        case 'use':
-                        case 'add':
+                        case 'get-agents-file':
+                            result = readAgentsFile(params || {});
+                            break;
+                        case 'apply-agents-file':
+                            result = applyAgentsFile(params || {});
+                            break;
+                        case 'get-openclaw-config':
+                            result = readOpenclawConfigFile();
+                            break;
+                        case 'apply-openclaw-config':
+                            result = applyOpenclawConfig(params || {});
+                            break;
+                        case 'get-openclaw-agents-file':
+                            result = readOpenclawAgentsFile();
+                            break;
+                        case 'apply-openclaw-agents-file':
+                            result = applyOpenclawAgentsFile(params || {});
+                            break;
+                        case 'switch':
+                        case 'use':
+                        case 'add':
                         case 'delete':
                         case 'update':
                             result = { error: 'Codex 配置改动已切换为模板确认模式，请使用模板编辑器并手动确认应用。' };

package/cmd/publish-npm.cmd

@@ -1,65 +1,65 @@
-@echo off
-setlocal enableextensions
-set "VERBOSE_ECHO=0"
-if /i "%VERBOSE%"=="1" (
-  set "VERBOSE_ECHO=1"
-  @echo on
-  set "NPM_CONFIG_LOGLEVEL=notice"
-)
-
-set "REGISTRY=https://registry.npmjs.org/"
-set "PUBLISH_RC=1"
-for %%I in ("%~dp0..") do set "ROOT_DIR=%%~fI"
-set "LOCAL_NPMRC=%ROOT_DIR%\.npmrc"
-
-where npm >nul 2>&1
-if errorlevel 1 (
-  echo npm not found in PATH.
-  exit /b 1
-)
-
-if "%NPM_TOKEN%"=="" (
-  if exist "%LOCAL_NPMRC%" (
-    if "%VERBOSE_ECHO%"=="1" @echo off
-    for /f "usebackq tokens=2,* delims==" %%A in (`findstr /i /c:"_authToken=" "%LOCAL_NPMRC%"`) do (
-      if "%%B"=="" (@set "NPM_TOKEN=%%A") else (@set "NPM_TOKEN=%%A=%%B")
-    )
-    if "%VERBOSE_ECHO%"=="1" @echo on
-  )
-)
-if "%VERBOSE_ECHO%"=="1" @echo off
-if "%NPM_TOKEN%"=="" (
-  echo NPM_TOKEN is not set and no token found in %LOCAL_NPMRC%.
-  exit /b 1
-)
-if "%VERBOSE_ECHO%"=="1" @echo on
-
-set "TMP_NPMRC=%TEMP%\npmrc-codexmate-publish-%RANDOM%.tmp"
-if "%VERBOSE_ECHO%"=="1" @echo off
-> "%TMP_NPMRC%" echo //registry.npmjs.org/:_authToken=%NPM_TOKEN%
-if "%VERBOSE_ECHO%"=="1" @echo on
-set "NPM_CONFIG_USERCONFIG=%TMP_NPMRC%"
-set "NPM_CONFIG_REGISTRY=%REGISTRY%"
-
-call npm whoami --registry %REGISTRY%
-if errorlevel 1 goto cleanup
-
-echo [step] npm pack --dry-run
-call npm pack --dry-run --registry %REGISTRY%
-if errorlevel 1 goto cleanup
-
-echo [step] npm publish
-if not "%~1"=="" (
-  call npm publish --registry %REGISTRY% --otp %~1
-) else if not "%NPM_OTP%"=="" (
-  call npm publish --registry %REGISTRY% --otp %NPM_OTP%
-) else (
-  call npm publish --registry %REGISTRY%
-)
-set "PUBLISH_RC=%ERRORLEVEL%"
-
-goto cleanup
-
-:cleanup
-if exist "%TMP_NPMRC%" del /f /q "%TMP_NPMRC%"
-exit /b %PUBLISH_RC%
+@echo off
+setlocal enableextensions
+set "VERBOSE_ECHO=0"
+if /i "%VERBOSE%"=="1" (
+  set "VERBOSE_ECHO=1"
+  @echo on
+  set "NPM_CONFIG_LOGLEVEL=notice"
+)
+
+set "REGISTRY=https://registry.npmjs.org/"
+set "PUBLISH_RC=1"
+for %%I in ("%~dp0..") do set "ROOT_DIR=%%~fI"
+set "LOCAL_NPMRC=%ROOT_DIR%\.npmrc"
+
+where npm >nul 2>&1
+if errorlevel 1 (
+  echo npm not found in PATH.
+  exit /b 1
+)
+
+if "%NPM_TOKEN%"=="" (
+  if exist "%LOCAL_NPMRC%" (
+    if "%VERBOSE_ECHO%"=="1" @echo off
+    for /f "usebackq tokens=2,* delims==" %%A in (`findstr /i /c:"_authToken=" "%LOCAL_NPMRC%"`) do (
+      if "%%B"=="" (@set "NPM_TOKEN=%%A") else (@set "NPM_TOKEN=%%A=%%B")
+    )
+    if "%VERBOSE_ECHO%"=="1" @echo on
+  )
+)
+if "%VERBOSE_ECHO%"=="1" @echo off
+if "%NPM_TOKEN%"=="" (
+  echo NPM_TOKEN is not set and no token found in %LOCAL_NPMRC%.
+  exit /b 1
+)
+if "%VERBOSE_ECHO%"=="1" @echo on
+
+set "TMP_NPMRC=%TEMP%\npmrc-codexmate-publish-%RANDOM%.tmp"
+if "%VERBOSE_ECHO%"=="1" @echo off
+> "%TMP_NPMRC%" echo //registry.npmjs.org/:_authToken=%NPM_TOKEN%
+if "%VERBOSE_ECHO%"=="1" @echo on
+set "NPM_CONFIG_USERCONFIG=%TMP_NPMRC%"
+set "NPM_CONFIG_REGISTRY=%REGISTRY%"
+
+call npm whoami --registry %REGISTRY%
+if errorlevel 1 goto cleanup
+
+echo [step] npm pack --dry-run
+call npm pack --dry-run --registry %REGISTRY%
+if errorlevel 1 goto cleanup
+
+echo [step] npm publish
+if not "%~1"=="" (
+  call npm publish --registry %REGISTRY% --otp %~1
+) else if not "%NPM_OTP%"=="" (
+  call npm publish --registry %REGISTRY% --otp %NPM_OTP%
+) else (
+  call npm publish --registry %REGISTRY%
+)
+set "PUBLISH_RC=%ERRORLEVEL%"
+
+goto cleanup
+
+:cleanup
+if exist "%TMP_NPMRC%" del /f /q "%TMP_NPMRC%"
+exit /b %PUBLISH_RC%

package/package.json

@@ -1,25 +1,27 @@
-{
-  "name": "codexmate",
-  "version": "0.0.3",
-  "description": "Codex 提供商管理 CLI 工具",
-  "bin": {
-    "codexmate": "./cli.js"
-  },
-  "scripts": {
-    "start": "node cli.js"
-  },
-  "dependencies": {
-    "@iarna/toml": "^2.2.5"
-  },
-  "engines": {
-    "node": ">=14"
-  },
-  "keywords": [
-    "codex",
-    "ai",
-    "llm",
-    "cli"
-  ],
-  "author": "ymkiux",
-  "license": "Apache-2.0"
-}
+{
+  "name": "codexmate",
+  "version": "0.0.4",
+  "description": "Codex 提供商管理 CLI 工具",
+  "bin": {
+    "codexmate": "./cli.js"
+  },
+  "scripts": {
+    "start": "node cli.js"
+  },
+  "dependencies": {
+    "@iarna/toml": "^2.2.5",
+    "json5": "^2.2.3"
+  },
+  "engines": {
+    "node": ">=14"
+  },
+  "keywords": [
+    "codex",
+    "ai",
+    "llm",
+    "cli"
+  ],
+  "author": "ymkiux",
+  "license": "Apache-2.0"
+}
+