aws-runtime-bridge 1.9.10 → 1.9.21

package/dist/routes/git.js

@@ -6,6 +6,7 @@
 import { spawn } from 'node:child_process';
 import { promises as fs } from 'node:fs';
 import path from 'node:path';
+import axios from 'axios';
 import { Router } from 'express';
 import { validateToken } from '../middleware/auth.js';
 import { logger } from '../utils/logger.js';
@@ -268,9 +269,11 @@ function createScopedGitArgs(baseArgs, context) {
     if (!context.relativeWorkspacePath) {
         return [...baseArgs];
     }
+    // `git status` does not accept --relative, only a pathspec.
+    const supportsRelative = !baseArgs.includes('status');
     return [
         ...baseArgs,
-        `--relative=${context.relativeWorkspacePath}`,
+        ...(supportsRelative ? [`--relative=${context.relativeWorkspacePath}`] : []),
         '--',
         context.relativeWorkspacePath
     ];
@@ -370,6 +373,94 @@ export function parseGitDiffSummary(nameStatusOutput, numstatOutput, stagedPaths
     }
     return files;
 }
+/**
+ * 从 git status --porcelain 输出中提取未跟踪 (untracked) 路径。
+ * `??` 前缀表示未跟踪文件或目录。
+ */
+export function parseGitStatusUntrackedPaths(output) {
+    const paths = [];
+    const lines = String(output || '').split('\n').filter(line => line.trim());
+    for (const line of lines) {
+        if (line.startsWith('?? ')) {
+            const rawPath = line.slice(3).trim();
+            if (rawPath) {
+                // 目录路径通常以 / 结尾，去掉以便统一处理
+                paths.push(rawPath.replace(/\/$/, ''));
+            }
+        }
+    }
+    return paths;
+}
+/**
+ * 遍历未跟踪路径，将目录展开为具体文件列表，返回扁平的 GitDiffSummaryFile 数组。
+ * 主流程：对每个路径判断是文件还是目录；目录递归遍历，收集所有文件。
+ */
+async function collectUntrackedFiles(repoRootPath, untrackedPaths, existingFilePaths, maxDepth = 10) {
+    const files = [];
+    async function walk(dirRelativePath, depth) {
+        if (depth > maxDepth)
+            return;
+        const absDir = path.join(repoRootPath, dirRelativePath);
+        let entries;
+        try {
+            entries = await fs.readdir(absDir, { withFileTypes: true });
+        }
+        catch {
+            return;
+        }
+        for (const entry of entries) {
+            // 跳过常见的 VCS 与工具元数据目录，避免扫描噪声
+            if (entry.name === '.git' || entry.name === 'node_modules')
+                continue;
+            const entryRelativePath = dirRelativePath
+                ? `${dirRelativePath}/${entry.name}`
+                : entry.name;
+            if (entry.isDirectory()) {
+                await walk(entryRelativePath, depth + 1);
+            }
+            else if (entry.isFile()) {
+                const normalizedPath = normalizeGitPath(entryRelativePath);
+                if (normalizedPath && !existingFilePaths.has(normalizedPath)) {
+                    files.push({
+                        path: normalizedPath,
+                        status: 'added',
+                        additions: 0,
+                        deletions: 0,
+                        staged: false,
+                    });
+                }
+            }
+        }
+    }
+    for (const untrackedPath of untrackedPaths) {
+        const normalizedPath = normalizeGitPath(untrackedPath);
+        if (!normalizedPath)
+            continue;
+        const absPath = path.join(repoRootPath, untrackedPath);
+        let stat;
+        try {
+            stat = await fs.stat(absPath);
+        }
+        catch {
+            continue;
+        }
+        if (stat.isFile()) {
+            if (!existingFilePaths.has(normalizedPath)) {
+                files.push({
+                    path: normalizedPath,
+                    status: 'added',
+                    additions: 0,
+                    deletions: 0,
+                    staged: false,
+                });
+            }
+        }
+        else if (stat.isDirectory()) {
+            await walk(normalizedPath, 0);
+        }
+    }
+    return files;
+}
 /**
  * 合并工作区与暂存区差异汇总。
  * 主流程：以路径去重，保留工作区展示顺序；同一路径若也存在暂存变更则标记为 staged 并累加统计。
@@ -706,6 +797,13 @@ gitRouter.post('/git/diff', validateToken, async (req, res) => {
         }
         const stagedPaths = parseGitStatusStagedPaths(statusResult.stdout);
         const files = mergeGitDiffSummaryFiles(parseGitDiffSummary(nameStatusResult.stdout, result.stdout, stagedPaths), parseGitDiffSummary(stagedNameStatusResult.stdout, stagedNumstatResult.stdout, stagedPaths, true));
+        // 补充未跟踪（untracked）文件：git diff 无法感知 untracked，需从 git status 提取并展开目录
+        const untrackedPaths = parseGitStatusUntrackedPaths(statusResult.stdout);
+        if (untrackedPaths.length > 0) {
+            const existingFilePaths = new Set(files.map(f => f.path));
+            const untrackedFiles = await collectUntrackedFiles(context.repositoryRootPath, untrackedPaths, existingFilePaths);
+            files.push(...untrackedFiles);
+        }
         res.json({
             ok: true,
             isGitRepo: context.isGitRepo,
@@ -723,6 +821,22 @@ gitRouter.post('/git/diff', validateToken, async (req, res) => {
         res.status(500).json({ error: err.message || 'git diff failed' });
     }
 });
+/**
+ * 检测仓库是否已配置 git author（user.name / user.email），
+ * 未配置时返回 -c 参数回退，避免 git commit 因缺少 author 信息而失败。
+ */
+async function buildGitAuthorFallbackArgs(repoRootPath) {
+    const authorArgs = [];
+    const nameResult = await execGitCommand(repoRootPath, ['config', 'user.name']);
+    if (nameResult.exitCode !== 0 || !nameResult.stdout.trim()) {
+        authorArgs.push('-c', 'user.name=AgentsWork');
+    }
+    const emailResult = await execGitCommand(repoRootPath, ['config', 'user.email']);
+    if (emailResult.exitCode !== 0 || !emailResult.stdout.trim()) {
+        authorArgs.push('-c', 'user.email=agent@agentswork.com');
+    }
+    return authorArgs;
+}
 /**
  * 提交工作区未提交变更
  * POST /runtime/git/commit
@@ -759,7 +873,8 @@ gitRouter.post('/git/commit', validateToken, async (req, res) => {
             res.status(400).json({ error: stagedResult.stderr || 'git staged diff failed' });
             return;
         }
-        const commitResult = await execGitCommand(context.repositoryRootPath, ['commit', '-m', commitMessage, ...pathspecArgs]);
+        const authorArgs = await buildGitAuthorFallbackArgs(context.repositoryRootPath);
+        const commitResult = await execGitCommand(context.repositoryRootPath, [...authorArgs, 'commit', '-m', commitMessage, ...pathspecArgs]);
         if (commitResult.exitCode !== 0) {
             res.status(400).json({ error: commitResult.stderr || commitResult.stdout || 'git commit failed' });
             return;
@@ -817,6 +932,59 @@ gitRouter.post('/git/add-file', validateToken, async (req, res) => {
         res.status(500).json({ error: err.message || 'git add file failed' });
     }
 });
+/**
+ * 将多个文件批量加入暂存区（单条 git add 命令，避免 index.lock 竞争）
+ * POST /runtime/git/add-files
+ */
+gitRouter.post('/git/add-files', validateToken, async (req, res) => {
+    const { workspacePath, repositoryPath, filePaths } = req.body || {};
+    if (!workspacePath || !String(workspacePath).trim()) {
+        res.status(400).json({ error: 'workspacePath is required' });
+        return;
+    }
+    const rawFilePaths = Array.isArray(filePaths) ? filePaths : [];
+    const normalizedFilePaths = rawFilePaths
+        .map((fp) => normalizeGitPath(String(fp || '').trim()))
+        .filter((fp) => fp.length > 0);
+    if (normalizedFilePaths.length === 0) {
+        res.status(400).json({ error: 'filePaths is required and must be a non-empty array' });
+        return;
+    }
+    try {
+        const context = await resolveGitRepositoryContext(String(repositoryPath || workspacePath).trim());
+        if (!context.hasRepository || !context.repositoryRootPath) {
+            res.status(400).json({ error: 'workspace is not inside a git repository' });
+            return;
+        }
+        const pathspecArgs = normalizedFilePaths.flatMap((fp) => createScopedFilePathspecArgs(fp, context));
+        // 合并为单条 git add -- path1 path2 ...，避免并发 index.lock 冲突
+        const addArgs = ['add'];
+        const pathSpecs = [];
+        for (let i = 0; i < pathspecArgs.length; i++) {
+            // createScopedFilePathspecArgs 返回 ['--', relativePath]，只收集 path 部分
+            if (pathspecArgs[i] !== '--') {
+                pathSpecs.push(pathspecArgs[i]);
+            }
+        }
+        addArgs.push('--', ...pathSpecs);
+        const addResult = await execGitCommand(context.repositoryRootPath, addArgs);
+        if (addResult.exitCode !== 0) {
+            res.status(400).json({ error: addResult.stderr || 'git add files failed' });
+            return;
+        }
+        res.json({
+            ok: true,
+            filePaths: normalizedFilePaths,
+            workspacePath: context.workspacePath,
+            repositoryRootPath: context.repositoryRootPath,
+            relativeWorkspacePath: context.relativeWorkspacePath,
+        });
+    }
+    catch (error) {
+        const err = error;
+        res.status(500).json({ error: err.message || 'git add files failed' });
+    }
+});
 /**
  * 获取工作区提交列表
  * POST /runtime/git/commits
@@ -960,6 +1128,32 @@ gitRouter.post('/git/diff-file', validateToken, async (req, res) => {
             }
             result = stagedResult;
         }
+        // 未跟踪文件：git diff 无输出时直接读取文件内容生成新增差异
+        if (!normalizedCommitHash && !result.stdout.trim()) {
+            const absFilePath = path.join(context.repositoryRootPath, repositoryRelativeFilePath);
+            try {
+                const fileContent = await fs.readFile(absFilePath, 'utf-8');
+                if (fileContent) {
+                    const diffLines = fileContent.split('\n').map(line => `+${line}`).join('\n');
+                    const lineCount = fileContent.split('\n').length;
+                    result = {
+                        stdout: [
+                            `diff --git a/${repositoryRelativeFilePath} b/${repositoryRelativeFilePath}`,
+                            'new file mode 100644',
+                            `--- /dev/null`,
+                            `+++ b/${repositoryRelativeFilePath}`,
+                            `@@ -0,0 +1,${lineCount} @@`,
+                            diffLines,
+                        ].join('\n'),
+                        stderr: '',
+                        exitCode: 0,
+                    };
+                }
+            }
+            catch {
+                // 文件不可读或不存在，保持空差异
+            }
+        }
         res.json({
             ok: true,
             filePath: normalizedFilePath,
@@ -976,3 +1170,212 @@ gitRouter.post('/git/diff-file', validateToken, async (req, res) => {
         res.status(500).json({ error: err.message || 'git diff file failed' });
     }
 });
+/**
+ * 调用 OpenAI-compatible API 生成 Git 提交信息。
+ * 具体功能：将暂存区 diff 作为上下文发送给 AI，返回生成的提交信息文本。
+ */
+export async function callAiForCommitMessage(aiBaseUrl, aiApiKey, aiModel, diffContent) {
+    const url = `${aiBaseUrl.replace(/\/+$/, '')}/chat/completions`;
+    const systemPrompt = [
+        'You are a Git commit message generator. Generate concise, structured commit messages based on code diffs.',
+        '',
+        'Rules:',
+        '- Use conventional commit format: type(scope): description',
+        '- Types: feat, fix, refactor, test, docs, style, chore, perf, ci, build, revert',
+        '- Keep the first line under 72 characters',
+        '- Include a brief body only if the change needs explanation',
+        '- Write in Chinese for the description part',
+        '- Respond with ONLY the commit message, no explanations',
+    ].join('\n');
+    const response = await axios.post(url, {
+        model: aiModel,
+        messages: [
+            { role: 'system', content: systemPrompt },
+            { role: 'user', content: `以下是暂存区代码变更内容，请生成一条 Git 提交信息：\n\n${diffContent}` },
+        ],
+        max_tokens: 300,
+        temperature: 0.3,
+    }, {
+        headers: {
+            'Content-Type': 'application/json',
+            'Authorization': `Bearer ${aiApiKey}`,
+        },
+        timeout: 30000,
+    });
+    const data = response.data;
+    const content = data?.choices?.[0]?.message?.content?.trim() || '';
+    return content || 'AI 生成失败：返回内容为空';
+}
+/**
+ * 根据暂存区文件列表和 AI 源生成提交信息。
+ *
+ * 主干流程：
+ *   1. 收集暂存文件路径，对每个文件执行 git diff --cached 获取变更摘要
+ *   2. 合并所有文件变更内容
+ *   3. 调用外部 AI API 生成提交信息
+ *   4. 返回生成的提交信息
+ *
+ * POST /runtime/git/generate-commit-message
+ */
+gitRouter.post('/git/generate-commit-message', validateToken, async (req, res) => {
+    const { workspacePath, repositoryPath, stagedFiles, aiBaseUrl, aiApiKey, aiModel } = req.body || {};
+    if (!workspacePath || !String(workspacePath).trim()) {
+        res.status(400).json({ error: 'workspacePath is required' });
+        return;
+    }
+    if (!Array.isArray(stagedFiles) || stagedFiles.length === 0) {
+        res.status(400).json({ error: 'stagedFiles is required and must be a non-empty array' });
+        return;
+    }
+    if (!aiBaseUrl || !String(aiBaseUrl).trim() || !aiApiKey || !String(aiApiKey).trim() || !aiModel || !String(aiModel).trim()) {
+        res.status(400).json({ error: 'aiBaseUrl, aiApiKey and aiModel are required' });
+        return;
+    }
+    try {
+        const context = await resolveGitRepositoryContext(String(repositoryPath || workspacePath).trim());
+        if (!context.hasRepository || !context.repositoryRootPath) {
+            res.status(400).json({ error: 'workspace is not inside a git repository' });
+            return;
+        }
+        // 为每个暂存文件获取 staged diff
+        const filePaths = stagedFiles
+            .map(f => f.path)
+            .filter(Boolean);
+        const diffParts = [];
+        for (const filePath of filePaths) {
+            const repositoryRelativePath = resolveRepositoryRelativeFilePath(filePath, context);
+            const result = await execGitCommand(context.repositoryRootPath, [
+                'diff', '--cached', '--', repositoryRelativePath,
+            ]);
+            if (result.exitCode === 0 && result.stdout.trim()) {
+                diffParts.push(`--- ${filePath} ---\n${result.stdout.trim()}`);
+            }
+        }
+        if (diffParts.length === 0) {
+            // Fallback: 尝试获取所有暂存区变更
+            const result = await execGitCommand(context.repositoryRootPath, [
+                'diff', '--cached',
+            ]);
+            if (result.exitCode === 0 && result.stdout.trim()) {
+                diffParts.push(result.stdout.trim());
+            }
+        }
+        if (diffParts.length === 0) {
+            res.json({ message: '暂存区没有变更内容' });
+            return;
+        }
+        const diffContent = diffParts.join('\n\n');
+        // 限制 diff 长度，防止超过 token 限制
+        const maxDiffLength = 15000;
+        const truncatedDiff = diffContent.length > maxDiffLength
+            ? diffContent.slice(0, maxDiffLength) + '\n...(diff truncated due to length)'
+            : diffContent;
+        const generatedMessage = await callAiForCommitMessage(aiBaseUrl, aiApiKey, aiModel, truncatedDiff);
+        res.json({ message: generatedMessage });
+    }
+    catch (error) {
+        const err = error;
+        logger.error(`[Git] generate commit message failed: ${err.message}`);
+        res.status(500).json({ error: err.message || 'generate commit message failed' });
+    }
+});
+/**
+ * 将已暂存的文件撤销暂存（unstage）
+ * POST /runtime/git/unstage-files
+ */
+gitRouter.post('/git/unstage-files', validateToken, async (req, res) => {
+    const { workspacePath, repositoryPath, filePaths } = req.body || {};
+    if (!workspacePath || !String(workspacePath).trim()) {
+        res.status(400).json({ error: 'workspacePath is required' });
+        return;
+    }
+    const rawFilePaths = Array.isArray(filePaths) ? filePaths : [];
+    const normalizedFilePaths = rawFilePaths
+        .map((fp) => normalizeGitPath(String(fp || '').trim()))
+        .filter((fp) => fp.length > 0);
+    if (normalizedFilePaths.length === 0) {
+        res.status(400).json({ error: 'filePaths is required and must be a non-empty array' });
+        return;
+    }
+    try {
+        const context = await resolveGitRepositoryContext(String(repositoryPath || workspacePath).trim());
+        if (!context.hasRepository || !context.repositoryRootPath) {
+            res.status(400).json({ error: 'workspace is not inside a git repository' });
+            return;
+        }
+        // 使用 git restore --staged 撤销暂存，兼容 Git 2.23+
+        let lastError = '';
+        for (const filePath of normalizedFilePaths) {
+            const pathspecArgs = createScopedFilePathspecArgs(filePath, context);
+            const result = await execGitCommand(context.repositoryRootPath, ['restore', '--staged', ...pathspecArgs]);
+            if (result.exitCode !== 0) {
+                lastError = result.stderr || `git restore --staged failed for ${filePath}`;
+            }
+        }
+        if (lastError) {
+            res.status(400).json({ error: lastError });
+            return;
+        }
+        res.json({
+            ok: true,
+            filePaths: normalizedFilePaths,
+            workspacePath: context.workspacePath,
+            repositoryRootPath: context.repositoryRootPath,
+            relativeWorkspacePath: context.relativeWorkspacePath,
+        });
+    }
+    catch (error) {
+        const err = error;
+        res.status(500).json({ error: err.message || 'git unstage files failed' });
+    }
+});
+/**
+ * 丢弃未暂存文件的修改（还原到 HEAD），慎用，不可恢复。
+ * POST /runtime/git/restore-files
+ */
+gitRouter.post('/git/restore-files', validateToken, async (req, res) => {
+    const { workspacePath, repositoryPath, filePaths } = req.body || {};
+    if (!workspacePath || !String(workspacePath).trim()) {
+        res.status(400).json({ error: 'workspacePath is required' });
+        return;
+    }
+    const rawFilePaths = Array.isArray(filePaths) ? filePaths : [];
+    const normalizedFilePaths = rawFilePaths
+        .map((fp) => normalizeGitPath(String(fp || '').trim()))
+        .filter((fp) => fp.length > 0);
+    if (normalizedFilePaths.length === 0) {
+        res.status(400).json({ error: 'filePaths is required and must be a non-empty array' });
+        return;
+    }
+    try {
+        const context = await resolveGitRepositoryContext(String(repositoryPath || workspacePath).trim());
+        if (!context.hasRepository || !context.repositoryRootPath) {
+            res.status(400).json({ error: 'workspace is not inside a git repository' });
+            return;
+        }
+        // git restore <file> 丢弃工作区未暂存修改
+        let lastError = '';
+        for (const filePath of normalizedFilePaths) {
+            const pathspecArgs = createScopedFilePathspecArgs(filePath, context);
+            const result = await execGitCommand(context.repositoryRootPath, ['restore', ...pathspecArgs]);
+            if (result.exitCode !== 0) {
+                lastError = result.stderr || `git restore failed for ${filePath}`;
+            }
+        }
+        if (lastError) {
+            res.status(400).json({ error: lastError });
+            return;
+        }
+        res.json({
+            ok: true,
+            filePaths: normalizedFilePaths,
+            workspacePath: context.workspacePath,
+            repositoryRootPath: context.repositoryRootPath,
+            relativeWorkspacePath: context.relativeWorkspacePath,
+        });
+    }
+    catch (error) {
+        const err = error;
+        res.status(500).json({ error: err.message || 'git restore files failed' });
+    }
+});

