tellrun 1.3.2 → 1.3.4

package/README.md

@@ -49,20 +49,23 @@ Without `/cwd`, the working directory defaults to the directory where the servic
 
 At startup, Tellrun registers an English command menu. Use the menu button beside the chat input or type `/` to select a command.
 
-| Command               | Purpose                                                      |
-| --------------------- | ------------------------------------------------------------ |
-| `/start`, `/help`     | Show usage instructions                                      |
-| `/cwd`                | Show the current working directory                           |
-| `/cwd /absolute/path` | Change the working directory and start a new conversation    |
-| `/new`                | Start a new conversation while keeping the working directory |
-| `/permissions`        | Choose the permission mode for subsequent tasks             |
-| `/status`             | Show connection, conversation, directory, and task status    |
-| `/last`               | Show the latest finished task's status and result            |
-| `/stop`               | Request that the current task stop and pause new tasks       |
-| `/resume`             | Accept new tasks again without rerunning an interrupted task |
+| Command               | Purpose                                                          |
+| --------------------- | ---------------------------------------------------------------- |
+| `/start`, `/help`     | Show usage instructions                                          |
+| `/cwd`                | Show the current working directory                               |
+| `/cwd /absolute/path` | Change the working directory and start a new conversation        |
+| `/new`                | Start a new conversation while keeping the working directory     |
+| `/model`              | Show the current selection and choose model and reasoning effort |
+| `/permissions`        | Choose the permission mode for subsequent tasks                  |
+| `/status`             | Show connection, directory, model, permissions, and task status  |
+| `/last`               | Show the latest finished task's status and result                |
+| `/stop`               | Request that the current task stop and pause new tasks           |
+| `/resume`             | Accept new tasks again without rerunning an interrupted task     |
 
 Wait for the current task to finish before changing directories or starting a new conversation. After `/stop`, check the final status, then send `/resume` followed by your next task.
 
+In `/status`, `Model` shows the current selection, or `Default` when using the Codex configuration. If the active task uses a different model, `Task model` is also shown.
+
 `/permissions` offers the four presets from Codex CLI 0.165.0: Ask for approval (default), Approve for me (Codex automatic review), Full Access (no Codex sandbox or execution approvals), and Read Only (approval required for edits or network access). Full Access remains subject to operating system permissions.
 
 Selections apply to subsequently submitted tasks; the current task and its follow-up messages retain their original mode. `/status` shows both modes when they differ. Selections survive service restarts and `/new`; changing the working directory resets the mode to its default. Menus expire after 10 minutes and are invalidated when reopened, on a new conversation, on a directory change, or after a restart. Codex validates the selected mode when starting a task. If it rejects the configuration or returns different settings, the task does not start.

package/README.zh-CN.md

@@ -55,14 +55,17 @@ tellrun setup
 | `/cwd`                | 查看当前工作目录                           |
 | `/cwd /absolute/path` | 切换工作目录并开始新会话                   |
 | `/new`                | 开始新会话，保留工作目录                   |
+| `/model`              | 查看当前选择，通过按钮选择模型和推理强度   |
 | `/permissions`        | 选择后续任务的权限模式                     |
-| `/status`             | 查看连接、会话、目录和任务状态             |
+| `/status`             | 查看连接、目录、模型、权限和任务状态       |
 | `/last`               | 查看最近已结束任务的状态与结果             |
 | `/stop`               | 请求停止当前任务，并暂停接收新任务         |
 | `/resume`             | 恢复接收新任务，不会重新执行此前中断的任务 |
 
 切换目录或新建会话前，需要等待当前任务结束。使用 `/stop` 后，先检查最终状态，再发送 `/resume` 和新的任务内容。
 
