@xiaoqiong0v0/opencode-ssh-tool 0.5.1 → 0.6.0

package/README.md

@@ -7,10 +7,11 @@ opencode 插件：让 opencode 像人一样操作**长驻交互式终端会话**
 - **长驻会话**：`term_cli connect` 建立连接后，`term_cli exec` 在同一会话执行命令，保留 cwd/环境/后台进程/sudo 缓存
 - **PTY 交互**：分配伪终端，可处理 sudo 密码、vi、top 等交互程序
 - **权限管控**：只读白名单直接放行、危险命令黑名单硬拒、其余走 `context.ask()` 用户审批
-- **命令完成判定**：哨兵标记 + 静默窗口 + 超时三重兜底，动画输出（进度条等）自动识别
-- **历史消息对**：命令+输出 全部存文件（`~/.opencode/plugins-cache/opencode-ssh-tool/<会话>/`），按对数保留（默认 100 对），重启不丢、会话关闭清理
-- **HTTP 终端查看**：默认开启本地服务，浏览器打开可滚动、自动刷新的终端记录页面
-- **多语言**：工具描述默认英文，`SSH_TOOL_LANG=zh` 切中文
+- **命令完成判定**：完成标记法（`<SSH_DONE:seq:退出码>`）+ 静默窗口 + 超时三重兜底，动画输出（进度条等）自动识别；未闭合引号/反引号等会触发 shell 续行的命令提交前拦截
+- **双视图**：transcript（命令+输出消息对）与 raw（xterm.js 实时画面，支持 vi/top 等全屏程序）；终端尺寸前后端一致固定 `120×40`
+- **历史消息对**：命令+输出 全部存文件（`~/.opencode/plugins-cache/opencode-ssh-tool/<会话>/`），按对数保留（默认 100 对），重启不丢、会话关闭清理
+- **HTTP 终端查看**：默认开启本地服务，浏览器打开可查看终端记录（WebSocket 实时推送，无轮询）
+- **多语言**：`toolLang`（工具描述/CLI/session 文案）与 `webLang`（页面 UI）独立配置，默认英文；环境变量 `SSH_TOOL_LANG` / `SSH_WEB_LANG` 分别覆盖
 
 ## 安装
 
@@ -59,8 +60,10 @@ term_cli help                                                     # 完整用法
     // 保留的消息对数上限（默认 100，最小 1）。超出时移除最旧的一对
     "maxMessages": 100
   },
-  // 工具描述语言："en" | "zh"（默认 "en"，可用环境变量 SSH_TOOL_LANG 覆盖）
-  "toolLang": "en",
+  // 工具语言（工具描述 / CLI / agent·session 文案）："en" | "zh"（默认 "en"，可用环境变量 SSH_TOOL_LANG 覆盖）
+  "toolLang": "en",
+  // Web 界面语言（仅浏览器页面 UI 文案）："en" | "zh"（默认 "en"，可用环境变量 SSH_WEB_LANG 覆盖）
+  "webLang": "en",
   // 权限自定义正则（追加到内置默认，控制"拒绝"与"需审批"命令）
   "permission": {
     // 内置默认危险命令黑名单（命中直接拒绝）：
@@ -79,7 +82,7 @@ term_cli help                                                     # 完整用法
 }
 ```
 
-多语言优先级：环境变量 `SSH_TOOL_LANG` > 配置文件 `toolLang` > 默认 `en`。
+多语言：`toolLang` 控制工具侧全部文案（工具描述、CLI 输出、agent/session 回传消息），`webLang` 仅控制浏览器页面 UI。优先级均为「环境变量 > 配置文件 > 默认 `en`」：工具用 `SSH_TOOL_LANG`，Web 用 `SSH_WEB_LANG`。
 
 权限自定义正则**追加**到内置默认（`DENY` 黑名单 + `ALLOW_READONLY` 白名单），`deny`/`allow` 为空数组时仅用内置默认规则，可自行补充扩展。
 
@@ -115,20 +118,21 @@ term_cli exec(command)
 
 服务默认开启（配置 `server.enabled`）。`term_cli status` / `term_cli read`（history 模式）会返回实际地址（端口 0 时自动分配，避免冲突）：
 
-```
-浏览器访问 http://127.0.0.1:<port> 查看可滚动、每 2s 自动刷新的终端记录
-```
-
-页面按会话切换，展示「命令 + 输出」历史对。
+```
+浏览器访问 http://127.0.0.1:<port> 查看终端记录（WebSocket 实时推送）
+```
+
+页面按会话/终端切换，transcript 展示「命令 + 输出」历史对，raw 展示 xterm.js 实时画面。
 
 ## 架构
 
-```
-opencode（插件进程）
-  ├─ ssh2 客户端：长驻连接 + PTY shell（每个 opencode 会话一个）
-  │    └─ 哨兵法执行命令（combo; echo __SSH_DONE_<rand>__）
-  ├─ SessionHistory：命令+输出 消息对（按对数限制，超大落盘）
-  └─ HTTP 服务：127.0.0.1 随机端口，浏览器查看终端记录
+```
+opencode（插件进程）
+  ├─ agent：每会话多个命名终端，PTY 固定 120×40
+  │    ├─ SSH（ssh2 PTY shell）/ 本地·容器（Bun.Terminal）
+  │    └─ 完成标记法执行命令（`command ;markerCmd` → `<SSH_DONE:seq:退出码>`）
+  ├─ server：独立 HTTP 子进程（WS 统一事件流，proto 版本校验）
+  └─ web：transcript（消息对）/ raw（xterm.js）双视图，浏览器实时查看
 ```
 
 ## 开发