package/dist/routes/git.test.js

@@ -3,8 +3,8 @@ import { promises as fs } from 'node:fs';
 import { tmpdir } from 'node:os';
 import path from 'node:path';
 import { promisify } from 'node:util';
-import { describe, expect, it } from 'vitest';
-import { createAgentsWorkStashSnapshotRef, createScopedFilePathspecArgs, createScopedGitPathspecArgs, mergeGitDiffSummaryFiles, normalizeGitCommitMessage, parseGitDiffSummary, parseGitStashListLine, parseGitStatusStagedPaths, parseLatestGitStash, persistAgentsWorkStashSnapshotRef, } from './git.js';
+import { describe, expect, it, vi } from 'vitest';
+import { callAiForCommitMessage, createAgentsWorkStashSnapshotRef, createScopedFilePathspecArgs, createScopedGitPathspecArgs, mergeGitDiffSummaryFiles, normalizeGitCommitMessage, parseGitDiffSummary, parseGitStashListLine, parseGitStatusStagedPaths, parseLatestGitStash, persistAgentsWorkStashSnapshotRef, } from './git.js';
 const execFileAsync = promisify(execFile);
 async function runGit(cwd, args) {
     const result = await execFileAsync('git', [...args], { cwd });
@@ -126,3 +126,40 @@ describe('git stash reference helpers', () => {
         }
     }, 15_000);
 });
