@apolloyh/apollo-agent 0.1.10 → 0.2.0

package/dist/trace.js

@@ -280,14 +280,12 @@ export class CliTraceRenderer {
     }
     renderInteractiveToolResult(event, denied) {
         this.bullet(formatInteractiveToolResult(event.tool, event.content, event.isError, event.input), denied ? "yellow" : event.isError ? "red" : "green");
-        if (event.tool !== "shell_exec" || event.isError || event.content === "(no output)")
+        if (event.isError || event.content === "(no output)")
             return;
-        const lines = stripTerminalEscapes(event.content).split(/\r?\n/);
-        for (const [index, line] of lines.slice(0, 6).entries()) {
+        const lines = toolOutputLines(event.tool, event.content);
+        for (const [index, line] of lines.entries()) {
             this.out(`  ${this.paint(index === 0 ? "└" : " ", "gray")} ${this.paint(truncateDisplayLine(line, 140), "gray")}\n`);
         }
-        if (lines.length > 6)
-            this.out(`    ${this.paint(`… +${lines.length - 6} lines`, "gray")}\n`);
     }
     renderCodeChange(change) {
         const width = Math.max(40, Math.min(this.options.stdout?.columns ?? 120, 160));
@@ -597,6 +595,22 @@ function toolLabel(tool) {
         .map((part) => `${part.slice(0, 1).toUpperCase()}${part.slice(1)}`)
         .join(" ");
 }
+function toolOutputLines(tool, content) {
+    if (tool === "web_search") {
+        try {
+            const results = JSON.parse(content).results ?? [];
+            return results.slice(0, 5).map((result) => [result.title, result.url].filter(Boolean).join(" — "));
+        }
+        catch {
+            return [compactValue(content, 140)];
+        }
+    }
+    const lines = stripTerminalEscapes(content).split(/\r?\n/);
+    const visible = lines.slice(0, 6);
+    if (lines.length > 6)
+        visible.push(`… +${lines.length - 6} lines`);
+    return visible;
+}
 function isPermissionDenied(content) {
     return content.startsWith("Permission denied for tool ");
 }

package/dist/types.d.ts

@@ -2,6 +2,10 @@ export type JsonObject = Record<string, unknown>;
 export type ContentBlock = {
     type: "text";
     text: string;
+} | {
+    type: "thinking";
+    thinking: string;
+    signature?: string;
 } | {
     type: "tool_use";
     id: string;
@@ -59,6 +63,9 @@ export type TraceEvent = {
 } | {
     type: "assistant_delta";
     text: string;
+} | {
+    type: "thinking_delta";
+    text: string;
 } | {
     type: "llm_tool_delta";
     bytes: number;
@@ -161,12 +168,14 @@ export type ToolExecutionContext = {
     planMode?: boolean;
 };
 export type LlmConfig = {
+    protocol?: "anthropic" | "openai";
     authToken: string;
     baseUrl: string;
     model: string;
     maxTokens: number;
     timeoutMs?: number;
     cacheTtl?: "5m" | "1h";
+    openaiMaxTokensParam?: "max_tokens" | "max_completion_tokens";
 };
 export type McpServerConfig = {
     command: string;

package/dist/types.d.ts.map

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

package/docs/guide.md

@@ -43,7 +43,18 @@ EXA_API_KEY=your_exa_key
 # ANTHROPIC_CACHE_TTL=5m
 ```
 
-Apollo 使用 Anthropic Messages API 兼容接口。GLM/BigModel 在未显式配置时默认使用 131072 的输出上限；其他提供商默认 4096。显式设置 `ANTHROPIC_MAX_TOKENS` 始终优先。
+Apollo 默认使用 Anthropic Messages API，也支持 OpenAI-compatible Chat Completions。切换为 OpenAI 协议：
+
+```dotenv
+APOLLO_LLM_PROTOCOL=openai
+OPENAI_API_KEY=your_openai_token
+OPENAI_BASE_URL=https://api.openai.com/v1
+OPENAI_MODEL=gpt-4o-mini
+# OPENAI_MAX_TOKENS=4096
+# OPENAI_MAX_TOKENS_PARAM=max_tokens
+```
+
+OpenAI 兼容层支持流式文本、公开的 reasoning/thinking 字段、并行工具调用、工具结果回传、usage/cache token 和标准重试错误。模型供应商不返回 reasoning 正文时，Apollo 无法展示该内容。
 
 环境文件发现顺序：
 
@@ -243,7 +254,7 @@ Apollo 不伪造本地 Prompt Cache 命中；`/status` 只使用模型厂商响
 
 ## 故障排查
 
-- `Missing ANTHROPIC_AUTH_TOKEN`：编辑 `~/.apollo/.env` 后重启。
+- `Missing model API token`：配置 `ANTHROPIC_AUTH_TOKEN` 或 `OPENAI_API_KEY` 后重启。
 - `EEXIST .../bin/apollo`：先确认 `which apollo`；移除旧的手动软链接或旧全局包后重装。
 - 搜索不可用：检查 `EXA_API_KEY`，普通文件和代码搜索不依赖 Exa。
 - 修改配置没有生效：重启 Apollo；配置和提示词在当前 Engine 中冻结。

package/docs/npm-release.md

@@ -0,0 +1,251 @@
+# Apollo npm 打包与发布手册
+
+本文说明如何把 `@apolloyh/apollo-agent` 构建为 npm tarball、发布到 npm，并把同一份 tarball 上传到 GitHub Release。
+
+## 前置条件
+
+- Node.js 20 或更高版本
+- npm 发布账号拥有 `@apolloyh/apollo-agent` 权限
+- npm 已登录：`npm whoami`
+- GitHub CLI 已登录：`gh auth status`
+- 工作目录为 Apollo 仓库的 `agent/`
+
+不要把 npm token、模型密钥、`.env` 或用户配置提交到仓库或放进安装包。
+
+## 1. 确定新版本号
+
+先查看 registry 当前版本：
+
+```bash
+npm view @apolloyh/apollo-agent version dist-tags.latest --json --prefer-online
+```
+
+npm 不允许覆盖已经发布的同名版本。按语义化版本选择升级类型：
+
+```bash
+npm version patch --no-git-tag-version  # 0.1.10 -> 0.1.11
+npm version minor --no-git-tag-version  # 0.1.10 -> 0.2.0
+npm version major --no-git-tag-version  # 0.1.10 -> 1.0.0
+```
+
+该命令会更新 `package.json` 和 `package-lock.json`。Apollo 还在 `src/brand.ts` 中显示版本号，必须同步修改：
+
+```ts
+export const PRODUCT = {
+  version: "0.1.11",
+  // ...
+};
+```
+
+确认三处一致：
+
+```bash
+node -p "require('./package.json').version"
+node -p "require('./package-lock.json').version"
+rg 'version:' src/brand.ts
+```
+
+## 2. 构建与验证
+
+```bash
+npm run typecheck
+npm test
+git diff --check
+git status --short
+```
+
+`npm test` 会先清理并重新生成 `dist/`，然后执行回归测试。发布前必须确认测试全部通过，并检查工作区没有混入无关修改或秘密。
+
+## 3. 打包 tarball
+
+Apollo 将历史安装包集中在 `releases/npm-packages/`。直接输出到该目录：
+
+```bash
+mkdir -p releases/npm-packages
+npm pack --json --pack-destination releases/npm-packages
+```
+
+`prepack` 会再次运行构建。生成文件形如：
+
+```text
+releases/npm-packages/apolloyh-apollo-agent-0.1.11.tgz
+```
+
+检查包内容：
+
+```bash
+tar -tzf releases/npm-packages/apolloyh-apollo-agent-0.1.11.tgz
+```
+
+重点确认包含：
+
+- `dist/`
+- `bundled-skills/`
+- `README.md`
+- `docs/`
+- `.apollo/config.example.json`
+- `.apollo/hooks.example.json`
+- `.env.example`
+
+同时确认不包含：
+
+- `.env`、API key、token
+- `node_modules/`
+- `.apollo/config.json`、sessions、memory、logs
+- 用户工作区的 `skills/`
+- 源码仓库中无关的大文件
+
+可先使用 `npm pack --dry-run` 只预览，不生成 tarball：
+
+```bash
+npm pack --dry-run
+```
+
+## 4. 本地安装冒烟测试
+
+在临时目录安装刚生成的真实 tarball：
+
+```bash
+VERSION=$(node -p "require('./package.json').version")
+TARBALL="releases/npm-packages/apolloyh-apollo-agent-${VERSION}.tgz"
+PREFIX=$(mktemp -d)
+
+npm install --prefix "$PREFIX" "$TARBALL" --ignore-scripts
+test -x "$PREFIX/node_modules/.bin/apollo"
+node --input-type=module -e "await import('$PREFIX/node_modules/@apolloyh/apollo-agent/dist/sdk.js'); console.log('SDK import ok')"
+rm -rf "$PREFIX"
+```
+
+## 5. 提交并推送源码
+
+发布前让 GitHub 的 `main` 与将要发布的代码一致：
+
+```bash
+git add package.json package-lock.json src/brand.ts README.md docs
+git commit -m "Release v$(node -p \"require('./package.json').version\")"
+git push origin main
+```
+
+不要使用 `git add -f skills/`。项目级 skills 属于用户工作区，不应跟踪或打进 npm 包；只有源码目录 `bundled-skills/` 属于产品内置资源。
+
+## 6. 发布到 npm
+
+Apollo 使用 npm 的浏览器 WebAuthn 流程，不需要 OTP：
+
+```bash
+VERSION=$(node -p "require('./package.json').version")
+TARBALL="releases/npm-packages/apolloyh-apollo-agent-${VERSION}.tgz"
+
+npx --yes npm@12.0.1 publish "$TARBALL" \
+  --access public \
+  --auth-type=web
+```
+
+终端显示 npm 官方授权地址后：
+
+1. 按 Enter 打开浏览器。
+2. 使用 Touch ID 或本机安全密钥确认。
+3. 保持终端运行，直到看到 `+ @apolloyh/apollo-agent@<version>`。
+
+不要复制浏览器授权链接到公开日志；该链接是临时登录流程的一部分。
+
+## 7. 验证 npm registry
+
+发布后 registry 可能需要数秒传播：
+
+```bash
+VERSION=$(node -p "require('./package.json').version")
+
+npm view "@apolloyh/apollo-agent@${VERSION}" \
+  version dist.shasum --json --prefer-online
+
+npm view @apolloyh/apollo-agent \
+  version dist-tags.latest --json --prefer-online
+```
+
+只有目标版本可查询且 `latest` 指向目标版本，才算 npm 发布完成。
+
+最后进行公开安装验证：
+
+```bash
+npm install -g @apolloyh/apollo-agent@latest --prefer-online
+apollo
+```
+
+## 8. 创建 GitHub Release
+
+把与 npm 发布完全相同的 tarball 作为 Release 附件：
+
+```bash
+VERSION=$(node -p "require('./package.json').version")
+TARBALL="releases/npm-packages/apolloyh-apollo-agent-${VERSION}.tgz"
+
+gh release create "v${VERSION}" "$TARBALL" \
+  --target main \
+  --title "Apollo v${VERSION}" \
+  --generate-notes
+```
+
+验证 Release 和附件：
+
+```bash
+gh release view "v${VERSION}" \
+  --json tagName,name,isDraft,isPrerelease,url,assets
+```
+
+如果 Release 已存在，只补传或替换附件：
+
+```bash
+gh release upload "v${VERSION}" "$TARBALL" --clobber
+```
+
+## 9. 完整发布清单
+
+- [ ] npm registry 上的旧版本已确认
+- [ ] `package.json`、`package-lock.json`、`src/brand.ts` 版本一致
+- [ ] 类型检查、构建和测试通过
+- [ ] tarball 内容正确且不含秘密
+- [ ] 真实 tarball 本地安装通过
+- [ ] 源码已提交并推送到 `main`
+- [ ] npm WebAuthn 发布成功
+- [ ] 目标版本可从 registry 查询
+- [ ] `latest` 指向目标版本
+- [ ] GitHub Release 已创建并附加同一 tarball
+- [ ] 工作区干净且本地分支与远端同步
+
+## 常见错误
+
+### `E403` 或版本已存在
+
+npm 版本不可覆盖。重新增加版本号、重新测试并打包，不要尝试覆盖旧版本。
+
+### `E404 Not Found`
+
+发布后短时间查询不到通常是 registry 传播延迟。等待几秒并使用 `--prefer-online` 重试。如果持续失败，再检查包权限和登录账号。
+
+### `EEXIST .../bin/apollo`
+
+本机已有旧的命令或手动软链接：
+
+```bash
+which apollo
+npm uninstall -g @apolloyh/apollo-agent
+```
+
+确认旧路径后再重新安装。不要直接使用 `--force`，除非已确认覆盖目标。
+
+### npm 要求 OTP
+
+本项目使用 WebAuthn 发布，应指定 `--auth-type=web`。按 Enter 打开 npm 官方授权页，然后使用 Touch ID 或安全密钥，不需要输入 OTP。
+
+### npm 发布成功但 GitHub Release 失败
+
+不要重新发布 npm。修复 GitHub 登录或网络问题后，重新执行 `gh release create` 或 `gh release upload` 即可。
+
+### 发布了有问题的版本
+
+已发布版本不能安全地原地替换。修复问题并发布新的 patch 版本。必要时可先标记旧版本：
+
+```bash
+npm deprecate @apolloyh/apollo-agent@0.1.11 "Please upgrade to a newer version."
+```

package/docs/sdk.md

@@ -82,6 +82,8 @@ const engine = await createQueryEngine({
 | 参数 | 类型 | 说明 |
 |---|---|---|
 | `configPath` | `string` | Agent 显式配置路径；在用户配置和项目配置之后覆盖，默认还会发现 `~/.apollo/config.json`、`.apollo/config.json`，并兼容旧 `agent.config.json` |
+| `configMode` | `"layered" \| "isolated"` | `isolated` 只读取显式 `configPath`，适合 Web 服务；默认保持 CLI 分层发现 |
+| `workspaceRoot` | `string` | 覆盖会话、记忆和工具使用的工作目录，不改变配置文件来源 |
 | `envPath` | `string` | 可选环境变量文件；未提供模型配置时默认发现 `.apollo/.env`，然后 `.env` |
 | `agentConfig` | `AgentConfig` | 直接传入完整 Agent 配置；优先于 `configPath` |
 | `llmConfig` | `LlmConfig` | 直接传入模型配置；优先于环境变量 |
@@ -94,6 +96,8 @@ const engine = await createQueryEngine({
 
 如果同时传入 `agentConfig` 和 `configPath`，使用 `agentConfig`；如果同时传入 `llmConfig` 和环境变量，使用 `llmConfig`。
 
+`LlmConfig.protocol` 可设为 `anthropic` 或 `openai`。OpenAI 协议使用 `/v1/chat/completions`，并将响应归一为 Apollo 内部的 text、thinking、tool_use 和 usage 事件。
+
 ## 系统提示词与缓存
 
 `~/.apollo/config.json` 和项目的 `.apollo/config.json` 都可以配置：

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@apolloyh/apollo-agent",
-  "version": "0.1.10",
+  "version": "0.2.0",
   "type": "module",
   "description": "Apollo — your personal agent. Answer first, act when needed, with tools, skills, and isolated Task subagents.",
   "bin": {
-    "apollo": "./dist/index.js"
+    "apollo": "dist/index.js"
   },
   "main": "./dist/sdk.js",
   "types": "./dist/sdk.d.ts",
@@ -24,6 +24,7 @@
     "README.md",
     "docs/guide.md",
     "docs/features-cc.md",
+    "docs/npm-release.md",
     "docs/sdk.md",
     ".apollo/config.example.json",
     ".apollo/hooks.example.json",