@@ -168,8 +172,10 @@ npm publish      # 只发布 dist/
 
 ## 文档
 
-- `docs/requirements/需求说明.md` — 原始需求
-- `docs/design/方案分析.md` — 技术分析、决策、风险
-- `docs/design/结构设计.md` — 编码依据
+- `docs/requirements/需求说明.md` — 原始需求
+- `docs/design/方案分析.md` — 技术分析、决策、风险
+- `docs/design/结构设计.md` — 编码依据
+- `docs/design/消息协议重构设计.md` — WS 统一事件流协议
+- `docs/design/终端渲染与尺寸固定说明.md` — 终端尺寸固定、续行检测、渲染修复
 
 

package/dist/agent.d.ts

@@ -0,0 +1,52 @@
+/** 代理可操作的会话接口（SshSession / LocalSession 子集） */
+export interface AgentSession {
+    exec(command: string): Promise<unknown>;
+    send(text: string): {
+        ok: boolean;
+        error?: string;
+    };
+    close(): void;
+    hasRunningStream(): boolean;
+    getRunningStream(): {
+        data: string;
+        done: boolean;
+    };
+    getRunningCommand(): string;
+    /** 按当前 shell 续行规则拆分多行命令为独立命令 */
+    splitCommand(command: string): string[];
+    /** 设置命令生命周期监听器（cmdStart/cmdDone 事件源） */
+    setLifecycle(listener: ((ev: {
+        type: "start";
+        command: string;
+        ts: number;
+    } | {
+        type: "done";
+        exitCode: number | null;
+        endTs: number;
+        output?: string;
+    }) => void) | null): void;
+    /** 读取原始字节流增量 */
+    readRawStream(pos: number): {
+        data: string;
+        pos: number;
+        reset?: boolean;
+    };
+}
+/** 代理状态 */
+export interface AgentHandle {
+    close(): void;
+    /** 重新注册当前会话列表（增删会话后调用） */
+    reRegister(): void;
+}
+/**
+ * 启动代理客户端：连接独立服务并注册会话，处理转发命令
+ * @param url 服务 WS 地址（如 ws://127.0.0.1:PORT/ws）
+ * @param resolveSession 按 sessionID/name 取会话句柄
+ * @param listSessions 当前本进程持有的全部会话（返回 {sessionID, name}[]）
+ * @returns 代理句柄
+ */
+export declare function startAgent(url: string, resolveSession: (sessionID: string, name: string) => AgentSession | undefined, listSessions: () => Array<{
+    sessionID: string;
+    name: string;
+}>): AgentHandle;
+//# sourceMappingURL=agent.d.ts.map