+describe('callAiForCommitMessage', () => {
+    it('should return trimmed content from AI response', async () => {
+        const mockResponse = { data: { choices: [{ message: { content: '  feat(readme): add new section  ' } }] } };
+        const axiosModule = await import('axios');
+        vi.spyOn(axiosModule.default, 'post').mockResolvedValueOnce(mockResponse);
+        const result = await callAiForCommitMessage('https://api.openai.com/v1', 'sk-test-key', 'gpt-4o', 'diff content here');
+        expect(result).toBe('feat(readme): add new section');
+    });
+    it('should return fallback message when AI response content is empty', async () => {
+        const mockResponse = { data: { choices: [{ message: { content: '' } }] } };
+        const axiosModule = await import('axios');
+        vi.spyOn(axiosModule.default, 'post').mockResolvedValueOnce(mockResponse);
+        const result = await callAiForCommitMessage('https://api.openai.com/v1', 'sk-test-key', 'gpt-4o', 'diff content here');
+        expect(result).toBe('AI 生成失败：返回内容为空');
+    });
+    it('should use correct API endpoint and headers', async () => {
+        const axiosModule = await import('axios');
+        const postSpy = vi.spyOn(axiosModule.default, 'post').mockResolvedValueOnce({
+            data: { choices: [{ message: { content: 'test message' } }] },
+        });
+        await callAiForCommitMessage('https://custom.ai.com/api/v1', 'sk-custom-key', 'custom-model', 'test diff');
+        expect(postSpy).toHaveBeenCalledWith('https://custom.ai.com/api/v1/chat/completions', expect.objectContaining({
+            model: 'custom-model',
+            messages: expect.arrayContaining([
+                expect.objectContaining({ role: 'system' }),
+                expect.objectContaining({ role: 'user' }),
+            ]),
+            max_tokens: 300,
+            temperature: 0.3,
+        }), expect.objectContaining({
+            headers: expect.objectContaining({
+                'Content-Type': 'application/json',
+                'Authorization': 'Bearer sk-custom-key',
+            }),
+        }));
+    });
+});