+`/status` 的 `Model` 显示当前选择的模型，未选择时显示 `Default`，表示沿用 Codex 配置。执行中的任务使用不同模型时，额外显示 `Task model`。
+
 `/permissions` 提供与 Codex CLI 0.165.0 对应的四种模式：Ask for approval（默认，额外权限由你审批）、Approve for me（由 Codex 自动审查）、Full Access（不使用 Codex 沙箱和执行审批）、Read Only（只读，修改或联网时请求审批）。Full Access 仍受系统用户权限约束。
 
 选择在下一次提交任务时使用，当前任务及其补充消息保留原权限；`/status` 会在两者不同时分别显示。选择跨服务重启保留，`/new` 沿用选择，切换工作目录恢复默认。菜单有效期为 10 分钟，重新打开、新建会话、切换目录或重启后旧按钮失效。模式受本机 Codex 版本与托管策略限制，启动任务时由 Codex 校验；被拒绝或返回设置不符时不启动任务。

package/dist/agents/codex-rpc.js

@@ -0,0 +1,85 @@
+import { readFileSync } from "node:fs";
+import { createJSONRPCErrorResponse, createJSONRPCSuccessResponse, JSONRPCClient, } from "json-rpc-2.0";
+import { z } from "zod";
+/** 响应、通知与服务端请求共用边界校验，具体事件内容由 Codex 适配器解释。 */
+const messageSchema = z.object({
+    id: z.union([z.number(), z.string()]).optional(),
+    method: z.string().optional(),
+    params: z.unknown().optional(),
+    result: z.unknown().optional(),
+    error: z.object({ code: z.number(), message: z.string().optional() }).optional(),
+});
+/** 每条连接独立管理 RPC；关闭只释放连接和等待请求，不取消后台任务。 */
+export function createCodexRpc(socket, handlers = {}) {
+    const client = new JSONRPCClient(({ id, method, params }) => write({ id, method, params }));
+    /** 查询取消、任务断开和最终清理共用入口，不发送 turn/interrupt。 */
+    function close(reason = "Codex connection closed.") {
+        client.rejectAllPendingRequests(reason);
+        socket.terminate();
+    }
+    /** 先通知调用方记录连接故障，再释放全部等待，避免把断线当作任务完成。 */
+    function fail(text) {
+        handlers.onFailure?.(text);
+        close(text);
+    }
+    /** Codex 线上协议省略 jsonrpc 字段；请求、通知与交互应答共用发送入口。 */
+    function write(message) {
+        try {
+            socket.send(JSON.stringify(message), (error) => {
+                if (error)
+                    fail("Codex connection write failed. Task status unknown.");
+            });
+        }
+        catch {
+            fail("Codex connection write failed. Task status unknown.");
+        }
+    }
+    /** 请求超时后结束连接，不自动重发可能已执行的操作。 */
+    function request(method, params) {
+        return client
+            .timeout(30_000, (id) => {
+            fail(`Codex ${method} timed out. Not retried.`);
+            return createJSONRPCErrorResponse(id, 0, "Codex request timed out.");
+        })
+            .request(method, params);
+    }
+    socket.on("error", () => fail("Codex connection failed. Task status unknown."));
+    socket.on("close", () => {
+        client.rejectAllPendingRequests("Codex connection closed.");
+        handlers.onClose?.();
+    });
+    socket.on("message", (data) => {
+        try {
+            const message = messageSchema.parse(JSON.parse(data.toString()));
+            if (message.method)
+                handlers.onMessage?.(message);
+            else if (typeof message.id === "number")
+                /** 错误来源标记仅供适配器识别；服务端原始错误不能直接转发给用户。 */
+                client.receive(message.error
+                    ? createJSONRPCErrorResponse(message.id, message.error.code, message.error.message ?? "", "codex")
+                    : createJSONRPCSuccessResponse(message.id, message.result));
+        }
+        catch {
+            fail("Invalid Codex response. Check CLI version and connection.");
+        }
+    });
+    return {
+        request,
+        write,
+        close,
+        /** 任务与模型查询使用相同客户端身份；初始化成功后才声明就绪。 */
+        async initialize() {
+            await request("initialize", {
+                clientInfo: {
+                    name: "tellrun",
+                    title: "Tellrun",
+                    version: JSON.parse(readFileSync(new URL("../../package.json", import.meta.url), "utf8"))
+                        .version,
+                },
+                capabilities: { experimentalApi: true, requestAttestation: false },
+            });
+            write({ method: "initialized" });
+        },
+    };
+}
+//# sourceMappingURL=codex-rpc.js.map

package/dist/agents/codex-rpc.js.map

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