package/dist/agent.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../src/agent.ts"],"names":[],"mappings":"AAMA,+CAA+C;AAC/C,MAAM,WAAW,YAAY;IAC3B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IACvC,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG;QAAE,EAAE,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IACnD,KAAK,IAAI,IAAI,CAAA;IACb,gBAAgB,IAAI,OAAO,CAAA;IAC3B,gBAAgB,IAAI;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE,CAAA;IACnD,iBAAiB,IAAI,MAAM,CAAA;IAC3B,gCAAgC;IAChC,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IACvC,wCAAwC;IACxC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI,CAAA;IAC/K,gBAAgB;IAChB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,CAAA;CAC3E;AAED,WAAW;AACX,MAAM,WAAW,WAAW;IAC1B,KAAK,IAAI,IAAI,CAAA;IACb,0BAA0B;IAC1B,UAAU,IAAI,IAAI,CAAA;CACnB;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CACxB,GAAG,EAAE,MAAM,EACX,cAAc,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,YAAY,GAAG,SAAS,EAC7E,YAAY,EAAE,MAAM,KAAK,CAAC;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,GAC7D,WAAW,CA8Mb"}

package/dist/agent.js

@@ -0,0 +1,250 @@
+// 代理客户端：插件进程连上独立服务（WS），注册本进程持有的会话，
+// 处理服务转发来的交互命令（run-exec / run-send / run-delete），并把实时流推给服务。
+import log from "./log.js";
+import { INTERACTIVE_BUSY_MS } from "./constants.js";
+/**
+ * 启动代理客户端：连接独立服务并注册会话，处理转发命令
+ * @param url 服务 WS 地址（如 ws://127.0.0.1:PORT/ws）
+ * @param resolveSession 按 sessionID/name 取会话句柄
+ * @param listSessions 当前本进程持有的全部会话（返回 {sessionID, name}[]）
+ * @returns 代理句柄
+ */
+export function startAgent(url, resolveSession, listSessions) {
+    let ws = null;
+    let closed = false;
+    let timer = null;
+    const wsUrl = url.startsWith("ws://") ? url : `ws://${url}`;
+    const send = (msg) => {
+        if (ws && ws.readyState === WebSocket.OPEN)
+            ws.send(JSON.stringify(msg));
+    };
+    const register = () => {
+        send({ type: "register", sessions: listSessions() });
+    };
+    const rawPosMap = new Map();
+    /** 已挂接生命周期监听的会话对象（按对象去重：同名会话断开重建是新对象，需重新挂接） */
+    const lifeHooked = new WeakSet();
+    /** 会话执行队列：命令 busy 时 web 提交的命令排队，当前命令完成后依次执行（key=sessionID:name） */
+    const execQueue = new Map();
+    /** 各终端最近一次命令提交时间戳（busy 分流：<阈值视为连续命令排队，≥阈值视为交互输入 send） */
+    const lastSubmitTs = new Map();
+    /** 为某个会话挂接生命周期监听：cmdStart/cmdDone 由 BaseSession 精确发出（web exec 与插件 exec 统一来源） */
+    const hookLifecycle = (key, session) => {
+        if (lifeHooked.has(session))
+            return;
+        lifeHooked.add(session);
+        const sep = key.indexOf(":");
+        const sid = key.slice(0, sep), name = key.slice(sep + 1);
+        session.setLifecycle((ev) => {
+            if (ev.type === "start") {
+                send({ type: "cmdStart", sessionID: sid, name, command: ev.command, ts: ev.ts });
+            }
+            else {
+                // 快速命令（生命周期落在单个 tick 内）可能没被 pushStreams 推过 out：
+                // done 携带完整输出时补推一次 out（final=true，server 替换而非追加，
+                // 避免与已推的增量重复），保证 web 能看到命令输出（不仅 cmdline）
+                if (ev.output) {
+                    send({ type: "out", sessionID: sid, name, data: ev.output, final: true });
+                }
+                send({ type: "cmdDone", sessionID: sid, name, exitCode: ev.exitCode, endTs: ev.endTs });
+                // 出队下一条命令由 execQueued 在 promise resolve 后处理（见上），此处不再重复出队
+            }
+        });
+    };
+    /** 执行单条命令；完成后从队列取下一条继续（在 promise resolve 后才出队，
+     *  保证上一条的 running context 已清理，出队的下一条不会因 busy 误判被跳过） */
+    const execQueued = (sid, name, command) => {
+        const session = resolveSession(sid, name);
+        if (!session) {
+            send({ type: "cmdDone", sessionID: sid, name, exitCode: null, endTs: Date.now() });
+            return Promise.resolve();
+        }
+        const key = `${sid}:${name}`;
+        return session.exec(command).then((result) => {
+            // exec 同步等待：正常完成/动画等待均会触发生命周期 done（cmdDone）。
+            // 仅 quick-fail（busy/未连接，返回 {ok:false}）不会发 done —— 补一条兜底防 server busy 卡死
+            if (result && typeof result === "object" && "ok" in result && !result.ok) {
+                // 失败（busy/未连接/引号不闭合等）：把错误文本作为输出回传，web 端可见失败原因
+                const err = result.error;
+                if (err)
+                    send({ type: "out", sessionID: sid, name, data: err, final: true });
+                send({ type: "cmdDone", sessionID: sid, name, exitCode: null, endTs: Date.now() });
+            }
+            // 出队下一条：此刻上一条已完成，running context 已清理（resolve 在 lifecycle done 之后）
+            const q = execQueue.get(key);
+            const next = q?.shift();
+            if (q && q.length === 0)
+                execQueue.delete(key);
+            if (next) {
+                log.info(`agent 队列出队执行 ${sid}/${name}: ${next}`);
+                return execQueued(sid, name, next);
+            }
+            return;
+        }).catch((e) => {
+            log.error(`代理执行失败 ${sid}/${name}`, e instanceof Error ? e.message : String(e));
+            // 命令未运行（异常）：补充 cmdDone 兜底（正常完成由生命周期上报，server 幂等）
+            send({ type: "cmdDone", sessionID: sid, name, exitCode: null, endTs: Date.now() });
+            // 异常也应继续出队下一条，避免队列卡死
+            const q = execQueue.get(key);
+            const next = q?.shift();
+            if (q && q.length === 0)
+                execQueue.delete(key);
+            if (next) {
+                log.info(`agent 队列异常后出队 ${sid}/${name}: ${next}`);
+                return execQueued(sid, name, next);
+            }
+            return;
+        });
+    };
+    const pushStreams = () => {
+        for (const { sessionID, name } of listSessions()) {
+            const session = resolveSession(sessionID, name);
+            const key = `${sessionID}:${name}`;
+            if (!session)
+                continue;
+            hookLifecycle(key, session);
+            const raw = session.readRawStream(rawPosMap.get(key) ?? 0);
+            if (raw.data) {
+                rawPosMap.set(key, raw.pos);
+                send({ type: "raw", sessionID, name, data: raw.data, pos: raw.pos, reset: !!raw.reset });
+            }
+            if (!session.hasRunningStream())
+                continue;
+            const st = session.getRunningStream();
+            if (st.data)
+                send({ type: "out", sessionID, name, data: st.data });
+        }
+    };
+    const connect = () => {
+        if (closed)
+            return;
+        try {
+            ws = new WebSocket(wsUrl);
+        }
+        catch (e) {
+            log.error("代理连接服务失败", e instanceof Error ? e.message : String(e));
+            setTimeout(connect, 2000);
+            return;
+        }
+        ws.onopen = () => {
+            log.info(`代理已连接 ${wsUrl}`);
+            register();
+            timer = setInterval(pushStreams, 100);
+        };
+        ws.onmessage = (ev) => {
+            let msg;
+            try {
+                msg = JSON.parse(String(ev.data));
+            }
+            catch {
+                return;
+            }
+            const t = msg.type;
+            if (!t)
+                return;
+            if (t === "run-exec") {
+                const sid = typeof msg.sessionID === "string" ? msg.sessionID : "";
+                const name = typeof msg.name === "string" ? msg.name : "";
+                const command = typeof msg.command === "string" ? msg.command : "";
+                if (!sid || !command)
+                    return;
+                const session = resolveSession(sid, name);
+                if (!session) {
+                    send({ type: "cmdDone", sessionID: sid, name, exitCode: null, endTs: Date.now() });
+                    return;
+                }
+                // web 输入框回车 = 提交命令：空闲立即执行；忙时按距上次提交间隔分流——
+                //   间隔 < INTERACTIVE_BUSY_MS（连续快速命令，模型连续多行提交）→ 排队依次执行；
+                //   间隔 ≥ 阈值仍 busy（用户给运行中的交互程序输入，如 sudo 密码/REPL）→ 原样 send 交程序。
+                // 不再用 hasRunningStream() 单点猜测——快速命令窗口内到达的后续命令会被误判为交互输入而裸执行。
+                const key = `${sid}:${name}`;
+                const now = Date.now();
+                const last = lastSubmitTs.get(key) ?? 0;
+                lastSubmitTs.set(key, now);
+                if (session.hasRunningStream()) {
+                    if (now - last < INTERACTIVE_BUSY_MS) {
+                        const q = execQueue.get(key);
+                        if (q)
+                            q.push(command);
+                        else
+                            execQueue.set(key, [command]);
+                        log.info(`agent run-exec 排队 ${sid}/${name}: ${command} (队列 ${(execQueue.get(key) ?? []).length})`);
+                        return;
+                    }
+                    log.info(`agent run-exec busy 超阈值按交互输入 ${sid}/${name}: ${command}`);
+                    session.send(command + "\r");
+                    return;
+                }
+                // 多行命令：终端空闲（非交互）时按 shell 续行规则拆成多个独立命令逐条执行（每条独立注入 marker
+                // 进 history，避免整段作为一条执行导致多行回显/多行 marker 剥离困难）；busy（交互中）则不拆，
+                // 整体交给上面的分流逻辑原样处理。
+                const lines = session.splitCommand(command);
+                if (!session.hasRunningStream() && lines.length > 1) {
+                    log.info(`agent run-exec 多行拆分 ${sid}/${name}: ${command.split("\n").length} 行 → ${lines.length} 条`);
+                    for (const [i, c] of lines.entries()) {
+                        if (i === 0)
+                            void execQueued(sid, name, c);
+                        else {
+                            // 循环内每次重新取队列引用：首次用 set 建数组后，后续用 push 追加（避免 set 覆盖丢命令）
+                            const q = execQueue.get(key);
+                            if (q)
+                                q.push(c);
+                            else
+                                execQueue.set(key, [c]);
+                        }
+                    }
+                    return;
+                }
+                log.info(`agent run-exec 直接执行 ${sid}/${name}: ${command}`);
+                void execQueued(sid, name, command);
+                return;
+            }
+            if (t === "run-send") {
+                const sid = typeof msg.sessionID === "string" ? msg.sessionID : "";
+                const name = typeof msg.name === "string" ? msg.name : "";
+                const text = typeof msg.text === "string" ? msg.text : "";
+                const session = resolveSession(sid, name);
+                if (session) {
+                    lastSubmitTs.set(`${sid}:${name}`, Date.now());
+                    session.send(text);
+                }
+                return;
+            }
+            if (t === "run-delete") {
+                const sid = typeof msg.sessionID === "string" ? msg.sessionID : "";
+                const name = typeof msg.name === "string" ? msg.name : "";
+                const session = resolveSession(sid, name);
+                if (session)
+                    session.close();
+                return;
+            }
+        };
+        ws.onclose = () => {
+            if (timer) {
+                clearInterval(timer);
+                timer = null;
+            }
+            if (closed)
+                return;
+            log.info("代理连接断开，2s 后重连");
+            setTimeout(connect, 2000);
+        };
+        ws.onerror = () => { };
+    };
+    connect();
+    return {
+        close: () => {
+            closed = true;
+            if (timer) {
+                clearInterval(timer);
+                timer = null;
+            }
+            try {
+                ws?.close();
+            }
+            catch { /* ignore */ }
+        },
+        reRegister: register,
+    };
+}
+//# sourceMappingURL=agent.js.map