package/dist/routes/instance.js

@@ -724,6 +724,8 @@ instanceRouter.post("/restart-bridge", validateTokenOrPanelSession, async (req,
             message: "Bridge 正在优雅退出；下次启动后会通过消息中心通知结果。若未由守护进程管理，请手动重新启动。",
         });
         setTimeout(() => {
+            // 用退出码 42 表示"重启请求"，配合 systemd Restart=on-failure 触发自动拉起
+            process.exitCode = 42;
             if (gracefulShutdownFn) {
                 gracefulShutdownFn("PANEL_RESTART", Boolean(preserveSessions)).catch((error) => {
                     const err = error;
@@ -732,7 +734,7 @@ instanceRouter.post("/restart-bridge", validateTokenOrPanelSession, async (req,
                 });
                 return;
             }
-            process.exit(0);
+            process.exit(42);
         }, 250);
     }
     catch (error) {

package/dist/routes/memory.d.ts

@@ -5,11 +5,14 @@ interface MemoryRecord {
     uri: string;
     domain: string;
     path: string;
+    title?: string;
     content: string;
     memory_type: MemoryType;
     createdAt: string;
     updatedAt: string;
     version: number;
+    keywords?: string[];
+    bound_files?: string[];
 }
 interface PermanentMemoryStoreCandidate {
     path: string;

package/dist/routes/memory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"memory.d.ts","sourceRoot":"","sources":["../../src/routes/memory.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,YAAY,4CAAW,CAAC;AAErC,KAAK,UAAU,GAAG,WAAW,GAAG,iBAAiB,GAAG,QAAQ,CAAC;AAE7D,UAAU,YAAY;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,UAAU,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB;AAMD,UAAU,6BAA6B;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;CACrB;AAmCD;;;GAGG;AACH,wBAAgB,+BAA+B,CAC7C,aAAa,EAAE,MAAM,EACrB,QAAQ,SAAK,GACZ,MAAM,CAaR;AAED;;;GAGG;AACH,wBAAgB,yCAAyC,CACvD,aAAa,EAAE,MAAM,EACrB,QAAQ,SAAK,GACZ,6BAA6B,EAAE,CAWjC;AA2FD;;;GAGG;AACH,wBAAsB,kCAAkC,CACtD,aAAa,EAAE,MAAM,EACrB,QAAQ,SAAK,GACZ,OAAO,CAAC,YAAY,EAAE,CAAC,CAkBzB"}
+{"version":3,"file":"memory.d.ts","sourceRoot":"","sources":["../../src/routes/memory.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,YAAY,4CAAW,CAAC;AAErC,KAAK,UAAU,GAAG,WAAW,GAAG,iBAAiB,GAAG,QAAQ,CAAC;AAE7D,UAAU,YAAY;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,UAAU,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAEhB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB;AAMD,UAAU,6BAA6B;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;CACrB;AAmCD;;;GAGG;AACH,wBAAgB,+BAA+B,CAC7C,aAAa,EAAE,MAAM,EACrB,QAAQ,SAAK,GACZ,MAAM,CAaR;AAED;;;GAGG;AACH,wBAAgB,yCAAyC,CACvD,aAAa,EAAE,MAAM,EACrB,QAAQ,SAAK,GACZ,6BAA6B,EAAE,CAWjC;AA8FD;;;GAGG;AACH,wBAAsB,kCAAkC,CACtD,aAAa,EAAE,MAAM,EACrB,QAAQ,SAAK,GACZ,OAAO,CAAC,YAAY,EAAE,CAAC,CAkBzB"}

package/dist/routes/memory.js

@@ -84,11 +84,14 @@ function normalizeMemoryRecord(uri, record) {
         uri: normalized.uri,
         domain: normalized.domain,
         path: normalized.path,
+        title: record.title || undefined,
         content: String(record.content || ""),
         memory_type: "memory",
         createdAt: String(record.createdAt || record.updatedAt || ""),
         updatedAt: String(record.updatedAt || record.createdAt || ""),
         version: typeof record.version === "number" ? record.version : 1,
+        keywords: record.keywords,
+        bound_files: record.bound_files,
     };
 }
 /**

package/dist/routes/terminal.d.ts

@@ -22,6 +22,7 @@ export interface SdkSessionEntry {
     currentRuntimeActionType?: string;
     currentRuntimeActionLabel?: string;
     currentRuntimeActionDetail?: string;
+    currentRuntimeActionInput?: string;
 }
 export declare const sdkSessions: Map<string, SdkSessionEntry>;
 export interface RuntimeStopOptions {
@@ -47,6 +48,7 @@ export declare function shouldProbeSdkProcessPid(providerId: string): boolean;
  */
 export declare function parseRuntimeStopOptions(body: unknown): RuntimeStopOptions;
 export declare function resolveStatusChangeUsage(actionInfo?: RuntimeStatusActionInfo): {
+    contextLimit?: number | undefined;
     inputTokens: number;
     outputTokens: number;
 } | undefined;
@@ -54,7 +56,7 @@ export declare function resolveStatusChangeRuntimeState(status: string, actionIn
     status: string;
     actionInfo?: RuntimeStatusActionInfo;
 };
-export declare function buildAcodeCommandOutputPath(workspacePath: string, now?: Date): string;
+export declare function buildAcodeCommandOutputPath(agentId: string, now?: Date): string;
 export declare function countTerminalOutputLines(output: string): number;
 export declare function formatCommandOutputSpilloverNotice(outputPath: string, lineLimit?: number): string;
 export declare function formatCommandInactivityTimeoutNotice(timeoutMs?: number): string;
@@ -67,14 +69,25 @@ export declare function normalizeTerminalCommandInput(value: unknown): string;
  * 主流程：优先使用环境变量覆盖 -> Windows 默认 GB18030 -> 其他平台默认 UTF-8。
  */
 export declare function resolveTerminalOutputEncoding(platform?: NodeJS.Platform, env?: NodeJS.ProcessEnv): string;
+/**
+ * 终端输出解码器接口。
+ */
+interface TerminalOutputDecoder {
+    decode(chunk?: Uint8Array | ArrayBuffer | null, options?: {
+        stream?: boolean;
+    }): string;
+}
 /**
  * 创建终端输出流式解码器，避免多字节中文被 chunk 边界截断。
+ *
+ * 主流程：环境变量显式指定非 utf-8 时固定编码 → 否则自动检测
+ * （先 UTF-8，遇替换字符回退 GB18030，覆盖不同程序的不同编码）。
  */
-export declare function createTerminalOutputDecoder(encoding?: string): TextDecoder;
+export declare function createTerminalOutputDecoder(encoding?: string): TerminalOutputDecoder;
 /**
  * 解码终端输出 chunk；end=true 时刷新解码器内部剩余字节。
  */
-export declare function decodeTerminalOutputChunk(decoder: TextDecoder, chunk?: Buffer, end?: boolean): string;
+export declare function decodeTerminalOutputChunk(decoder: TerminalOutputDecoder | TextDecoder, chunk?: Buffer, end?: boolean): string;
 /**
  * 解析 cd 命令目标；返回 undefined 表示不是目录切换命令，null 表示仅查看当前目录。
  */
@@ -125,4 +138,5 @@ export declare function resolveRuntimeStatusFromProviderEvent(event: ProviderEve
     actionInfo?: RuntimeStatusActionInfo;
 } | undefined;
 export declare function resolveSdkProviderId(command?: string): string;
+export {};
 //# sourceMappingURL=terminal.d.ts.map

package/dist/routes/terminal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terminal.d.ts","sourceRoot":"","sources":["../../src/routes/terminal.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"terminal.d.ts","sourceRoot":"","sources":["../../src/routes/terminal.ts"],"names":[],"mappings":"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"}