package/dist/agent.js.map

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

package/dist/base-session.d.ts

@@ -1,5 +1,6 @@
 import { SessionHistory } from "./history.js";
 import { type ShellAdapter } from "./shell-adapter.js";
+import { type Lang } from "./i18n.js";
 /** 命令执行结果 */
 export interface ExecResult {
     ok: boolean;
@@ -12,10 +13,22 @@ export interface ExecResult {
     command?: string;
     duration?: number;
 }
+/** 生命周期事件（命令开始/完成），供 agent 转报 server（web 与插件自身 exec 统一来源） */
+export type LifecycleEvent = {
+    type: "start";
+    command: string;
+    ts: number;
+} | {
+    type: "done";
+    exitCode: number | null;
+    endTs: number;
+    output?: string;
+};
 /** 会话命令执行与读取的公共实现 */
 export declare abstract class BaseSession {
     protected readonly sessionID: string;
     protected readonly name: string;
+    protected readonly _lang: Lang;
     protected _connected: boolean;
     protected _remoteBusy: boolean;
     protected _buffer: string;
@@ -24,6 +37,10 @@ export declare abstract class BaseSession {
     protected _runningStartPos: number | null;
     protected _runningCommand: string;
     protected _watchTimer: ReturnType<typeof setInterval> | null;
+    /** 命令序号（完成标记 <SSH_DONE:seq:code> 标识本次命令，防残留误判） */
+    private _cmdSeq;
+    /** 当前命令序号（_beginCapture 递增，供检测/拼接用） */
+    private _runningSeq;
     /** 下次捕获窗口起点（相对当前 buffer）：前一条命令结束后，标记/残留从此处开始 */
     protected _cursor: number;
     /** WS 实时流已发送位置（相对 buffer 偏移）；null = 尚未定位命令回显结束点 */
@@ -40,15 +57,22 @@ export declare abstract class BaseSession {
     /** 累积原始字节总数（单调递增，前端增量游标） */
     private _rawTotal;
     protected readonly _history: SessionHistory;
-    constructor(sessionID: string, history: SessionHistory, name?: string);
+    /** 生命周期监听器（命令开始/完成事件，agent 转报 server） */
+    private _lifecycle;
+    /**
+     * 本次命令期间是否真实发送过中断（Ctrl-C）。
+     * 中断判定不依赖"命令回显定位"：超宽命令被 readline 折行重绘时回显会多出字符，
+     * 精确匹配必然失败（echoEnd=0），若再以 echoEnd 为前置条件则 ^C 永远检测不到 → busy 卡死。
+     * 仅当确实发过 ^C 才去缓冲区找 ^C 回显，天然排除历史残留 ^C 的误判。
+     */
+    private _interruptSent;
+    constructor(sessionID: string, history: SessionHistory, name?: string, _lang?: Lang);
     /** 向传输层写入字节（子类实现：SSH 写 stream / 本地写 Bun.Terminal） */
     protected abstract _write(data: string): void;
     /** 关闭传输层资源（子类实现：SSH 关 client+stream / 本地关 term+proc） */
     protected abstract _closeTransport(): void;
     /** 结果中的类型专属字段（SSH 附加 host，本地为空） */
     protected get _extraResult(): Partial<ExecResult>;
-    /** 忙碌提示中的状态命令名（ssh_status / local_status） */
-    protected abstract _statusCmd: string;
     /**
      * 异步提交命令：立即返回，命令后台执行，输出由后台监听收集进 history
      * @param command 命令
@@ -83,6 +107,21 @@ export declare abstract class BaseSession {
     getHistory(): SessionHistory;
     getRunningOutput(): string;
     getRunningCommand(): string;
+    /**
+     * 按当前 shell 的行续行规则拆分多行命令为独立命令（供 agent 端多行命令拆条执行）
+     * @param command 可能含换行的命令文本
+     * @returns 拆分后的独立命令列表；未识别 shell 时按普通换行拆分
+     */
+    splitCommand(command: string): string[];
+    /**
+     * 设置命令生命周期监听器（命令开始/完成时回调）
+     * @param listener 回调（start 携带命令，done 携带退出码与结束时刻；null 表示清除）
+     */
+    setLifecycle(listener: ((ev: LifecycleEvent) => void) | null): void;
+    /** 触发命令开始事件 */
+    private _emitStart;
+    /** 触发命令完成事件 */
+    private _emitDone;
     hasRunningStream(): boolean;
     /**
      * 增量取运行中命令的实时输出（WS 推流用）：
@@ -103,24 +142,51 @@ export declare abstract class BaseSession {
     };
     /** 是否连接且传输层就绪（子类检查自身传输对象） */
     protected abstract _ready(): boolean;
+    /**
+     * 本会话当前命令的完成标记命令（adapter 负责各自的标记语法，无 adapter 时用 POSIX 默认）
+     * @param seq 命令序号
+     * @returns 标记命令文本
+     */
+    private _markerCmd;
+    /**
+     * 组合写入命令（实际写入 PTY 的文本，尾部带 \r 回车）
+     * @param command 原始命令（history 存干净版本）
+     * @returns 实际写入 PTY 的文本
+     */
+    private _composeCommand;
+    /**
+     * 组合命令文本（无尾部 \r）：命令 + 完成标记，同时供 extractOutputStart 定位回显结束。
+     * 普通命令用 `;` 同行拼接（免疫 prompt 框架覆盖）：`python; printf ...` 中 printf 由 shell 在 python
+     * 退出后执行，不会被 REPL 当 stdin 消费（实测 top/read/python 均正常出 marker）。
+     * 含 heredoc 的命令改用换行分隔：标记若以 `;` 拼到分隔符行（`EOF ;printf ...`），
+     * heredoc 分隔符不再被识别 → 永不结束 → 卡死。
+     * 交互程序（top/vi/read/python 等）期间保留 running 上下文与 busy，marker 出现即判定完成。
+     * @param command 原始命令
+     * @returns 命令 + 标记文本（无 \r）
+     */
+    private _composeEchoText;
+    /**
+     * 提取命令纯输出：从命令回显后切到完成标记（无标记则切到中断回显 ^C 处），
+     * 顺带去掉追加的标记命令回显行。
+     * 回显定位使用组合命令文本（command + 标记段）而非裸命令：裸命令可能出现在程序错误输出中
+     * （如 `pw` 的错误行 `bash: pw: command not found`），而组合命令整行回显是唯一的，
+     * 可避免 last-match 误命中错误行导致输出被裁空。
+     * @param raw 本次执行窗口原始字节流
+     * @param command 原始命令（历史用）
+     * @returns 纯程序输出原始流
+     */
+    private _extractOutput;
     /** 命令执行/提交前准备：裁剪已消费缓冲 + 丢弃上一条命令的迟到残留标记 */
     private _beginCapture;
     /** 追加输出字节：维护业务缓冲 + 连续原始流 ring */
     protected _appendBuffer(text: string): void;
-    /** 探测 shell 类型：deadline 内循环发送探测命令并解析输出（shell 慢启动时也能等到就绪） */
+    /** 探测 shell 类型：按各适配器 probeCommand 逐个探测（POSIX 系优先，pwsh/cmd 用各自独有命令），
+     *  login shell 的 $0 带 - 前缀（-bash/-zsh）由对应 parseProbe 容忍 */
     protected _probeShell(deadline: number): Promise<ShellAdapter | null>;
     /** 等待探测输出稳定：buffer 有内容且 500ms 不再变化则返回，超时返回 null */
     private _waitProbeOutput;
-    /**
-   * deadline 内循环注入+等待确认，成功返回 true，超时返回 false
-   * 逐行发送避免因 shell 未就绪导致的整块丢失；每轮等待最大 3s
-   * 注入命令原样回显（不抑制），确认以 echo 唯一标识为准，避免与后续命令时序混淆
-   */
-    protected _injectAndSettle(deadline: number): Promise<boolean>;
-    /** 等待缓冲中出现指定文本（最多 maxMs） */
-    private _waitForBufferToken;
     private _waitCompletion;
-    /** 后台监听：轮询 done 标记 → 收集输出进 history + busy=false */
+    /** 后台监听：轮询 done 标记 / ^C 中断 → 收集输出进 history + busy=false */
     private _startBackgroundWatch;
     protected _clearRunningContext(): void;
     private _truncate;

package/dist/base-session.d.ts.map

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