@x-otto/cli 0.0.1-alpha.42 → 0.0.1-alpha.44
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +13 -6
- package/dist/build-id-D_JURZdd.js +3 -0
- package/dist/build-id-D_JURZdd.js.map +1 -0
- package/dist/bundled-extensions/plugin-otto-wire-protocols/plugin-dist/meta.json +1 -1
- package/dist/bundled-extensions/plugin-otto-wire-protocols/plugin-dist/plugin.cjs +2 -1
- package/dist/bundled-extensions/plugin-otto-wire-protocols/src/openai-responses.ts +5 -1
- package/dist/{command-dispatcher-yqVwk7Gk.js → command-dispatcher-Dxj41r5P.js} +14 -14
- package/dist/command-dispatcher-Dxj41r5P.js.map +1 -0
- package/dist/config-migration-DatflIxs.js.map +1 -1
- package/dist/create-host-app-DG58-vRA.js +2 -0
- package/dist/{daemon-base-YOWgYYN7.js → daemon-base-Y1XI61JY.js} +1 -1
- package/dist/{daemon-base-YOWgYYN7.js.map → daemon-base-Y1XI61JY.js.map} +1 -1
- package/dist/{doctor-CuNvDmyA.js → doctor-DXBLkbkP.js} +9 -9
- package/dist/doctor-DXBLkbkP.js.map +1 -0
- package/dist/{doctor-attach-_zeIJewx.js → doctor-attach-DEMuyBOk.js} +2 -2
- package/dist/{doctor-attach-_zeIJewx.js.map → doctor-attach-DEMuyBOk.js.map} +1 -1
- package/dist/{doctor-cdp-K_mIFRfA.js → doctor-cdp-CnJUVNOB.js} +1 -1
- package/dist/{doctor-cdp-K_mIFRfA.js.map → doctor-cdp-CnJUVNOB.js.map} +1 -1
- package/dist/{doctor-heap-Rr2nNvcw.js → doctor-heap-Eu3LZj-F.js} +2 -2
- package/dist/{doctor-heap-Rr2nNvcw.js.map → doctor-heap-Eu3LZj-F.js.map} +1 -1
- package/dist/{doctor-ps-OL3FGQYu.js → doctor-ps-JBgCH77n.js} +2 -2
- package/dist/{doctor-ps-OL3FGQYu.js.map → doctor-ps-JBgCH77n.js.map} +1 -1
- package/dist/export-trajectory-D-BcH0Wt.js +14 -0
- package/dist/export-trajectory-D-BcH0Wt.js.map +1 -0
- package/dist/extension-CTyrcdT1.js +2 -0
- package/dist/{extension-1-lxuerZ.js → extension-DVEml5IN.js} +35 -34
- package/dist/{extension-1-lxuerZ.js.map → extension-DVEml5IN.js.map} +1 -1
- package/dist/{feedback-CYxO8zho.js → feedback-CYFY2MC4.js} +2 -2
- package/dist/{feedback-CYxO8zho.js.map → feedback-CYFY2MC4.js.map} +1 -1
- package/dist/feedback-D7Po4mlE.js +2 -0
- package/dist/{feishu-setup-B6ETf-8Y.js → feishu-setup-5ZoxtH0J.js} +1 -1
- package/dist/{feishu-setup-B6ETf-8Y.js.map → feishu-setup-5ZoxtH0J.js.map} +1 -1
- package/dist/{ftue-doctor-recovery-DeAf8jVo.js → ftue-doctor-recovery-8FeDBFOc.js} +1 -1
- package/dist/{ftue-doctor-recovery-DeAf8jVo.js.map → ftue-doctor-recovery-8FeDBFOc.js.map} +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +7 -7
- package/dist/index.js.map +1 -1
- package/dist/install-DlVJRHRT.js.map +1 -1
- package/dist/{mcp-DbTYT7hB.js → mcp-Cm4-OhXI.js} +1 -1
- package/dist/{mcp-DbTYT7hB.js.map → mcp-Cm4-OhXI.js.map} +1 -1
- package/dist/mcp-server-Dpza3yn2.js +5 -0
- package/dist/mcp-server-Dpza3yn2.js.map +1 -0
- package/dist/{migrate-boDXhEyV.js → migrate-RlBJqJnB.js} +1 -1
- package/dist/{migrate-boDXhEyV.js.map → migrate-RlBJqJnB.js.map} +1 -1
- package/dist/{observe-CZ96Vre9.js → observe-Dxfud-t7.js} +1 -1
- package/dist/{observe-CZ96Vre9.js.map → observe-Dxfud-t7.js.map} +1 -1
- package/dist/parse-cli-BSJEQtBo.js +3 -0
- package/dist/parse-cli-BSJEQtBo.js.map +1 -0
- package/dist/{persistence-CpwMgSMe.js → persistence-CRFhOYx6.js} +2 -2
- package/dist/{persistence-CpwMgSMe.js.map → persistence-CRFhOYx6.js.map} +1 -1
- package/dist/{plugin-assembly-check-C2TephMb.js → plugin-assembly-check-DEozmcJ7.js} +1 -1
- package/dist/{plugin-assembly-check-C2TephMb.js.map → plugin-assembly-check-DEozmcJ7.js.map} +1 -1
- package/dist/proxy-evg7ZvoD.js.map +1 -1
- package/dist/{ps-DKrluEuy.js → ps-DiKCLKbs.js} +1 -1
- package/dist/{ps-DKrluEuy.js.map → ps-DiKCLKbs.js.map} +1 -1
- package/dist/{run-attach-CvGCWF_i.js → run-attach-DDpMk2_N.js} +1 -1
- package/dist/{run-attach-CvGCWF_i.js.map → run-attach-DDpMk2_N.js.map} +1 -1
- package/dist/{serve-DbBDYdoC.js → serve-Ke0nwN9Y.js} +2 -2
- package/dist/{serve-DbBDYdoC.js.map → serve-Ke0nwN9Y.js.map} +1 -1
- package/dist/{version-BmdAi4pI.js → version-BKPdYoHG.js} +2 -2
- package/dist/{version-BmdAi4pI.js.map → version-BKPdYoHG.js.map} +1 -1
- package/package.json +11 -11
- package/dist/build-id-CGCF2QT6.js +0 -3
- package/dist/build-id-CGCF2QT6.js.map +0 -1
- package/dist/command-dispatcher-yqVwk7Gk.js.map +0 -1
- package/dist/create-host-app-DXII2WTM.js +0 -2
- package/dist/doctor-CuNvDmyA.js.map +0 -1
- package/dist/extension-DWGIIBc6.js +0 -2
- package/dist/feedback-CvjPT9wO.js +0 -2
- package/dist/parse-cli--eliQ1xw.js +0 -3
- package/dist/parse-cli--eliQ1xw.js.map +0 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
-
import{t as e}from"./daemon-base-
|
|
2
|
+
import{t as e}from"./daemon-base-Y1XI61JY.js";import{PERSISTENCED_DEFAULT_PORT as t,startPersistenced as n}from"@x-otto/service";import{REMOTE_PERSISTENCE_DEFAULT_PORT as r}from"@x-otto/remote-persistence-server";const i=t,a=`127.0.0.1`;async function o(t,r={}){let o=r.stdout??(e=>process.stdout.write(e)),c=r.stderr??(e=>process.stderr.write(e));if(t[0]===`help`||t[0]===`--help`)return s(o),0;let l,u=i,d=a,f;for(let e=0;e<t.length;e++){let n=t[e];if(n===`--dir`||n===`-d`)l=t[++e];else if(n===`--port`||n===`-p`){let n=t[++e],r=Number(n);if(!Number.isInteger(r)||r<1||r>65535)return c(`otto persistenced: invalid --port value: ${n??`(missing)`}\n`),1;u=r}else n===`--host`||n===`-h`?d=t[++e]??a:(n===`--token`||n===`-t`)&&(f=t[++e])}if(!l)return c(`otto persistenced: --dir is required
|
|
3
3
|
`),1;if(!f)return c(`otto persistenced: --token is required
|
|
4
4
|
`),1;try{let{url:t}=await n({dir:l,port:u,host:d,token:f});o(`persistenced listening on ${t}
|
|
5
5
|
storage: ${t}/api/storage/:namespace
|
|
@@ -82,4 +82,4 @@ import{t as e}from"./daemon-base-YOWgYYN7.js";import{PERSISTENCED_DEFAULT_PORT a
|
|
|
82
82
|
|
|
83
83
|
注:旧命令 otto persistenced / otto remote-persistence-server 仍可用(别名转发)。
|
|
84
84
|
`),0}}export{f as runPersistenceCommand};
|
|
85
|
-
//# sourceMappingURL=persistence-
|
|
85
|
+
//# sourceMappingURL=persistence-CRFhOYx6.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"persistence-CpwMgSMe.js","names":["DEFAULT_PORT","DEFAULT_HOST","printHelp"],"sources":["../src/commands/persistenced.ts","../src/commands/remote-persistence-server.ts","../src/commands/persistence.ts"],"sourcesContent":["import { startPersistenced, PERSISTENCED_DEFAULT_PORT } from '@x-otto/service'\n\nimport { waitForShutdown } from './daemon-base'\n\nexport interface PersistencedDeps {\n stdout?: (s: string) => void\n stderr?: (s: string) => void\n signal?: AbortSignal\n}\n\n/** 复用 @x-otto/service 的族内单源默认端口,消除双源漂移。 */\nconst DEFAULT_PORT = PERSISTENCED_DEFAULT_PORT\nconst DEFAULT_HOST = '127.0.0.1'\n\nexport async function runPersistencedCommand(\n args: string[],\n deps: PersistencedDeps = {},\n): Promise<number> {\n const stdout = deps.stdout ?? ((s) => process.stdout.write(s))\n const stderr = deps.stderr ?? ((s) => process.stderr.write(s))\n\n if (args[0] === 'help' || args[0] === '--help') {\n printHelp(stdout)\n return 0\n }\n\n let dir: string | undefined\n let port = DEFAULT_PORT\n let host = DEFAULT_HOST\n let token: string | undefined\n\n for (let i = 0; i < args.length; i++) {\n const arg = args[i]\n if (arg === '--dir' || arg === '-d') {\n dir = args[++i]\n } else if (arg === '--port' || arg === '-p') {\n const raw = args[++i]\n const n = Number(raw)\n if (!Number.isInteger(n) || n < 1 || n > 65535) {\n stderr(`otto persistenced: invalid --port value: ${raw ?? '(missing)'}\\n`)\n return 1\n }\n port = n\n } else if (arg === '--host' || arg === '-h') {\n host = args[++i] ?? DEFAULT_HOST\n } else if (arg === '--token' || arg === '-t') {\n token = args[++i]\n }\n }\n\n if (!dir) {\n stderr('otto persistenced: --dir is required\\n')\n return 1\n }\n\n if (!token) {\n stderr('otto persistenced: --token is required\\n')\n return 1\n }\n\n try {\n const { url } = await startPersistenced({ dir, port, host, token })\n\n stdout(`persistenced listening on ${url}\n storage: ${url}/api/storage/:namespace\n events: ${url}/api/events/:namespace (SSE)\n sync: ${url}/api/sync/:namespace\n health: ${url}/health\n stop: Ctrl-C\n`)\n\n await waitForShutdown(deps.signal)\n stdout('persistenced shutting down\\n')\n // 硬退出:同 serve.ts,避免孤儿 handle 吊住事件循环。\n process.exit(0)\n } catch (error) {\n stderr(\n `otto persistenced: ${error instanceof Error ? error.message : String(error)}\\n`,\n )\n return 1\n }\n}\n\nfunction printHelp(stdout: (s: string) => void): void {\n stdout(`otto persistenced — 独立持久化存储服务(SQLite + HTTP API)\n\n用法:\n otto persistenced --dir <path> --token <token> [--port <n>] [--host <ip>]\n\n选项:\n --dir, -d <path> 数据目录(SQLite db 文件存放位置,必填)\n --token, -t <token> Bearer token(所有 /api/* 请求必须携带,必填)\n --port, -p <n> 监听端口(默认 ${DEFAULT_PORT})\n --host, -h <ip> 监听地址(默认 ${DEFAULT_HOST},0.0.0.0 = 公网暴露)\n\n示例:\n otto persistenced --dir /var/lib/otto/storage --token \"\\$TOKEN\"\n otto persistenced --dir ./data --port 3002 --token dev-secret\n\n端点:\n GET /health 健康检查\n GET /api/storage/:namespace 列出文档 ID / 分页列表\n GET /api/storage/:namespace/:id 读取文档\n PUT /api/storage/:namespace/:id 写入文档\n DELETE /api/storage/:namespace/:id 删除文档\n GET /api/events/:namespace SSE 变更推送\n POST /api/sync/:namespace/push 批量写入(离线同步)\n GET /api/sync/:namespace/pull 增量拉取\n`)\n}\n\n","import { REMOTE_PERSISTENCE_DEFAULT_PORT, type ServerConfig } from '@x-otto/remote-persistence-server'\n\nimport { waitForShutdown } from './daemon-base'\n\nexport interface RemotePersistenceServerDeps {\n stdout?: (s: string) => void\n stderr?: (s: string) => void\n signal?: AbortSignal\n}\n\n/** 复用 @x-otto/remote-persistence-server 的族内单源默认端口,消除双源漂移。 */\nconst DEFAULT_PORT = REMOTE_PERSISTENCE_DEFAULT_PORT\nconst DEFAULT_HOST = '127.0.0.1'\n\nexport async function runRemotePersistenceServerCommand(\n args: string[],\n deps: RemotePersistenceServerDeps = {},\n): Promise<number> {\n const stdout = deps.stdout ?? ((s) => process.stdout.write(s))\n const stderr = deps.stderr ?? ((s) => process.stderr.write(s))\n\n if (args[0] === 'help' || args[0] === '--help') {\n printHelp(stdout)\n return 0\n }\n\n let dir: string | undefined\n let port = DEFAULT_PORT\n let host = DEFAULT_HOST\n let token: string | undefined\n\n for (let i = 0; i < args.length; i++) {\n const arg = args[i]\n if (arg === '--dir' || arg === '-d') {\n dir = args[++i]\n } else if (arg === '--port' || arg === '-p') {\n const raw = args[++i]\n const n = Number(raw)\n if (!Number.isInteger(n) || n < 1 || n > 65535) {\n stderr(\n `otto remote-persistence-server: invalid --port value: ${raw ?? '(missing)'}\\n`,\n )\n return 1\n }\n port = n\n } else if (arg === '--host' || arg === '-h') {\n host = args[++i] ?? DEFAULT_HOST\n } else if (arg === '--token' || arg === '-t') {\n token = args[++i]\n }\n }\n\n if (!dir) {\n stderr('otto remote-persistence-server: --dir is required\\n')\n return 1\n }\n\n if (token === undefined) {\n stderr(\n 'otto remote-persistence-server: --token is required (use --token \"\" to disable auth for dev only)\\n',\n )\n return 1\n }\n\n const { startServer } = await import('@x-otto/remote-persistence-server')\n\n try {\n const config: ServerConfig = { dataDir: dir, port, authToken: token }\n const { url, server, store } = await startServer(config, { host })\n\n stdout(`remote-persistence-server listening on ${url}\n sessions: ${url}/sessions\n health: ${url}/health\n stop: Ctrl-C\n`)\n\n await waitForShutdown(deps.signal)\n stdout('remote-persistence-server shutting down\\n')\n await new Promise<void>((resolve) => server.close(() => resolve()))\n store.close()\n // 硬退出:同 serve.ts,避免孤儿 handle 吊住事件循环。\n process.exit(0)\n } catch (error) {\n stderr(\n `otto remote-persistence-server: ${error instanceof Error ? error.message : String(error)}\\n`,\n )\n return 1\n }\n}\n\nfunction printHelp(stdout: (s: string) => void): void {\n stdout(`otto remote-persistence-server — 最小化远程持久化服务(Hono + SQLite,5 REST 端点)\n\n用法:\n otto remote-persistence-server --dir <path> --token <token> [--port <n>] [--host <ip>]\n\n选项:\n --dir, -d <path> 数据目录(SQLite db 文件存放位置,必填)\n --token, -t <token> Bearer token(所有 /sessions/* 请求必须携带,必填)\n --port, -p <n> 监听端口(默认 ${DEFAULT_PORT})\n --host, -h <ip> 监听地址(默认 ${DEFAULT_HOST},0.0.0.0 = 公网暴露)\n\n示例:\n otto remote-persistence-server --dir ./data --token dev-secret\n otto remote-persistence-server --dir /var/lib/otto/storage --port 3002 --token \"\\$TOKEN\"\n\n端点(:wsKey 为客户端工作区分区段,本服务 accept-and-ignore,按 token 派生 userId 分区):\n GET /health 健康检查(无需认证)\n GET /sessions/:wsKey 列出会话 ID(需要 Bearer token)\n GET /sessions/:wsKey/:id 读取会话快照\n PUT /sessions/:wsKey/:id 写入/更新会话快照\n DELETE /sessions/:wsKey/:id 删除会话快照\n\n对端客户端:\n 另一台机器上的 Otto CLI:\n otto --session-url http://<host>:<port>/sessions --session-token <token>\n`)\n}\n","/**\n * `otto persistence` 子命令 —— 持久化服务族(local / remote)的薄路由。\n *\n * RFC-369 M4:persistence 收编 persistenced(local)与 remote-persistence-server(remote)\n * 为子命令。旧入口 `otto persistenced` / `otto remote-persistence-server` 作为别名保留,\n * 内部分别转发到本命令的 `local` / `remote` 子路径。\n */\nimport { runPersistencedCommand, type PersistencedDeps } from './persistenced'\nimport {\n runRemotePersistenceServerCommand,\n type RemotePersistenceServerDeps,\n} from './remote-persistence-server'\n\n/**\n * persistence 路由的 deps —— 是 PersistencedDeps 与 RemotePersistenceServerDeps 的并集\n * (两者结构相同:stdout? / stderr? / signal?,并集保持兼容)。\n */\nexport type PersistenceDeps = PersistencedDeps & RemotePersistenceServerDeps\n\nexport async function runPersistenceCommand(\n args: string[],\n deps: PersistenceDeps = {},\n): Promise<number> {\n const stdout = deps.stdout ?? ((s) => process.stdout.write(s))\n\n const [subCommand, ...rest] = args\n\n switch (subCommand) {\n case 'local':\n return runPersistencedCommand(rest, deps)\n case 'remote':\n return runRemotePersistenceServerCommand(rest, deps)\n default:\n stdout(`otto persistence — 持久化服务族(local / remote)\n\n用法:\n otto persistence local [...flags] 启动独立持久化服务(storage + events + sync)\n otto persistence remote [...flags] 启动最小化远程持久化服务(5 REST 端点)\n\n子命令说明:\n local 等价于旧 otto persistenced(SQLite + HTTP API,storage/events/sync)\n remote 等价于旧 otto remote-persistence-server(Hono + SQLite,5 REST 端点)\n\n通用选项(详见各子命令 --help):\n --dir, -d <path> 数据目录(必填)\n --token, -t <token> Bearer token(必填)\n --port, -p <n> 监听端口(各子命令有各自默认端口)\n --host, -h <ip> 监听地址(默认 127.0.0.1,0.0.0.0 = 公网暴露)\n\n注:旧命令 otto persistenced / otto remote-persistence-server 仍可用(别名转发)。\n`)\n return 0\n }\n}\n"],"mappings":";qNAWA,MAAMA,EAAe,EACfC,EAAe,YAErB,eAAsB,EACpB,EACA,EAAyB,EAAE,CACV,CACjB,IAAM,EAAS,EAAK,SAAY,GAAM,QAAQ,OAAO,MAAM,EAAE,EACvD,EAAS,EAAK,SAAY,GAAM,QAAQ,OAAO,MAAM,EAAE,EAE7D,GAAI,EAAK,KAAO,QAAU,EAAK,KAAO,SAEpC,OADA,EAAU,EAAO,CACV,EAGT,IAAI,EACA,EAAOD,EACP,EAAOC,EACP,EAEJ,IAAK,IAAI,EAAI,EAAG,EAAI,EAAK,OAAQ,IAAK,CACpC,IAAM,EAAM,EAAK,GACjB,GAAI,IAAQ,SAAW,IAAQ,KAC7B,EAAM,EAAK,EAAE,WACJ,IAAQ,UAAY,IAAQ,KAAM,CAC3C,IAAM,EAAM,EAAK,EAAE,GACb,EAAI,OAAO,EAAI,CACrB,GAAI,CAAC,OAAO,UAAU,EAAE,EAAI,EAAI,GAAK,EAAI,MAEvC,OADA,EAAO,4CAA4C,GAAO,YAAY,IAAI,CACnE,EAET,EAAO,OACE,IAAQ,UAAY,IAAQ,KACrC,EAAO,EAAK,EAAE,IAAMA,GACX,IAAQ,WAAa,IAAQ,QACtC,EAAQ,EAAK,EAAE,IAInB,GAAI,CAAC,EAEH,OADA,EAAO;EAAyC,CACzC,EAGT,GAAI,CAAC,EAEH,OADA,EAAO;EAA2C,CAC3C,EAGT,GAAI,CACF,GAAM,CAAE,OAAQ,MAAM,EAAkB,CAAE,MAAK,OAAM,OAAM,QAAO,CAAC,CAEnE,EAAO,6BAA6B,EAAI;cAC9B,EAAI;cACJ,EAAI;cACJ,EAAI;cACJ,EAAI;;EAEhB,CAEE,MAAM,EAAgB,EAAK,OAAO,CAClC,EAAO;EAA+B,CAEtC,QAAQ,KAAK,EAAE,OACR,EAAO,CAId,OAHA,EACE,sBAAsB,aAAiB,MAAQ,EAAM,QAAU,OAAO,EAAM,CAAC,IAC9E,CACM,GAIX,SAASC,EAAU,EAAmC,CACpD,EAAO;;;;;;;;gCAQuBF,EAAa;gCACbC,EAAa;;;;;;;;;;;;;;;EAe3C,CCjGF,MAAM,EAAe,EACf,EAAe,YAErB,eAAsB,EACpB,EACA,EAAoC,EAAE,CACrB,CACjB,IAAM,EAAS,EAAK,SAAY,GAAM,QAAQ,OAAO,MAAM,EAAE,EACvD,EAAS,EAAK,SAAY,GAAM,QAAQ,OAAO,MAAM,EAAE,EAE7D,GAAI,EAAK,KAAO,QAAU,EAAK,KAAO,SAEpC,OADA,EAAU,EAAO,CACV,EAGT,IAAI,EACA,EAAO,EACP,EAAO,EACP,EAEJ,IAAK,IAAI,EAAI,EAAG,EAAI,EAAK,OAAQ,IAAK,CACpC,IAAM,EAAM,EAAK,GACjB,GAAI,IAAQ,SAAW,IAAQ,KAC7B,EAAM,EAAK,EAAE,WACJ,IAAQ,UAAY,IAAQ,KAAM,CAC3C,IAAM,EAAM,EAAK,EAAE,GACb,EAAI,OAAO,EAAI,CACrB,GAAI,CAAC,OAAO,UAAU,EAAE,EAAI,EAAI,GAAK,EAAI,MAIvC,OAHA,EACE,yDAAyD,GAAO,YAAY,IAC7E,CACM,EAET,EAAO,OACE,IAAQ,UAAY,IAAQ,KACrC,EAAO,EAAK,EAAE,IAAM,GACX,IAAQ,WAAa,IAAQ,QACtC,EAAQ,EAAK,EAAE,IAInB,GAAI,CAAC,EAEH,OADA,EAAO;EAAsD,CACtD,EAGT,GAAI,IAAU,IAAA,GAIZ,OAHA,EACE;EACD,CACM,EAGT,GAAM,CAAE,eAAgB,MAAM,OAAO,qCAErC,GAAI,CAEF,GAAM,CAAE,MAAK,SAAQ,SAAU,MAAM,EADR,CAAE,QAAS,EAAK,OAAM,UAAW,EAAO,CACZ,CAAE,OAAM,CAAC,CAElE,EAAO,0CAA0C,EAAI;eAC1C,EAAI;eACJ,EAAI;;EAEjB,CAEE,MAAM,EAAgB,EAAK,OAAO,CAClC,EAAO;EAA4C,CACnD,MAAM,IAAI,QAAe,GAAY,EAAO,UAAY,GAAS,CAAC,CAAC,CACnE,EAAM,OAAO,CAEb,QAAQ,KAAK,EAAE,OACR,EAAO,CAId,OAHA,EACE,mCAAmC,aAAiB,MAAQ,EAAM,QAAU,OAAO,EAAM,CAAC,IAC3F,CACM,GAIX,SAAS,EAAU,EAAmC,CACpD,EAAO;;;;;;;;gCAQuB,EAAa;gCACb,EAAa;;;;;;;;;;;;;;;;EAgB3C,CCjGF,eAAsB,EACpB,EACA,EAAwB,EAAE,CACT,CACjB,IAAM,EAAS,EAAK,SAAY,GAAM,QAAQ,OAAO,MAAM,EAAE,EAEvD,CAAC,EAAY,GAAG,GAAQ,EAE9B,OAAQ,EAAR,CACE,IAAK,QACH,OAAO,EAAuB,EAAM,EAAK,CAC3C,IAAK,SACH,OAAO,EAAkC,EAAM,EAAK,CACtD,QAmBE,OAlBA,EAAO;;;;;;;;;;;;;;;;;EAiBX,CACW"}
|
|
1
|
+
{"version":3,"file":"persistence-CRFhOYx6.js","names":["DEFAULT_PORT","DEFAULT_HOST","printHelp"],"sources":["../src/commands/persistenced.ts","../src/commands/remote-persistence-server.ts","../src/commands/persistence.ts"],"sourcesContent":["import { startPersistenced, PERSISTENCED_DEFAULT_PORT } from '@x-otto/service'\n\nimport { waitForShutdown } from './daemon-base'\n\nexport interface PersistencedDeps {\n stdout?: (s: string) => void\n stderr?: (s: string) => void\n signal?: AbortSignal\n}\n\n/** 复用 @x-otto/service 的族内单源默认端口,消除双源漂移。 */\nconst DEFAULT_PORT = PERSISTENCED_DEFAULT_PORT\nconst DEFAULT_HOST = '127.0.0.1'\n\nexport async function runPersistencedCommand(\n args: string[],\n deps: PersistencedDeps = {},\n): Promise<number> {\n const stdout = deps.stdout ?? ((s) => process.stdout.write(s))\n const stderr = deps.stderr ?? ((s) => process.stderr.write(s))\n\n if (args[0] === 'help' || args[0] === '--help') {\n printHelp(stdout)\n return 0\n }\n\n let dir: string | undefined\n let port = DEFAULT_PORT\n let host = DEFAULT_HOST\n let token: string | undefined\n\n for (let i = 0; i < args.length; i++) {\n const arg = args[i]\n if (arg === '--dir' || arg === '-d') {\n dir = args[++i]\n } else if (arg === '--port' || arg === '-p') {\n const raw = args[++i]\n const n = Number(raw)\n if (!Number.isInteger(n) || n < 1 || n > 65535) {\n stderr(`otto persistenced: invalid --port value: ${raw ?? '(missing)'}\\n`)\n return 1\n }\n port = n\n } else if (arg === '--host' || arg === '-h') {\n host = args[++i] ?? DEFAULT_HOST\n } else if (arg === '--token' || arg === '-t') {\n token = args[++i]\n }\n }\n\n if (!dir) {\n stderr('otto persistenced: --dir is required\\n')\n return 1\n }\n\n if (!token) {\n stderr('otto persistenced: --token is required\\n')\n return 1\n }\n\n try {\n const { url } = await startPersistenced({ dir, port, host, token })\n\n stdout(`persistenced listening on ${url}\n storage: ${url}/api/storage/:namespace\n events: ${url}/api/events/:namespace (SSE)\n sync: ${url}/api/sync/:namespace\n health: ${url}/health\n stop: Ctrl-C\n`)\n\n await waitForShutdown(deps.signal)\n stdout('persistenced shutting down\\n')\n // 硬退出:同 serve.ts,避免孤儿 handle 吊住事件循环。\n process.exit(0)\n } catch (error) {\n stderr(\n `otto persistenced: ${error instanceof Error ? error.message : String(error)}\\n`,\n )\n return 1\n }\n}\n\nfunction printHelp(stdout: (s: string) => void): void {\n stdout(`otto persistenced — 独立持久化存储服务(SQLite + HTTP API)\n\n用法:\n otto persistenced --dir <path> --token <token> [--port <n>] [--host <ip>]\n\n选项:\n --dir, -d <path> 数据目录(SQLite db 文件存放位置,必填)\n --token, -t <token> Bearer token(所有 /api/* 请求必须携带,必填)\n --port, -p <n> 监听端口(默认 ${DEFAULT_PORT})\n --host, -h <ip> 监听地址(默认 ${DEFAULT_HOST},0.0.0.0 = 公网暴露)\n\n示例:\n otto persistenced --dir /var/lib/otto/storage --token \"\\$TOKEN\"\n otto persistenced --dir ./data --port 3002 --token dev-secret\n\n端点:\n GET /health 健康检查\n GET /api/storage/:namespace 列出文档 ID / 分页列表\n GET /api/storage/:namespace/:id 读取文档\n PUT /api/storage/:namespace/:id 写入文档\n DELETE /api/storage/:namespace/:id 删除文档\n GET /api/events/:namespace SSE 变更推送\n POST /api/sync/:namespace/push 批量写入(离线同步)\n GET /api/sync/:namespace/pull 增量拉取\n`)\n}\n\n","import { REMOTE_PERSISTENCE_DEFAULT_PORT, type ServerConfig } from '@x-otto/remote-persistence-server'\n\nimport { waitForShutdown } from './daemon-base'\n\nexport interface RemotePersistenceServerDeps {\n stdout?: (s: string) => void\n stderr?: (s: string) => void\n signal?: AbortSignal\n}\n\n/** 复用 @x-otto/remote-persistence-server 的族内单源默认端口,消除双源漂移。 */\nconst DEFAULT_PORT = REMOTE_PERSISTENCE_DEFAULT_PORT\nconst DEFAULT_HOST = '127.0.0.1'\n\nexport async function runRemotePersistenceServerCommand(\n args: string[],\n deps: RemotePersistenceServerDeps = {},\n): Promise<number> {\n const stdout = deps.stdout ?? ((s) => process.stdout.write(s))\n const stderr = deps.stderr ?? ((s) => process.stderr.write(s))\n\n if (args[0] === 'help' || args[0] === '--help') {\n printHelp(stdout)\n return 0\n }\n\n let dir: string | undefined\n let port = DEFAULT_PORT\n let host = DEFAULT_HOST\n let token: string | undefined\n\n for (let i = 0; i < args.length; i++) {\n const arg = args[i]\n if (arg === '--dir' || arg === '-d') {\n dir = args[++i]\n } else if (arg === '--port' || arg === '-p') {\n const raw = args[++i]\n const n = Number(raw)\n if (!Number.isInteger(n) || n < 1 || n > 65535) {\n stderr(\n `otto remote-persistence-server: invalid --port value: ${raw ?? '(missing)'}\\n`,\n )\n return 1\n }\n port = n\n } else if (arg === '--host' || arg === '-h') {\n host = args[++i] ?? DEFAULT_HOST\n } else if (arg === '--token' || arg === '-t') {\n token = args[++i]\n }\n }\n\n if (!dir) {\n stderr('otto remote-persistence-server: --dir is required\\n')\n return 1\n }\n\n if (token === undefined) {\n stderr(\n 'otto remote-persistence-server: --token is required (use --token \"\" to disable auth for dev only)\\n',\n )\n return 1\n }\n\n const { startServer } = await import('@x-otto/remote-persistence-server')\n\n try {\n const config: ServerConfig = { dataDir: dir, port, authToken: token }\n const { url, server, store } = await startServer(config, { host })\n\n stdout(`remote-persistence-server listening on ${url}\n sessions: ${url}/sessions\n health: ${url}/health\n stop: Ctrl-C\n`)\n\n await waitForShutdown(deps.signal)\n stdout('remote-persistence-server shutting down\\n')\n await new Promise<void>((resolve) => server.close(() => resolve()))\n store.close()\n // 硬退出:同 serve.ts,避免孤儿 handle 吊住事件循环。\n process.exit(0)\n } catch (error) {\n stderr(\n `otto remote-persistence-server: ${error instanceof Error ? error.message : String(error)}\\n`,\n )\n return 1\n }\n}\n\nfunction printHelp(stdout: (s: string) => void): void {\n stdout(`otto remote-persistence-server — 最小化远程持久化服务(Hono + SQLite,5 REST 端点)\n\n用法:\n otto remote-persistence-server --dir <path> --token <token> [--port <n>] [--host <ip>]\n\n选项:\n --dir, -d <path> 数据目录(SQLite db 文件存放位置,必填)\n --token, -t <token> Bearer token(所有 /sessions/* 请求必须携带,必填)\n --port, -p <n> 监听端口(默认 ${DEFAULT_PORT})\n --host, -h <ip> 监听地址(默认 ${DEFAULT_HOST},0.0.0.0 = 公网暴露)\n\n示例:\n otto remote-persistence-server --dir ./data --token dev-secret\n otto remote-persistence-server --dir /var/lib/otto/storage --port 3002 --token \"\\$TOKEN\"\n\n端点(:wsKey 为客户端工作区分区段,本服务 accept-and-ignore,按 token 派生 userId 分区):\n GET /health 健康检查(无需认证)\n GET /sessions/:wsKey 列出会话 ID(需要 Bearer token)\n GET /sessions/:wsKey/:id 读取会话快照\n PUT /sessions/:wsKey/:id 写入/更新会话快照\n DELETE /sessions/:wsKey/:id 删除会话快照\n\n对端客户端:\n 另一台机器上的 Otto CLI:\n otto --session-url http://<host>:<port>/sessions --session-token <token>\n`)\n}\n","/**\n * `otto persistence` 子命令 —— 持久化服务族(local / remote)的薄路由。\n *\n * RFC-369 M4:persistence 收编 persistenced(local)与 remote-persistence-server(remote)\n * 为子命令。旧入口 `otto persistenced` / `otto remote-persistence-server` 作为别名保留,\n * 内部分别转发到本命令的 `local` / `remote` 子路径。\n */\nimport { runPersistencedCommand, type PersistencedDeps } from './persistenced'\nimport {\n runRemotePersistenceServerCommand,\n type RemotePersistenceServerDeps,\n} from './remote-persistence-server'\n\n/**\n * persistence 路由的 deps —— 是 PersistencedDeps 与 RemotePersistenceServerDeps 的并集\n * (两者结构相同:stdout? / stderr? / signal?,并集保持兼容)。\n */\nexport type PersistenceDeps = PersistencedDeps & RemotePersistenceServerDeps\n\nexport async function runPersistenceCommand(\n args: string[],\n deps: PersistenceDeps = {},\n): Promise<number> {\n const stdout = deps.stdout ?? ((s) => process.stdout.write(s))\n\n const [subCommand, ...rest] = args\n\n switch (subCommand) {\n case 'local':\n return runPersistencedCommand(rest, deps)\n case 'remote':\n return runRemotePersistenceServerCommand(rest, deps)\n default:\n stdout(`otto persistence — 持久化服务族(local / remote)\n\n用法:\n otto persistence local [...flags] 启动独立持久化服务(storage + events + sync)\n otto persistence remote [...flags] 启动最小化远程持久化服务(5 REST 端点)\n\n子命令说明:\n local 等价于旧 otto persistenced(SQLite + HTTP API,storage/events/sync)\n remote 等价于旧 otto remote-persistence-server(Hono + SQLite,5 REST 端点)\n\n通用选项(详见各子命令 --help):\n --dir, -d <path> 数据目录(必填)\n --token, -t <token> Bearer token(必填)\n --port, -p <n> 监听端口(各子命令有各自默认端口)\n --host, -h <ip> 监听地址(默认 127.0.0.1,0.0.0.0 = 公网暴露)\n\n注:旧命令 otto persistenced / otto remote-persistence-server 仍可用(别名转发)。\n`)\n return 0\n }\n}\n"],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
function e(e){let t=new Set(e.disabled??[]),n=new Set(e.active.map(e=>e.id)),r=e.discovered.filter(e=>!n.has(e.id)&&!t.has(e.id));return{missingFromRuntime:r,missingBundled:r.filter(e=>e.scope===`bundled`),hasGap:r.length>0}}function t(e){if(!e.hasGap)return[];let t=[];e.missingBundled.length>0&&t.push(`内置扩展未装载:${e.missingBundled.map(e=>e.id).join(`, `)}`,` → 宿主装配参数未传达(RFC-364)。若为嵌入式调用,检查 createApp 的 pluginBundledDirs。`);let n=e.missingFromRuntime.filter(e=>e.scope!==`bundled`);return n.length>0&&t.push(`插件已发现但未激活:${n.map(e=>e.id).join(`, `)}`,` → 可能是依赖缺失/版本不兼容/未信任。查看启动日志的 fail-closed 告警定位具体原因。`),t}export{e as checkPluginAssembly,t as formatAssemblyGap};
|
|
3
|
-
//# sourceMappingURL=plugin-assembly-check-
|
|
3
|
+
//# sourceMappingURL=plugin-assembly-check-DEozmcJ7.js.map
|
package/dist/{plugin-assembly-check-C2TephMb.js.map → plugin-assembly-check-DEozmcJ7.js.map}
RENAMED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-assembly-check-
|
|
1
|
+
{"version":3,"file":"plugin-assembly-check-DEozmcJ7.js","names":[],"sources":["../src/plugin-assembly-check.ts"],"sourcesContent":["/**\n * plugin-assembly-check.ts —— RFC-364 M2:装配一致性自检。\n *\n * ## 要解决的问题\n * M1 收敛了装配点,但那只修好了**当前**六处入口。真正的风险是**下一次**——任何新的\n * 装配路径若漏配宿主自描述参数,表现仍然是\"插件静默消失\",用户侧症状是\n * 「Setup Wizard 走完了但模型列表空白」,与真实根因(宿主没告诉 App 自己带了什么)\n * 相距甚远,极难诊断。\n *\n * RFC-364 §4 规则 2:装配缺失必须 fail-loud,不得只写 warn 日志了事。\n *\n * ## 判据\n * 比对两个视图:\n * - **应该可见**:`discoverPluginsWithBundled()`(cli 侧完整发现,含 bundled 层)\n * - **实际装载**:`app.activePlugins()`(App 运行时真正激活的集合)\n *\n * 二者的差集分两类,语义不同、处置不同:\n * - `missingFromRuntime`:发现得到却没装载 → **装配缺口或依赖 fail-closed**,需报告;\n * - 反向差集不检查:App 侧可能因 disabled 配置少装,那是用户意图,不是缺陷。\n *\n * ## 为什么放 cli 而不是 coding\n * 判据依赖 `discoverPluginsWithBundled()`(知道 bundled 目录 = cli 独有知识,见\n * `create-host-app.ts` 头注释论证)。放 coding 会重蹈\"下游包推导宿主布局\"的覆辙。\n *\n * 纯函数 + 端口注入:便于穷举单测,不触真实 App。\n */\n\n/** 一个插件的最小身份(两个视图的公共子集)。 */\nexport interface AssemblyPluginRef {\n id: string\n scope?: string\n}\n\nexport interface AssemblyCheckInput {\n /** cli 侧完整发现的插件(含 bundled 层)。 */\n discovered: readonly AssemblyPluginRef[]\n /** App 运行时实际激活的插件。 */\n active: readonly AssemblyPluginRef[]\n /** 用户显式禁用的插件 id(`disabled_plugins` 配置)——不计入缺口。 */\n disabled?: readonly string[]\n}\n\nexport interface AssemblyCheckResult {\n /** 发现得到但未装载(排除用户显式禁用者)。非空 = 装配不完整。 */\n missingFromRuntime: AssemblyPluginRef[]\n /** 其中属于 bundled 作用域的——这类最可能是\"漏传宿主自描述参数\"的信号。 */\n missingBundled: AssemblyPluginRef[]\n /** 是否存在缺口(供调用方决定是否 fail-loud)。 */\n hasGap: boolean\n}\n\n/**\n * 比对「应该可见」与「实际装载」,给出装配缺口。\n *\n * 用户显式 `disabled` 的插件被排除——那是用户意图,不是装配缺陷。这条很重要:\n * 否则任何禁用过插件的用户都会看到假告警,告警一旦有噪音就会被忽略,\n * 这道门也就失去意义了。\n */\nexport function checkPluginAssembly(input: AssemblyCheckInput): AssemblyCheckResult {\n const disabled = new Set(input.disabled ?? [])\n const activeIds = new Set(input.active.map((p) => p.id))\n\n const missingFromRuntime = input.discovered.filter(\n (p) => !activeIds.has(p.id) && !disabled.has(p.id),\n )\n const missingBundled = missingFromRuntime.filter((p) => p.scope === 'bundled')\n\n return {\n missingFromRuntime,\n missingBundled,\n hasGap: missingFromRuntime.length > 0,\n }\n}\n\n/**\n * 把缺口渲染成面向用户的可执行诊断文本(`otto doctor` 消费)。\n *\n * 措辞指向**根因方向**而非症状:bundled 缺失几乎必然是装配漏配(宿主自描述参数没传到),\n * 其余缺失更可能是依赖 fail-closed(missingDeps/版本门/信任门)。两者给不同的下一步,\n * 避免用户拿着\"插件不见了\"去猜。\n */\nexport function formatAssemblyGap(result: AssemblyCheckResult): string[] {\n if (!result.hasGap) return []\n\n const lines: string[] = []\n if (result.missingBundled.length > 0) {\n lines.push(\n `内置扩展未装载:${result.missingBundled.map((p) => p.id).join(', ')}`,\n ' → 宿主装配参数未传达(RFC-364)。若为嵌入式调用,检查 createApp 的 pluginBundledDirs。',\n )\n }\n const others = result.missingFromRuntime.filter((p) => p.scope !== 'bundled')\n if (others.length > 0) {\n lines.push(\n `插件已发现但未激活:${others.map((p) => p.id).join(', ')}`,\n ' → 可能是依赖缺失/版本不兼容/未信任。查看启动日志的 fail-closed 告警定位具体原因。',\n )\n }\n return lines\n}\n"],"mappings":";AA0DA,SAAgB,EAAoB,EAAgD,CAClF,IAAM,EAAW,IAAI,IAAI,EAAM,UAAY,EAAE,CAAC,CACxC,EAAY,IAAI,IAAI,EAAM,OAAO,IAAK,GAAM,EAAE,GAAG,CAAC,CAElD,EAAqB,EAAM,WAAW,OACzC,GAAM,CAAC,EAAU,IAAI,EAAE,GAAG,EAAI,CAAC,EAAS,IAAI,EAAE,GAAG,CACnD,CAGD,MAAO,CACL,qBACA,eAJqB,EAAmB,OAAQ,GAAM,EAAE,QAAU,UAAU,CAK5E,OAAQ,EAAmB,OAAS,EACrC,CAUH,SAAgB,EAAkB,EAAuC,CACvE,GAAI,CAAC,EAAO,OAAQ,MAAO,EAAE,CAE7B,IAAM,EAAkB,EAAE,CACtB,EAAO,eAAe,OAAS,GACjC,EAAM,KACJ,WAAW,EAAO,eAAe,IAAK,GAAM,EAAE,GAAG,CAAC,KAAK,KAAK,GAC5D,mEACD,CAEH,IAAM,EAAS,EAAO,mBAAmB,OAAQ,GAAM,EAAE,QAAU,UAAU,CAO7E,OANI,EAAO,OAAS,GAClB,EAAM,KACJ,aAAa,EAAO,IAAK,GAAM,EAAE,GAAG,CAAC,KAAK,KAAK,GAC/C,sDACD,CAEI"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy-evg7ZvoD.js","names":[],"sources":["../src/commands/handlers/proxy.ts"],"sourcesContent":["/**\n * /proxy 命令:代理配置管理(增删改查 + 测通)\n */\nimport { getDefaultProxy, probeProxy } from '@x-otto/shared'\nimport { i18next } from '@x-otto/tui'\n\nimport type { ProxyConfig } from '@x-otto/setting'\nimport type { CliContext } from '../../command-dispatcher'\n\n/**\n * 视图形状取自 `TuiBridge.stores.proxy.setView` 的参数类型——`ProxyPanelView` 是 tui 的\n * 内部视图契约,未从其 barrel 导出,也不该为了 cli 一处消费就扩大公共 API。用\n * `Parameters<>` 反查即可拿到同一份类型,且 tui 侧改字段时这里会同步编译报错。\n */\ntype ProxyView = Parameters<CliContext['tui']['stores']['proxy']['setView']>[0]\n\nconst PROXY_URL_RE = /^https?:\\/\\/.+/\n\nfunction getProxy(ctx: CliContext): ProxyConfig | undefined {\n return ctx.app.settings.get('proxy') as ProxyConfig | undefined\n}\n\n/**\n * 启动时从环境变量检测到的系统代理(RFC-288 D5)。由 `interactive-setup.ts` 在检测后\n * 写入——此前那里检测到只弹一次 toast 就丢弃,面板完全不知情,用户环境里明明有可用地址\n * 却仍需手打。**仅作建议值**:必须用户在面板上显式确认才落盘(沿用前身 RFC 规则 5)。\n */\nlet detectedEnvProxy: ProxyView['detectedEnvProxy']\n\nexport function setDetectedEnvProxy(value: string, source: string): void {\n detectedEnvProxy = { value, source }\n}\n\n/** 最近一次探测结果(面板显示用)。仅进程内瞬态,不落盘。 */\nlet lastProbe: ProxyView['probe']\n\nfunction pushProxyView(ctx: CliContext): void {\n const proxy = getProxy(ctx)\n ctx.tui.stores.proxy.setView({\n url: proxy?.url,\n enabled: proxy?.enabled,\n configPath: '~/.otto/config.json',\n // 配置态(上面两行)之外再给出**进程内实际生效**的代理,面板据此判断二者是否一致\n // (RFC-288 D3)。不一致=改了配置但未重启,这正是用户答不出\"我设了为什么没用\"的时刻。\n effectiveUrl: getDefaultProxy(),\n detectedEnvProxy,\n probe: lastProbe,\n })\n}\n\n/**\n * 探测目标 = **当前模型的 baseURL**(RFC-288 D4),不是任何固定的第三方端点。\n * 用户配代理的唯一目的就是访问他正在用的那个模型端点,探测它才直接回答用户的真实问题;\n * 固定端点在墙内两头不讨好(境外端点自身可能被墙=假阴性,国内端点不走代理也通=假阳性)。\n */\nfunction resolveProbeTarget(ctx: CliContext): string | undefined {\n const modelId = ctx.state.currentModelId\n if (!modelId) return undefined\n try {\n const model = ctx.app.modelRegistry.resolve(modelId)\n return model.baseUrl || undefined\n } catch {\n return undefined\n }\n}\n\nasync function runProbe(ctx: CliContext): Promise<void> {\n const target = resolveProbeTarget(ctx)\n if (!target) {\n lastProbe = { status: 'failed', reason: i18next.t('proxy.probeNoModel'), blamesProxy: false, target: '-' }\n pushProxyView(ctx)\n return\n }\n\n lastProbe = { status: 'probing' }\n pushProxyView(ctx)\n\n const result = await probeProxy(target)\n const host = safeHost(target)\n lastProbe = result.ok\n ? { status: 'ok', latencyMs: result.latencyMs, target: host }\n : {\n status: 'failed',\n reason: result.errorMessage ?? result.errorKind ?? 'unknown',\n // 只有\"连不上代理\"才归咎代理;目标不可达/超时不能让用户去反复检查一个正常的代理。\n blamesProxy: result.errorKind === 'proxy-unreachable',\n target: host,\n }\n pushProxyView(ctx)\n}\n\n/** 取 host 用于展示(完整 URL 太长会撑破面板行宽);解析失败时原样返回。 */\nfunction safeHost(url: string): string {\n try {\n return new URL(url).host\n } catch {\n return url\n }\n}\n\nexport async function handleProxy(args: string[], ctx: CliContext): Promise<void> {\n const arg = args[0]\n const settings = ctx.app.settings\n\n
|
|
1
|
+
{"version":3,"file":"proxy-evg7ZvoD.js","names":[],"sources":["../src/commands/handlers/proxy.ts"],"sourcesContent":["/**\n * /proxy 命令:代理配置管理(增删改查 + 测通)\n */\nimport { getDefaultProxy, probeProxy } from '@x-otto/shared'\nimport { i18next } from '@x-otto/tui'\n\nimport type { ProxyConfig } from '@x-otto/setting'\nimport type { CliContext } from '../../command-dispatcher'\n\n/**\n * 视图形状取自 `TuiBridge.stores.proxy.setView` 的参数类型——`ProxyPanelView` 是 tui 的\n * 内部视图契约,未从其 barrel 导出,也不该为了 cli 一处消费就扩大公共 API。用\n * `Parameters<>` 反查即可拿到同一份类型,且 tui 侧改字段时这里会同步编译报错。\n */\ntype ProxyView = Parameters<CliContext['tui']['stores']['proxy']['setView']>[0]\n\nconst PROXY_URL_RE = /^https?:\\/\\/.+/\n\nfunction getProxy(ctx: CliContext): ProxyConfig | undefined {\n return ctx.app.settings.get('proxy') as ProxyConfig | undefined\n}\n\n/**\n * 启动时从环境变量检测到的系统代理(RFC-288 D5)。由 `interactive-setup.ts` 在检测后\n * 写入——此前那里检测到只弹一次 toast 就丢弃,面板完全不知情,用户环境里明明有可用地址\n * 却仍需手打。**仅作建议值**:必须用户在面板上显式确认才落盘(沿用前身 RFC 规则 5)。\n */\nlet detectedEnvProxy: ProxyView['detectedEnvProxy']\n\nexport function setDetectedEnvProxy(value: string, source: string): void {\n detectedEnvProxy = { value, source }\n}\n\n/** 最近一次探测结果(面板显示用)。仅进程内瞬态,不落盘。 */\nlet lastProbe: ProxyView['probe']\n\nfunction pushProxyView(ctx: CliContext): void {\n const proxy = getProxy(ctx)\n ctx.tui.stores.proxy.setView({\n url: proxy?.url,\n enabled: proxy?.enabled,\n configPath: '~/.otto/config.json',\n // 配置态(上面两行)之外再给出**进程内实际生效**的代理,面板据此判断二者是否一致\n // (RFC-288 D3)。不一致=改了配置但未重启,这正是用户答不出\"我设了为什么没用\"的时刻。\n effectiveUrl: getDefaultProxy(),\n detectedEnvProxy,\n probe: lastProbe,\n })\n}\n\n/**\n * 探测目标 = **当前模型的 baseURL**(RFC-288 D4),不是任何固定的第三方端点。\n * 用户配代理的唯一目的就是访问他正在用的那个模型端点,探测它才直接回答用户的真实问题;\n * 固定端点在墙内两头不讨好(境外端点自身可能被墙=假阴性,国内端点不走代理也通=假阳性)。\n */\nfunction resolveProbeTarget(ctx: CliContext): string | undefined {\n const modelId = ctx.state.currentModelId\n if (!modelId) return undefined\n try {\n const model = ctx.app.modelRegistry.resolve(modelId)\n return model.baseUrl || undefined\n } catch {\n return undefined\n }\n}\n\nasync function runProbe(ctx: CliContext): Promise<void> {\n const target = resolveProbeTarget(ctx)\n if (!target) {\n lastProbe = { status: 'failed', reason: i18next.t('proxy.probeNoModel'), blamesProxy: false, target: '-' }\n pushProxyView(ctx)\n return\n }\n\n lastProbe = { status: 'probing' }\n pushProxyView(ctx)\n\n const result = await probeProxy(target)\n const host = safeHost(target)\n lastProbe = result.ok\n ? { status: 'ok', latencyMs: result.latencyMs, target: host }\n : {\n status: 'failed',\n reason: result.errorMessage ?? result.errorKind ?? 'unknown',\n // 只有\"连不上代理\"才归咎代理;目标不可达/超时不能让用户去反复检查一个正常的代理。\n blamesProxy: result.errorKind === 'proxy-unreachable',\n target: host,\n }\n pushProxyView(ctx)\n}\n\n/** 取 host 用于展示(完整 URL 太长会撑破面板行宽);解析失败时原样返回。 */\nfunction safeHost(url: string): string {\n try {\n return new URL(url).host\n } catch {\n return url\n }\n}\n\nexport async function handleProxy(args: string[], ctx: CliContext): Promise<void> {\n const arg = args[0]\n const settings = ctx.app.settings\n\n if (!arg) {\n pushProxyView(ctx)\n ctx.tui.panes.togglePane('proxy')\n return\n }\n\n if (arg === 'status') {\n const proxy = getProxy(ctx)\n if (proxy?.url) {\n const status = proxy.enabled !== false ? '已启用' : '已停用(配置保留)'\n ctx.tui.messages.pushMessage({\n role: 'command_echo',\n command: '/proxy status',\n summary: `代理状态:${status}`,\n detail: `代理地址:${proxy.url}\\n作用范围:全局(所有出站 HTTP 请求,本机地址除外)`,\n })\n } else {\n ctx.tui.messages.pushMessage({\n role: 'command_echo',\n command: '/proxy status',\n status: 'warn',\n summary: '代理未配置。使用 /proxy <url> 设置代理。',\n })\n }\n return\n }\n\n if (arg === 'on') {\n const proxy = getProxy(ctx)\n if (!proxy?.url) {\n ctx.tui.info.showToast('无代理地址', '请先使用 /proxy <url> 设置代理地址')\n return\n }\n await settings.persist({ proxy: { url: proxy.url, enabled: true } })\n pushProxyView(ctx)\n ctx.tui.info.showToast('代理已启用', proxy.url)\n return\n }\n\n if (arg === 'off') {\n const proxy = getProxy(ctx)\n if (!proxy?.url) {\n ctx.tui.info.showToast('无代理配置', '尚未设置代理')\n return\n }\n await settings.persist({ proxy: { url: proxy.url, enabled: false } })\n pushProxyView(ctx)\n ctx.tui.info.showToast('代理已停用', `配置保留(${proxy.url})`)\n return\n }\n\n // /proxy test —— 连通性探测(面板\"测试连接\"动作行走的也是这条)\n if (arg === 'test') {\n await runProbe(ctx)\n const p = lastProbe\n if (p?.status === 'ok') {\n ctx.tui.info.showToast(i18next.t('proxy.actionTest'), i18next.t('proxy.probeOk', { latency: p.latencyMs, target: p.target }))\n } else if (p?.status === 'failed') {\n ctx.tui.info.showToast(\n i18next.t('proxy.actionTest'),\n i18next.t(p.blamesProxy ? 'proxy.probeFailedProxy' : 'proxy.probeFailedTarget', { reason: p.reason }),\n )\n }\n return\n }\n\n if (arg === 'clear') {\n await settings.persist({ proxy: {} })\n pushProxyView(ctx)\n ctx.tui.info.showToast('代理已清除', '')\n return\n }\n\n if (PROXY_URL_RE.test(arg)) {\n await settings.persist({ proxy: { url: arg, enabled: true } })\n pushProxyView(ctx)\n ctx.tui.info.showToast('代理已设置', arg)\n return\n }\n\n // 不认识的参数:区分「看起来想设地址但格式不对」与「敲错了子命令」——前者给出具体的\n // 格式要求(面板 InputDialog 提交也走这条路径,是用户输错地址时唯一的反馈点),\n // 后者才回退到用法列表。此前两种情况都只弹泛泛的「用法」,用户不知道自己错在哪。\n if (arg.includes('://') || arg.includes('.') || arg.includes(':')) {\n ctx.tui.info.showToast('代理地址格式无效', `需以 http:// 或 https:// 开头,例如 http://127.0.0.1:7890(收到:${arg})`)\n return\n }\n ctx.tui.info.showToast('用法', '/proxy [<url>|on|off|status|clear]')\n}\n"],"mappings":"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"}
|
|
@@ -6,4 +6,4 @@ import{OTTO_SESSION_LOCKS_DIR as e,isContainerEnvironment as t,isProcessAlive as
|
|
|
6
6
|
`)}if(t.stdout(`\n${s.length} processes, total RSS ${l(p)}; ${m.length} strong orphan(s), ${h.length} weak orphan(s)\n`),!r)return(m.length>0||h.length>0)&&t.stdout("run `otto ps --sweep` to SIGTERM strong orphans"+(h.length>0?` (--include-weak for weak ones)`:``)+`
|
|
7
7
|
`),0;let _=[...m,...i?h:[]].filter(e=>e.pid!==f&&e.tty===`??`);if(_.length===0)return t.stdout(`nothing to sweep
|
|
8
8
|
`),0;let v=0,y=[];for(let e of _)try{o(e.pid),v++,y.push(e),t.stdout(`SIGTERM ${e.pid} (${d(e)}, ${l(e.rssKb)})\n`)}catch(n){t.stderr(`failed to signal ${e.pid}: ${n instanceof Error?n.message:String(n)}\n`)}let b=t.probeAlive??n;await(t.sleep??(e=>new Promise(t=>setTimeout(t,e))))(t.verifyDelayMs??3e3);let x=y.filter(e=>b(e.pid)),S=v-x.length;return t.stdout(`swept ${S}/${_.length}\n`),x.length>0?(t.stdout(`${x.length} process(es) ignored SIGTERM (likely chaperone signal guard): `+x.map(e=>e.pid).join(`, `)+`\nescalate manually if needed: kill -9 ${x.map(e=>e.pid).join(` `)}\n`),1):v===_.length?0:1}export{f as runPsCommand};
|
|
9
|
-
//# sourceMappingURL=ps-
|
|
9
|
+
//# sourceMappingURL=ps-DiKCLKbs.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ps-DKrluEuy.js","names":[],"sources":["../src/commands/fleet-scan.ts","../src/commands/ps.ts"],"sourcesContent":["/**\n * 进程舰队全量扫描工具(ps/kill/signal + 按会话分代)。纯模块——不持状态、不新建 child。\n */\n\nimport { OTTO_SESSION_LOCKS_DIR, isContainerEnvironment, listOttoProcesses } from '@x-otto/env'\nimport { createSessionWriteLeaseManager } from '@x-otto/session'\n\nimport type { OttoProcessInfo } from '@x-otto/env'\n\nexport type OrphanVerdict = 'strong' | 'weak' | 'none'\n\nexport interface FleetProcess extends OttoProcessInfo {\n readonly verdict: OrphanVerdict\n /** 判定理由(展示用,如 `lease-stale`/`lease-other-owner`/`lease-self-heartbeat`)。 */\n readonly reason: string\n}\n\n/** 弱孤儿的最小运行时长(无租约可核时的辅助信号)。 */\nconst WEAK_ORPHAN_MIN_ETIME_MS = 60 * 60 * 1000\n\n/**\n * serve 类常驻子命令——合法 detach 形态,永不判孤儿。\n *\n * 关于 `daemon`(RFC-335 M2):`otto daemon start` 拉起的**后台进程命令行是 `serve`**\n * (见 `daemon.ts` 的 `spawnDetached`),因此它实际由上面的 `'serve'` 一项保护;\n * `daemon` 自身只是前台短命进程(发完 spawn 即退出),不会被扫描为常驻。\n * 这里仍列出 `daemon` 只为表达意图,**不是**该保护生效的原因——真正的防护是 `serve`。\n */\nconst RESIDENT_SUBCOMMANDS = ['serve', 'daemon', 'persistenced', 'remote-persistence-server', 'observe']\n\nexport interface FleetScanDeps {\n /** 进程枚举(测试注入)。默认 `listOttoProcesses()`。 */\n listProcesses?: () => OttoProcessInfo[]\n /** 租约检视(测试注入)。默认按 OTTO_HOME/sessions/locks 组装只读 lease manager。 */\n inspectLease?: (sessionId: string) => { locked: boolean; pid?: number; alive?: boolean; mtimeAgoMs?: number }\n /** 容器环境探测(测试注入)。默认 `isContainerEnvironment()`。 */\n isContainer?: () => boolean\n /** 租约 stale 阈值(对齐 session-write-lease DEFAULT_STALE_MS)。 */\n staleMs?: number\n}\n\nfunction isResidentCommand(command: string): boolean {\n // 子命令是 bin/otto.js 之后的第一个非 flag 参数\n const afterEntry = command.split('bin/otto.js')[1] ?? ''\n const firstArg = afterEntry.trim().split(/\\s+/)[0] ?? ''\n return RESIDENT_SUBCOMMANDS.includes(firstArg)\n}\n\n/** 扫描全机 otto 主进程并逐个判定孤儿三态。 */\nexport function scanFleet(deps: FleetScanDeps = {}): FleetProcess[] {\n const listProcesses = deps.listProcesses ?? listOttoProcesses\n const isContainer = deps.isContainer ?? isContainerEnvironment\n const staleMs = deps.staleMs ?? 60_000\n // review P2 修复:lease manager 提到判定循环外一次组装(此前每进程 new 一个,含\n // 重复 mkdirSync)。只读组装:installExitHook:false 无退出钩子副作用;inspect() 无\n // acquire/touch。lockDir 与 cli.ts 的会话存储组装同源 OTTO_HOME(P0 修复后一致)。\n const defaultManager = deps.inspectLease\n ? undefined\n : createSessionWriteLeaseManager({\n lockDir: OTTO_SESSION_LOCKS_DIR,\n installExitHook: false,\n })\n const inspectLease = deps.inspectLease ?? ((sessionId: string) => defaultManager!.inspect(sessionId))\n\n const container = isContainer()\n const processes = listProcesses()\n\n return processes.map((p): FleetProcess => {\n // 安全不变式:有 TTY 一律非孤儿。\n if (p.tty !== '??') return { ...p, verdict: 'none', reason: 'has-tty' }\n if (p.ppid !== 1) return { ...p, verdict: 'none', reason: 'has-parent' }\n if (isResidentCommand(p.command)) return { ...p, verdict: 'none', reason: 'resident-service' }\n // 容器环境:ppid==1 是常态,强判定失效(F6 豁免)。\n if (container) {\n return p.etimeMs > WEAK_ORPHAN_MIN_ETIME_MS\n ? { ...p, verdict: 'weak', reason: 'container-ppid1-longrun' }\n : { ...p, verdict: 'none', reason: 'container-ppid1' }\n }\n\n if (!p.sessionId) {\n // 无 --continue:无租约可核 → 弱孤儿(>1h 辅助信号)。\n return p.etimeMs > WEAK_ORPHAN_MIN_ETIME_MS\n ? { ...p, verdict: 'weak', reason: 'no-session-longrun' }\n : { ...p, verdict: 'none', reason: 'no-session-young' }\n }\n\n const lease = inspectLease(p.sessionId)\n if (!lease.locked) {\n // 锁文件不存在——会话早已正常释放,进程却还挂着 → 强孤儿。\n return { ...p, verdict: 'strong', reason: 'lease-released' }\n }\n if (lease.pid === p.pid) {\n // (c) 自持租约的活孤儿——心跳还在但不可交互(见文件头语义说明)。\n return { ...p, verdict: 'strong', reason: 'lease-self-heartbeat' }\n }\n if (lease.mtimeAgoMs !== undefined && lease.mtimeAgoMs > staleMs) {\n // (b) 租约 stale——持有者已死。\n return { ...p, verdict: 'strong', reason: 'lease-stale' }\n }\n // (a) 租约被其他进程持有且 fresh——本候选是废弃副本。\n return { ...p, verdict: 'strong', reason: 'lease-other-owner' }\n })\n}\n","/**\n * /ps 命令:进程舰队列表视图(按会话/TTY 分组、代际计数/内存)。\n */\nimport { isProcessAlive } from '@x-otto/env'\nimport { scanFleet } from './fleet-scan'\n\nimport type { FleetProcess } from './fleet-scan'\n\nexport interface PsCommandIo {\n stdout: (s: string) => void\n stderr: (s: string) => void\n /** SIGTERM 发送(测试注入)。默认 `process.kill(pid, 'SIGTERM')`。 */\n kill?: (pid: number) => void\n /** 存活探测(测试注入)。默认 `isProcessAlive`(@x-otto/env,kill(pid,0) 语义)。 */\n probeAlive?: (pid: number) => boolean\n /** sweep 后存活复查的等待毫秒(测试注入缩短)。默认 3000。 */\n verifyDelayMs?: number\n /** 延迟原语(测试注入 fake)。默认真实 setTimeout。 */\n sleep?: (ms: number) => Promise<void>\n}\n\nfunction formatRss(rssKb: number): string {\n return rssKb >= 1024 ? `${(rssKb / 1024).toFixed(0)}MB` : `${rssKb}KB`\n}\n\nfunction formatEtime(ms: number): string {\n const h = Math.floor(ms / 3_600_000)\n if (h >= 24) return `${Math.floor(h / 24)}d${h % 24}h`\n const m = Math.floor((ms % 3_600_000) / 60_000)\n return h > 0 ? `${h}h${m}m` : `${m}m`\n}\n\nfunction verdictLabel(p: FleetProcess): string {\n if (p.verdict === 'strong') return `ORPHAN(${p.reason})`\n if (p.verdict === 'weak') return `orphan?(${p.reason})`\n return '-'\n}\n\nexport async function runPsCommand(args: string[], io: PsCommandIo): Promise<number> {\n const sweep = args.includes('--sweep')\n const includeWeak = args.includes('--include-weak')\n const json = args.includes('--json')\n const kill = io.kill ?? ((pid: number) => process.kill(pid, 'SIGTERM'))\n\n const fleet = scanFleet()\n const self = process.pid\n\n if (json) {\n io.stdout(JSON.stringify(fleet, null, 2) + '\\n')\n return 0\n }\n\n if (fleet.length === 0) {\n io.stdout('no otto processes found\\n')\n return 0\n }\n\n // 列表输出\n const totalRssKb = fleet.reduce((acc, p) => acc + p.rssKb, 0)\n const strong = fleet.filter((p) => p.verdict === 'strong')\n const weak = fleet.filter((p) => p.verdict === 'weak')\n\n const header = ['PID', 'PPID', 'RSS', 'TTY', 'UP', 'GEN', 'SESSION', 'VERDICT'].join('\\t')\n io.stdout(header + '\\n')\n for (const p of fleet) {\n const selfMark = p.pid === self ? '*' : ''\n io.stdout(\n [\n `${p.pid}${selfMark}`,\n p.ppid,\n formatRss(p.rssKb),\n p.tty,\n formatEtime(p.etimeMs),\n p.generation ?? '-',\n p.sessionId ? p.sessionId.slice(0, 8) : '-',\n verdictLabel(p),\n ].join('\\t') + '\\n',\n )\n }\n io.stdout(\n `\\n${fleet.length} processes, total RSS ${formatRss(totalRssKb)}; ` +\n `${strong.length} strong orphan(s), ${weak.length} weak orphan(s)\\n`,\n )\n\n if (!sweep) {\n if (strong.length > 0 || weak.length > 0) {\n io.stdout('run `otto ps --sweep` to SIGTERM strong orphans' +\n (weak.length > 0 ? ' (--include-weak for weak ones)' : '') + '\\n')\n }\n return 0\n }\n\n // sweep:SIGTERM only;自进程/有 TTY 双保险排除(判定层已保证有 TTY 不入选,此处复核)。\n const targets = [...strong, ...(includeWeak ? weak : [])].filter(\n (p) => p.pid !== self && p.tty === '??',\n )\n if (targets.length === 0) {\n io.stdout('nothing to sweep\\n')\n return 0\n }\n let signalled = 0\n const signalledPids: FleetProcess[] = []\n for (const p of targets) {\n try {\n kill(p.pid)\n signalled++\n signalledPids.push(p)\n io.stdout(`SIGTERM ${p.pid} (${verdictLabel(p)}, ${formatRss(p.rssKb)})\\n`)\n } catch (err) {\n io.stderr(`failed to signal ${p.pid}: ${err instanceof Error ? err.message : String(err)}\\n`)\n }\n }\n\n // review P1-a 修复:SIGTERM 送达 ≠ 进程退出——chaperone 态孤儿装着空函数 signal guard\n // (cli.ts chaperoneSignalGuard,防前台组误杀的既有设计)会吞掉 SIGTERM,进程纹丝不动。\n // 送信号后延迟复查存活,把\"未退出\"名单如实报告并提示手动升级(不自动 SIGKILL——保持\n // RFC-196 \"SIGTERM only\" 不变式,kill -9 决策权留给用户)。\n const probeAlive = io.probeAlive ?? isProcessAlive\n const sleep = io.sleep ?? ((ms: number) => new Promise<void>((r) => setTimeout(r, ms)))\n await sleep(io.verifyDelayMs ?? 3000)\n const survivors = signalledPids.filter((p) => probeAlive(p.pid))\n const exited = signalled - survivors.length\n io.stdout(`swept ${exited}/${targets.length}\\n`)\n if (survivors.length > 0) {\n io.stdout(\n `${survivors.length} process(es) ignored SIGTERM (likely chaperone signal guard): ` +\n survivors.map((p) => p.pid).join(', ') +\n `\\nescalate manually if needed: kill -9 ${survivors.map((p) => p.pid).join(' ')}\\n`,\n )\n return 1\n }\n return signalled === targets.length ? 0 : 1\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ps-DiKCLKbs.js","names":[],"sources":["../src/commands/fleet-scan.ts","../src/commands/ps.ts"],"sourcesContent":["/**\n * 进程舰队全量扫描工具(ps/kill/signal + 按会话分代)。纯模块——不持状态、不新建 child。\n */\n\nimport { OTTO_SESSION_LOCKS_DIR, isContainerEnvironment, listOttoProcesses } from '@x-otto/env'\nimport { createSessionWriteLeaseManager } from '@x-otto/session'\n\nimport type { OttoProcessInfo } from '@x-otto/env'\n\nexport type OrphanVerdict = 'strong' | 'weak' | 'none'\n\nexport interface FleetProcess extends OttoProcessInfo {\n readonly verdict: OrphanVerdict\n /** 判定理由(展示用,如 `lease-stale`/`lease-other-owner`/`lease-self-heartbeat`)。 */\n readonly reason: string\n}\n\n/** 弱孤儿的最小运行时长(无租约可核时的辅助信号)。 */\nconst WEAK_ORPHAN_MIN_ETIME_MS = 60 * 60 * 1000\n\n/**\n * serve 类常驻子命令——合法 detach 形态,永不判孤儿。\n *\n * 关于 `daemon`(RFC-335 M2):`otto daemon start` 拉起的**后台进程命令行是 `serve`**\n * (见 `daemon.ts` 的 `spawnDetached`),因此它实际由上面的 `'serve'` 一项保护;\n * `daemon` 自身只是前台短命进程(发完 spawn 即退出),不会被扫描为常驻。\n * 这里仍列出 `daemon` 只为表达意图,**不是**该保护生效的原因——真正的防护是 `serve`。\n */\nconst RESIDENT_SUBCOMMANDS = ['serve', 'daemon', 'persistenced', 'remote-persistence-server', 'observe']\n\nexport interface FleetScanDeps {\n /** 进程枚举(测试注入)。默认 `listOttoProcesses()`。 */\n listProcesses?: () => OttoProcessInfo[]\n /** 租约检视(测试注入)。默认按 OTTO_HOME/sessions/locks 组装只读 lease manager。 */\n inspectLease?: (sessionId: string) => { locked: boolean; pid?: number; alive?: boolean; mtimeAgoMs?: number }\n /** 容器环境探测(测试注入)。默认 `isContainerEnvironment()`。 */\n isContainer?: () => boolean\n /** 租约 stale 阈值(对齐 session-write-lease DEFAULT_STALE_MS)。 */\n staleMs?: number\n}\n\nfunction isResidentCommand(command: string): boolean {\n // 子命令是 bin/otto.js 之后的第一个非 flag 参数\n const afterEntry = command.split('bin/otto.js')[1] ?? ''\n const firstArg = afterEntry.trim().split(/\\s+/)[0] ?? ''\n return RESIDENT_SUBCOMMANDS.includes(firstArg)\n}\n\n/** 扫描全机 otto 主进程并逐个判定孤儿三态。 */\nexport function scanFleet(deps: FleetScanDeps = {}): FleetProcess[] {\n const listProcesses = deps.listProcesses ?? listOttoProcesses\n const isContainer = deps.isContainer ?? isContainerEnvironment\n const staleMs = deps.staleMs ?? 60_000\n // review P2 修复:lease manager 提到判定循环外一次组装(此前每进程 new 一个,含\n // 重复 mkdirSync)。只读组装:installExitHook:false 无退出钩子副作用;inspect() 无\n // acquire/touch。lockDir 与 cli.ts 的会话存储组装同源 OTTO_HOME(P0 修复后一致)。\n const defaultManager = deps.inspectLease\n ? undefined\n : createSessionWriteLeaseManager({\n lockDir: OTTO_SESSION_LOCKS_DIR,\n installExitHook: false,\n })\n const inspectLease = deps.inspectLease ?? ((sessionId: string) => defaultManager!.inspect(sessionId))\n\n const container = isContainer()\n const processes = listProcesses()\n\n return processes.map((p): FleetProcess => {\n // 安全不变式:有 TTY 一律非孤儿。\n if (p.tty !== '??') return { ...p, verdict: 'none', reason: 'has-tty' }\n if (p.ppid !== 1) return { ...p, verdict: 'none', reason: 'has-parent' }\n if (isResidentCommand(p.command)) return { ...p, verdict: 'none', reason: 'resident-service' }\n // 容器环境:ppid==1 是常态,强判定失效(F6 豁免)。\n if (container) {\n return p.etimeMs > WEAK_ORPHAN_MIN_ETIME_MS\n ? { ...p, verdict: 'weak', reason: 'container-ppid1-longrun' }\n : { ...p, verdict: 'none', reason: 'container-ppid1' }\n }\n\n if (!p.sessionId) {\n // 无 --continue:无租约可核 → 弱孤儿(>1h 辅助信号)。\n return p.etimeMs > WEAK_ORPHAN_MIN_ETIME_MS\n ? { ...p, verdict: 'weak', reason: 'no-session-longrun' }\n : { ...p, verdict: 'none', reason: 'no-session-young' }\n }\n\n const lease = inspectLease(p.sessionId)\n if (!lease.locked) {\n // 锁文件不存在——会话早已正常释放,进程却还挂着 → 强孤儿。\n return { ...p, verdict: 'strong', reason: 'lease-released' }\n }\n if (lease.pid === p.pid) {\n // (c) 自持租约的活孤儿——心跳还在但不可交互(见文件头语义说明)。\n return { ...p, verdict: 'strong', reason: 'lease-self-heartbeat' }\n }\n if (lease.mtimeAgoMs !== undefined && lease.mtimeAgoMs > staleMs) {\n // (b) 租约 stale——持有者已死。\n return { ...p, verdict: 'strong', reason: 'lease-stale' }\n }\n // (a) 租约被其他进程持有且 fresh——本候选是废弃副本。\n return { ...p, verdict: 'strong', reason: 'lease-other-owner' }\n })\n}\n","/**\n * /ps 命令:进程舰队列表视图(按会话/TTY 分组、代际计数/内存)。\n */\nimport { isProcessAlive } from '@x-otto/env'\nimport { scanFleet } from './fleet-scan'\n\nimport type { FleetProcess } from './fleet-scan'\n\nexport interface PsCommandIo {\n stdout: (s: string) => void\n stderr: (s: string) => void\n /** SIGTERM 发送(测试注入)。默认 `process.kill(pid, 'SIGTERM')`。 */\n kill?: (pid: number) => void\n /** 存活探测(测试注入)。默认 `isProcessAlive`(@x-otto/env,kill(pid,0) 语义)。 */\n probeAlive?: (pid: number) => boolean\n /** sweep 后存活复查的等待毫秒(测试注入缩短)。默认 3000。 */\n verifyDelayMs?: number\n /** 延迟原语(测试注入 fake)。默认真实 setTimeout。 */\n sleep?: (ms: number) => Promise<void>\n}\n\nfunction formatRss(rssKb: number): string {\n return rssKb >= 1024 ? `${(rssKb / 1024).toFixed(0)}MB` : `${rssKb}KB`\n}\n\nfunction formatEtime(ms: number): string {\n const h = Math.floor(ms / 3_600_000)\n if (h >= 24) return `${Math.floor(h / 24)}d${h % 24}h`\n const m = Math.floor((ms % 3_600_000) / 60_000)\n return h > 0 ? `${h}h${m}m` : `${m}m`\n}\n\nfunction verdictLabel(p: FleetProcess): string {\n if (p.verdict === 'strong') return `ORPHAN(${p.reason})`\n if (p.verdict === 'weak') return `orphan?(${p.reason})`\n return '-'\n}\n\nexport async function runPsCommand(args: string[], io: PsCommandIo): Promise<number> {\n const sweep = args.includes('--sweep')\n const includeWeak = args.includes('--include-weak')\n const json = args.includes('--json')\n const kill = io.kill ?? ((pid: number) => process.kill(pid, 'SIGTERM'))\n\n const fleet = scanFleet()\n const self = process.pid\n\n if (json) {\n io.stdout(JSON.stringify(fleet, null, 2) + '\\n')\n return 0\n }\n\n if (fleet.length === 0) {\n io.stdout('no otto processes found\\n')\n return 0\n }\n\n // 列表输出\n const totalRssKb = fleet.reduce((acc, p) => acc + p.rssKb, 0)\n const strong = fleet.filter((p) => p.verdict === 'strong')\n const weak = fleet.filter((p) => p.verdict === 'weak')\n\n const header = ['PID', 'PPID', 'RSS', 'TTY', 'UP', 'GEN', 'SESSION', 'VERDICT'].join('\\t')\n io.stdout(header + '\\n')\n for (const p of fleet) {\n const selfMark = p.pid === self ? '*' : ''\n io.stdout(\n [\n `${p.pid}${selfMark}`,\n p.ppid,\n formatRss(p.rssKb),\n p.tty,\n formatEtime(p.etimeMs),\n p.generation ?? '-',\n p.sessionId ? p.sessionId.slice(0, 8) : '-',\n verdictLabel(p),\n ].join('\\t') + '\\n',\n )\n }\n io.stdout(\n `\\n${fleet.length} processes, total RSS ${formatRss(totalRssKb)}; ` +\n `${strong.length} strong orphan(s), ${weak.length} weak orphan(s)\\n`,\n )\n\n if (!sweep) {\n if (strong.length > 0 || weak.length > 0) {\n io.stdout('run `otto ps --sweep` to SIGTERM strong orphans' +\n (weak.length > 0 ? ' (--include-weak for weak ones)' : '') + '\\n')\n }\n return 0\n }\n\n // sweep:SIGTERM only;自进程/有 TTY 双保险排除(判定层已保证有 TTY 不入选,此处复核)。\n const targets = [...strong, ...(includeWeak ? weak : [])].filter(\n (p) => p.pid !== self && p.tty === '??',\n )\n if (targets.length === 0) {\n io.stdout('nothing to sweep\\n')\n return 0\n }\n let signalled = 0\n const signalledPids: FleetProcess[] = []\n for (const p of targets) {\n try {\n kill(p.pid)\n signalled++\n signalledPids.push(p)\n io.stdout(`SIGTERM ${p.pid} (${verdictLabel(p)}, ${formatRss(p.rssKb)})\\n`)\n } catch (err) {\n io.stderr(`failed to signal ${p.pid}: ${err instanceof Error ? err.message : String(err)}\\n`)\n }\n }\n\n // review P1-a 修复:SIGTERM 送达 ≠ 进程退出——chaperone 态孤儿装着空函数 signal guard\n // (cli.ts chaperoneSignalGuard,防前台组误杀的既有设计)会吞掉 SIGTERM,进程纹丝不动。\n // 送信号后延迟复查存活,把\"未退出\"名单如实报告并提示手动升级(不自动 SIGKILL——保持\n // RFC-196 \"SIGTERM only\" 不变式,kill -9 决策权留给用户)。\n const probeAlive = io.probeAlive ?? isProcessAlive\n const sleep = io.sleep ?? ((ms: number) => new Promise<void>((r) => setTimeout(r, ms)))\n await sleep(io.verifyDelayMs ?? 3000)\n const survivors = signalledPids.filter((p) => probeAlive(p.pid))\n const exited = signalled - survivors.length\n io.stdout(`swept ${exited}/${targets.length}\\n`)\n if (survivors.length > 0) {\n io.stdout(\n `${survivors.length} process(es) ignored SIGTERM (likely chaperone signal guard): ` +\n survivors.map((p) => p.pid).join(', ') +\n `\\nescalate manually if needed: kill -9 ${survivors.map((p) => p.pid).join(' ')}\\n`,\n )\n return 1\n }\n return signalled === targets.length ? 0 : 1\n}\n"],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import{r as e}from"./service-client-Cr4sxDVM.js";import{createAttachSessionDataSource as t,createSessionEventReduceBridge as n,createStoreTuiSink as r,startTui as i}from"@x-otto/tui";const a=e=>typeof e==`object`&&!!e&&!Array.isArray(e);function o(e,t){let n;n=e.startsWith(`https://`)?`wss://${e.slice(8)}`:e.startsWith(`http://`)?`ws://${e.slice(7)}`:e.startsWith(`localhost`)||e.startsWith(`127.`)?`ws://${e}`:`wss://${e}`;let r=`${n.replace(/\/$/,``)}/ws`;return t?`${r}?token=${encodeURIComponent(t)}`:r}function s(e,t,n){let r=n.WebSocketImpl??globalThis.WebSocket,i=n.setTimeoutImpl??setTimeout,s=n.clearTimeoutImpl??clearTimeout,c=n.initialBackoffMs??500,l=n.maxBackoffMs??1e4,u=null,d=c,f=null,p=!1,m=0,h=null,g=null,_=1,v=new Map,y=null,b=e=>{e!==y&&(y=e,n.onStateChange?.(e))},x=(e=u)=>{!e||e.readyState!==e.OPEN||e.send(JSON.stringify({method:`Session.subscribe`,params:{sessionId:t,since:m}}))},S=()=>{p||f!==null||(f=i(()=>{f=null,b(`connecting`),w()},d),d=Math.min(d*2,l))},C=e=>{e.onopen=null,e.onmessage=null,e.onclose=null,e.onerror=null;try{e.close()}catch{}u===e&&(u=null)},w=()=>{if(p)return;b(`connecting`);let i;try{i=new r(o(e))}catch{S();return}u=i,i.onopen=()=>{d=c,b(`connected`),x(i)},i.onmessage=e=>{let r;try{r=JSON.parse(String(e.data))}catch{return}if(r.type===`Session.event`&&a(r.data)){let e=r.data;if(typeof e.sessionId!=`string`||e.sessionId!==t||!Number.isSafeInteger(e.seq)||e.seq<0)return;let n=e.seq;if(n<_||v.has(n))return;let{seq:i,...a}=e;for(v.set(n,{seq:n,payload:a});v.has(_);){let e=v.get(_);v.delete(_),h?.(e),m=_,_+=1}return}if(r.type===`Runtime.writeLease`&&a(r.data)){let e=r.data;n.onWriteLease?.({sessionId:typeof e.sessionId==`string`?e.sessionId:t,state:e.state??`not-held`,reason:typeof e.reason==`string`?e.reason:void 0,leaseOwner:typeof e.leaseOwner==`string`?e.leaseOwner:void 0});return}if(r.type===`Runtime.error`&&a(r.data)){let e=r.data,t=typeof e.message==`string`?e.message:``;if(e.code===`EVENT_LOG_GAP`){g?.({reason:`gap`,oldestAvailable:_}),C(i),S();return}n.onNotify?.(`[service] ${e.code??`runtime`}: ${t}`)}},i.onclose=()=>{u===i&&(u=null),p?b(`closed`):(b(`reconnecting`),S())},i.onerror=()=>{}};return{fetchSnapshot:e=>n.fetchSnapshot(e),subscribe(e,t,n,r){m=t,h=n,g=r,m=Math.max(m,t),_=m+1;for(let e of v.keys())e<=m&&v.delete(e);return u?u.readyState===u.OPEN&&x():w(),()=>{p=!0,f!==null&&(s(f),f=null),b(`closed`),u&&C(u),h=null,g=null}},sendVerb(e,t){p||!u||u.readyState!==u.OPEN||u.send(JSON.stringify({method:e,params:t}))}}}async function c(a){let o=a.stdout??process.stdout,c=a.stdin??process.stdin,l=a.fetchImpl??globalThis.fetch,u=!0,d,f=e(a.baseUrl,l,{token:a.token}),p;try{p=await f.fetchSnapshot(a.sessionId)}catch(e){throw o.write(`otto --attach: 无法连接 serve 上的会话 ${a.sessionId}:${e instanceof Error?e.message:String(e)}\n`),e}let m=p.session.id,h,g=e=>{if(!h)return;let t={role:`assistant`,content:[{type:`text`,text:e}]};h.messages.pushMessage(t)};h=await i({stdin:c,stdout:o,columns:o.columns??100,needsSetup:!1,welcome:{cwd:void 0},onSubmit:e=>{let t=e.trimStart();if(t.startsWith(`/`)){g(`[attach] \`${t.split(/\s+/)[0]}\` 为 attach 暂未支持命令。\n仅支持纯文本提交(经 Chat.query 下发到 serve);如需本地命令请退出 attach 后运行。`);return}if(h){if(!u){g(`[attach] 会话的写权已被另一 client 持有(${d??`?`})——本端变只读观察者。请另选 session 或让对方退出 attach。`);return}(async()=>{try{await f.sendPrompt(m,e)}catch(e){g(`[attach] 提交失败:${e instanceof Error?e.message:String(e)}`)}})()}}});let _=s(a.baseUrl,m,{fetchSnapshot:async e=>await f.fetchSnapshot(e),onNotify:e=>g(`[attach] ${e}`),onStateChange:e=>{e===`connected`?(g(`[attach] 已连接 serve。`),a.forceWriteLease?(g(`[attach] --force-write-lease:向服务端发起 force_acquire(kill -9 解锁通道)……`),_.sendVerb(`Session.writeLease.force_acquire`,{sessionId:m})):_.sendVerb(`Session.writeLease.acquire`,{sessionId:m})):e===`reconnecting`?(u=!1,g(`[attach] 连接断开,正在重连……`)):e===`closed`&&(u=!1,g(`[attach] 连接已关闭。`))},onWriteLease:e=>{e.state===`acquired`?(u=!0,d=e.leaseOwner,g(`[attach] 获会话写权——纯文本会走 Chat.query 到 service。`)):e.state===`denied`?(u=!1,d=e.leaseOwner,g(`[attach] 会话写权被另一 client 持有(${e.leaseOwner??`?`})——本端变只读观察者态;提交纯文本会被本端予拦截。\n若对方是 kill -9 残留,可重启带 \`--force-write-lease\` 强抢写权。`)):e.state===`released`&&(u=!1,d=e.leaseOwner,e.reason===`forced_by_other_client`?g(`[attach] 写权被另一 client 强行剥夺(force_acquire by ${e.leaseOwner??`?`})——本端变只读观察者态。`):g(`[attach] 写权已释放——重新 conn 上可申请。`))}}),v=n(r({pushMessage:h.messages.pushMessage,echoUserInput:h.messages.echoUserInput,pushEngineEvent:h.engine.pushEngineEvent,getNotifyStats:h.info.getNotifyStats,setTasks:h.stores.tasks.setTasks,addTurnBoundary:h.stores.tasks.addTurnBoundary})),y=t({transport:_,sessionId:m,onSessionEvent:v.handle,hydrateMessages:(e,t)=>{e.messageStore.setState(()=>({messages:[]})),t.length>0&&e.messageStore.setState(()=>({messages:[...t]})),v.reset(t.length)},onGap:()=>{g(`[attach] 会话事件日志 gap(cursor 被 service 逐出)——已重新水合 messages 快照。`)}});await h.lifecycle.attachSessionSource(y),g(`[attach] 已连接会话 ${m}(host=${p.authority.hostname} pid=${p.authority.pid})。\nsnapshot messages 已灌入 store;后续 Session.event 经 WS 实时应用;纯文本走 Chat.query;/xxx 斜杠命令暂未支持。`)}export{c as runAttach};
|
|
3
|
-
//# sourceMappingURL=run-attach-
|
|
3
|
+
//# sourceMappingURL=run-attach-DDpMk2_N.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-attach-CvGCWF_i.js","names":[],"sources":["../src/commands/remote-transport.ts","../src/commands/run-attach.ts"],"sourcesContent":["/**\n * remote-transport.ts — RFC-335 T335-07 S2:`otto serve` 的 WS 传输端口实现。\n *\n * web-ui `otto-client` 的 cli 对应物:走同一 `ws://<host>/ws`、同一 JSON-RPC 出站\n * 信封 `{method, params}`、同一 `Session.subscribe{sessionId, since}` 接续协议——\n * Node 22 全局 `WebSocket`(不新增依赖、**不**引 `ws` 包)。\n *\n * 职责与边界(严格对齐 RFC-335 §6 + grill 决议 B):\n * - **重连**归本模块(指数退避,上限 10s);重连 = 新连接,按 subscribe 时记住的\n * since 自动 `Session.subscribe{sessionId, since}` 补发断线期间事件。\n * - **本地合成 seq**:线上 `Session.event` envelope 不含 seq(`coding-service.attachSession`\n * 核实——`append()` 只入服务端 log、扇出 envelope 原样)。本模块对到达事件按序自增\n * 编号、写入 `RemoteSessionEvent.seq`;**不去重不重排**(那是 dataSource 的职责——\n * 它持有 snapshot.cursor 起步的 lastSeq,调 `event.seq <= lastSeq → drop`)。\n * 只一处该表:本模块保证**到达递交顺序 = 服务端发送顺序**(单 ws 连接事件按序抵达)。\n * - **gap(EVENT_LOG_GAP)→ onGap 显式上报 + 断开**:重连续接由 dataSource 的 onGap\n * 回调决策(重水合/重订阅新 cursor,RFC-335 §6:绝不静默补发缺失段)。\n *\n * 不做的事:不 fetch(HTTP 归 service-client)、不做 store 写入(归 dataSource+reduce\n * bridge)、不解释事件 kind、不消费 seq(只是分配透明编号)。\n */\n\nimport { ServiceUnreachableError } from './service-client'\n\n/**\n * 与 tui 契约(`packages/tui/src/bootstrap/session-data-source.ts`)对应的结构镜像。\n * 直接深导 `@x-otto/tui/session-data-source` 会破 package.json exports 边界(只暴露\n * `./`、`./compat`、`./standalone`);故本文件自声明最小类型面,消费方(adapter 装配\n * 代码)将本类型 cast 进 tui 的对应类型——字段名一致即成立。\n *\n * **同步纪律**:tui `session-data-source.ts` 增删 SessionTransport/RemoteSessionEvent\n * 字段时本文件必须同步。\n */\nexport interface RemoteSessionEvent {\n /** 本地合成单调序号(快照后首个到达事件 = snapshot.cursor + 1)。 */\n seq: number\n /** 服务端 Session.event.envelope.data 原样(含 sessionId/kind/... 字段)。 */\n payload: unknown\n}\n\nexport interface RemoteSessionSnapshot {\n session: { id: string; status: string; messages: ReadonlyArray<unknown> }\n cursor: number\n}\n\nexport interface SessionTransport {\n fetchSnapshot(sessionId: string): Promise<RemoteSessionSnapshot>\n subscribe(\n sessionId: string,\n since: number,\n onEvent: (event: RemoteSessionEvent) => void,\n onGap: (info: { reason: 'gap'; oldestAvailable: number }) => void,\n ): () => void\n /**\n * RFC-335 S4 协议面:发任意 WS verb(Session.writeLease.acquire/release 等)。\n * 仅 service 加入 WS 面向服务端的「直接命令语」时调(不遇 Session.event)。\n * 连上时不送(重连中 silently queue——最 recent subscribe 联速 prefer not\n * user-initiated verb race with disconnect)。\n */\n sendVerb(verb: string, data: Record<string, unknown>): void\n}\n\nconst INITIAL_BACKOFF_MS = 500\nconst MAX_BACKOFF_MS = 10_000\nconst WS_PATH = '/ws'\n\ninterface SessionEventEnvelope {\n type: 'Session.event'\n data: Record<string, unknown> & { sessionId?: string }\n}\ninterface RuntimeErrorEnvelope {\n type: 'Runtime.error'\n data: { code?: string; sessionId?: string; message?: string }\n}\ntype WireEnvelope = SessionEventEnvelope | RuntimeErrorEnvelope | { type: string; data?: unknown }\n\n/** 连接生命周期状态(S4 用户可感知——不区分 reconnecting-first/second,统一对两(代)发)。 */\nexport type AttachConnectionState = 'connecting' | 'connected' | 'reconnecting' | 'closed'\n\nexport interface ServiceWsTransportDeps {\n /** snapshot HTTP 读取(复用 service-client,不另开 HTTP client)。 */\n fetchSnapshot: (sessionId: string) => Promise<RemoteSessionSnapshot>\n /** WebSocket 构造器注入(单测注入 fake 避免真网络;生产全局)。 */\n WebSocketImpl?: new (url: string) => WebSocket\n /** 非 gap 的 Runtime.error(PROMPT_FAILED 等)/连接异常通知(上层 toast)。 */\n onNotify?: (msg: string) => void\n /** 连接生命周期通知——connect/disconnect/reconnect/gap-oneway。重复事件不发送(去抖)。 */\n onStateChange?: (state: AttachConnectionState) => void\n /** RFC-335 S4:Runtime.writeLease envelope 到达——acquired/denied/released/not-held。 */\n onWriteLease?: (ev: {\n sessionId: string\n state: 'acquired' | 'denied' | 'released' | 'not-held'\n reason?: string\n leaseOwner?: string\n }) => void\n setTimeoutImpl?: typeof setTimeout\n clearTimeoutImpl?: typeof clearTimeout\n /** 退避常数注入(单测加速)。 */\n initialBackoffMs?: number\n maxBackoffMs?: number\n}\n\nconst isRecord = (v: unknown): v is Record<string, unknown> =>\n typeof v === 'object' && v !== null && !Array.isArray(v)\n\n/** `http(s)://host[:port]` → `ws(s)://host[:port]`(与 web-ui otto-client 一致)。 */\nexport function httpToWsUrl(baseUrl: string, token?: string): string {\n let wsBase: string\n if (baseUrl.startsWith('https://')) wsBase = `wss://${baseUrl.slice('https://'.length)}`\n else if (baseUrl.startsWith('http://')) wsBase = `ws://${baseUrl.slice('http://'.length)}`\n else if (baseUrl.startsWith('localhost') || baseUrl.startsWith('127.')) wsBase = `ws://${baseUrl}`\n else wsBase = `wss://${baseUrl}`\n const url = `${wsBase.replace(/\\/$/, '')}${WS_PATH}`\n return token ? `${url}?token=${encodeURIComponent(token)}` : url\n}\n\nexport function createServiceWsTransport(\n baseUrl: string,\n sessionId: string,\n deps: ServiceWsTransportDeps,\n): SessionTransport {\n const WebSocketImpl =\n deps.WebSocketImpl ??\n (globalThis as unknown as { WebSocket: new (u: string) => WebSocket }).WebSocket\n const setTimeoutImpl = deps.setTimeoutImpl ?? setTimeout\n const clearTimeoutImpl = deps.clearTimeoutImpl ?? clearTimeout\n const initialBackoff = deps.initialBackoffMs ?? INITIAL_BACKOFF_MS\n const maxBackoff = deps.maxBackoffMs ?? MAX_BACKOFF_MS\n\n let ws: WebSocket | null = null\n let backoff = initialBackoff\n let reconnectTimer: ReturnType<typeof setTimeout> | null = null\n let disposed = false\n\n let subscribedSince = 0\n let onEventCb: ((event: RemoteSessionEvent) => void) | null = null\n let onGapCb: ((info: { reason: 'gap'; oldestAvailable: number }) => void) | null = null\n // The last contiguous authority sequence delivered to the data source. A replay\n // and a live event may arrive in either order, so do not advance this over a gap.\n let nextSeq = 1\n const pendingEvents = new Map<number, RemoteSessionEvent>()\n /** 当前会话连接生命周期状态(onStateChange 的发火边——防止重复) */\n let lastState: AttachConnectionState | null = null\n\n const emitState = (next: AttachConnectionState) => {\n if (next === lastState) return\n lastState = next\n deps.onStateChange?.(next)\n }\n\n const sendSubscribe = (socket: WebSocket | null = ws) => {\n if (!socket || socket.readyState !== socket.OPEN) return\n socket.send(\n JSON.stringify({\n method: 'Session.subscribe',\n params: { sessionId, since: subscribedSince },\n }),\n )\n }\n\n const scheduleReconnect = () => {\n if (disposed || reconnectTimer !== null) return\n reconnectTimer = setTimeoutImpl(() => {\n reconnectTimer = null\n emitState('connecting')\n connect()\n }, backoff)\n backoff = Math.min(backoff * 2, maxBackoff)\n }\n\n const closeSocket = (socket: WebSocket) => {\n socket.onopen = null\n socket.onmessage = null\n socket.onclose = null\n socket.onerror = null\n try { socket.close() } catch { /* best-effort */ }\n if (ws === socket) ws = null\n }\n\n const connect = () => {\n if (disposed) return\n emitState('connecting')\n let socket: WebSocket\n try {\n socket = new WebSocketImpl(httpToWsUrl(baseUrl))\n } catch {\n scheduleReconnect()\n return\n }\n ws = socket\n\n socket.onopen = () => {\n backoff = initialBackoff\n emitState('connected')\n sendSubscribe(socket)\n }\n socket.onmessage = (ev: MessageEvent) => {\n let envelope: WireEnvelope\n try {\n envelope = JSON.parse(String(ev.data)) as WireEnvelope\n } catch {\n return // 非 JSON:忽略(同 web-ui)\n }\n\n if (envelope.type === 'Session.event' && isRecord(envelope.data)) {\n const data = envelope.data as Record<string, unknown> & { sessionId?: string; seq?: unknown }\n if (typeof data.sessionId !== 'string' || data.sessionId !== sessionId) return\n // RFC-352 D1:replay and live delivery can interleave. Only the service's\n // event-log sequence preserves causal order; client arrival order does not.\n if (!Number.isSafeInteger(data.seq) || (data.seq as number) < 0) return\n const seq = data.seq as number\n if (seq < nextSeq || pendingEvents.has(seq)) return\n const { seq: _seq, ...payload } = data\n pendingEvents.set(seq, { seq, payload })\n while (pendingEvents.has(nextSeq)) {\n const next = pendingEvents.get(nextSeq)!\n pendingEvents.delete(nextSeq)\n onEventCb?.(next)\n subscribedSince = nextSeq\n nextSeq += 1\n }\n return\n }\n\n if (envelope.type === 'Runtime.writeLease' && isRecord(envelope.data)) {\n // RFC-335 S4:write-lease 通知——run-attach 应能感知 acquired/denied 状态,\n // 以便在 denied 时拒绝本地提交、在 acquired 时允许提交。\n const d = envelope.data as {\n sessionId?: string\n state?: string\n reason?: string\n leaseOwner?: string\n }\n deps.onWriteLease?.({\n sessionId: typeof d.sessionId === 'string' ? d.sessionId : sessionId,\n state: (d.state as 'acquired' | 'denied' | 'released' | 'not-held') ?? 'not-held',\n reason: typeof d.reason === 'string' ? d.reason : undefined,\n leaseOwner: typeof d.leaseOwner === 'string' ? d.leaseOwner : undefined,\n })\n return\n }\n\n if (envelope.type === 'Runtime.error' && isRecord(envelope.data)) {\n const d = envelope.data as { code?: string; message?: string; sessionId?: string }\n const message = typeof d.message === 'string' ? d.message : ''\n if (d.code === 'EVENT_LOG_GAP') {\n // onGap 回调先跑(dataSource 里处理重水合),然后断开——避免继续消费断序流。\n // gap 算 'reconnecting' 中加入(正次 connect.onopen 得为 'connected')。\n onGapCb?.({ reason: 'gap', oldestAvailable: nextSeq })\n closeSocket(socket)\n scheduleReconnect()\n return\n }\n deps.onNotify?.(`[service] ${d.code ?? 'runtime'}: ${message}`)\n }\n }\n socket.onclose = () => {\n if (ws === socket) ws = null\n if (!disposed) {\n // 从 'connected'/'connecting' 均退到 'reconnecting',下轮 socket.onopen 才回 'connected'。\n emitState('reconnecting')\n scheduleReconnect()\n } else {\n emitState('closed')\n }\n }\n socket.onerror = () => {\n // onclose 紧随其后统一走重连路径(对齐 web-ui)。\n }\n }\n\n return {\n fetchSnapshot: (sid) => deps.fetchSnapshot(sid),\n subscribe(_sid, since, onEvent, onGap) {\n subscribedSince = since\n onEventCb = onEvent\n onGapCb = onGap\n // Begin only at the snapshot cursor. Reconnect keeps contiguous progress and\n // any buffered out-of-order replay/live events, so subscribe resumes exactly\n // after the last applied authority sequence.\n subscribedSince = Math.max(subscribedSince, since)\n nextSeq = subscribedSince + 1\n for (const seq of pendingEvents.keys()) {\n if (seq <= subscribedSince) pendingEvents.delete(seq)\n }\n if (!ws) {\n connect()\n } else if (ws.readyState === ws.OPEN) {\n sendSubscribe()\n }\n return () => {\n disposed = true\n if (reconnectTimer !== null) { clearTimeoutImpl(reconnectTimer); reconnectTimer = null }\n // 手动发 'closed'——closeSocket 已清 onclose handler,socket.close() 不再代发状态。\n emitState('closed')\n if (ws) closeSocket(ws)\n onEventCb = null\n onGapCb = null\n }\n },\n\n sendVerb(verb: string, data: Record<string, unknown>): void {\n // RFC-335 S4:直接 verb(Session.writeLease.acquire/release)供应商。\n // 未连接 silently drop(重连 deliver-first-subscribe 不 stick 之前的下达)。\n if (disposed || !ws || ws.readyState !== ws.OPEN) return\n ws.send(JSON.stringify({ method: verb, params: data }))\n },\n }\n}\n\n/** attach 入口快捷形式:复用 service-client 的 fetchSnapshot。 */\nexport function createAttachTransport(args: {\n baseUrl: string\n sessionId: string\n fetchSnapshot: (sessionId: string) => Promise<RemoteSessionSnapshot>\n token?: string\n onNotify?: (msg: string) => void\n}): SessionTransport {\n return createServiceWsTransport(args.baseUrl, args.sessionId, {\n fetchSnapshot: args.fetchSnapshot,\n onNotify: args.onNotify,\n })\n}\n\n// 供 attach 入口报错区分。\nexport { ServiceUnreachableError }\n","/**\n * run-attach.ts — RFC-335 T335-07 S2 装配:`otto --attach <sessionId>` attach 模式。\n *\n * 装配链:\n * service snapshot → ServiceWsTransport(WebSocket) → createAttachSessionDataSource\n * → handle.lifecycle.attachSessionSource → 本地 messageStore(TUI 唯一 writer)\n *\n * 关键取舍(RFC-335 §5/§6 + grill 决议 A):\n * - **writer 唯一**:dataSource 的 hydrateMessages/append 都经 handle 出口 → 本地 zustand\n * messageStore 由 TUI 本体写,cli 这层从不手拿 `messageStore` 句柄。\n * - **事件流不再经 streamController**:attach 模式没 live-stream 流水线(streamText\n * Coalescer/agent sync 管线那都是本地 agent 跑起来的产物),事件逐条经 dataSource\n * 按 seq 应用进 store。\n * - **gap 行为可感知**:EVENT_LOG_GAP → dataSource 重水合(拉新 snapshot + messages\n * 整灌 + 重订阅新 cursor)——用户看到「消息重新出现」,绝不静默断一段。\n * - **写**:纯文本经 Chat.query 下发;任何斜杠命令 fail-fast 提示「attach 暂未支持」。\n */\nimport { startTui, type TuiHandle } from '@x-otto/tui'\nimport type { ChatMessage } from '@x-otto/tui'\nimport {\n createAttachSessionDataSource,\n createSessionEventReduceBridge,\n createStoreTuiSink,\n} from '@x-otto/tui'\n\nimport { createServiceClient } from './service-client'\nimport {\n createServiceWsTransport,\n type RemoteSessionSnapshot,\n type SessionTransport,\n} from './remote-transport'\n\nexport interface RunAttachOptions {\n sessionId: string\n baseUrl: string\n token?: string\n stdin?: NodeJS.ReadStream\n stdout?: NodeJS.WriteStream\n /** 单测注入;生产缺省全局 fetch。 */\n fetchImpl?: typeof globalThis.fetch\n /** RFC-335 S4 补丁:强抢写权——kill -9 造成 stuck lease 的唯一正式解锁口。\n * `otto --attach <id> --force-write-lease`。服务端 audit logger.warn 记录,\n * 原 owner 若仍订阅将收「写权被剥夺」通知。 */\n forceWriteLease?: boolean\n}\n\nexport async function runAttach(opts: RunAttachOptions): Promise<void> {\n const stdout = opts.stdout ?? process.stdout\n const stdin = opts.stdin ?? process.stdin\n const fetchImpl = opts.fetchImpl ?? globalThis.fetch\n\n // RFC-335 S4 写租约状态:false 时 onSubmit 最纯文本被拒(只读观察者态)。初始为 true;\n // transport.onWriteLease 会按 Runtime.writeLease envelope 更新。\n let writeLeaseGranted = true\n let leaseOwnerId: string | undefined\n\n const client = createServiceClient(opts.baseUrl, fetchImpl, { token: opts.token })\n\n // 1) snapshot 先行:确认 session 存在 + 拿 cursor。失败 = 显式报错退出(RFC-335 §6:无 local fallback)。\n let snapshot\n try {\n snapshot = await client.fetchSnapshot(opts.sessionId)\n } catch (err) {\n stdout.write(`otto --attach: 无法连接 serve 上的会话 ${opts.sessionId}:${err instanceof Error ? err.message : String(err)}\\n`)\n throw err\n }\n const sessionId = snapshot.session.id\n\n // 2) 起 TUI(不开本地 session、不起 agent workflow——attach 模式的写全走 Chat.query/slash 灰门)\n let tuiRef: TuiHandle | undefined\n const pushText = (text: string): void => {\n if (!tuiRef) return\n const msg: ChatMessage = { role: 'assistant', content: [{ type: 'text', text }] }\n tuiRef.messages.pushMessage(msg)\n }\n\n tuiRef = await startTui({\n stdin,\n stdout,\n columns: stdout.columns ?? 100,\n needsSetup: false,\n welcome: { cwd: undefined },\n onSubmit: (text: string) => {\n // 灰门:任何斜杠命令 attach 期不消费(steer/pause/resume/setTodoList 归下期;RFC-335 §5)。\n const trimmed = text.trimStart()\n if (trimmed.startsWith('/')) {\n pushText(\n `[attach] \\`${trimmed.split(/\\s+/)[0]}\\` 为 attach 暂未支持命令。\\n` +\n `仅支持纯文本提交(经 Chat.query 下发到 serve);如需本地命令请退出 attach 后运行。`,\n )\n return\n }\n if (!tuiRef) return\n // RFC-335 S4 协议面:写租约被另一 client 占有时,本地预拦截(不发 Chat.query\n // 给服务端制造 PROMPT_FAILED spam)——TUI 提示只读观察者语义。\n if (!writeLeaseGranted) {\n pushText(\n `[attach] 会话的写权已被另一 client 持有(${leaseOwnerId ?? '?'})——本端变只读观察者。` +\n `请另选 session 或让对方退出 attach。`,\n )\n return\n }\n void (async () => {\n try {\n await client.sendPrompt(sessionId, text)\n // 响应经 WS 事件流实时回流到 dataSource → messageStore(无需手动同步)。\n } catch (err) {\n pushText(`[attach] 提交失败:${err instanceof Error ? err.message : String(err)}`)\n }\n })()\n },\n })\n\n // 3) transport + dataSource:service socket → 本地 messageStore\n const transport: SessionTransport = createServiceWsTransport(opts.baseUrl, sessionId, {\n fetchSnapshot: async (sid) => {\n const snap = await client.fetchSnapshot(sid)\n return snap as unknown as RemoteSessionSnapshot\n },\n onNotify: (msg) => pushText(`[attach] ${msg}`),\n onStateChange: (state) => {\n // S4 连接生命周期可感知(去抖已由 transport 管的)。\n if (state === 'connected') {\n pushText('[attach] 已连接 serve。')\n // RFC-335 S4:每次连接立刻尝试 acquire 写租约——酸同 clientId;\n // 服务端返回 acquired/denied 由 onWriteLease 通知。\n // RFC-335 S4 补丁:forceWriteLease 时改走 force_acquire(显式人工强抢)。\n if (opts.forceWriteLease) {\n pushText('[attach] --force-write-lease:向服务端发起 force_acquire(kill -9 解锁通道)……')\n transport.sendVerb('Session.writeLease.force_acquire', { sessionId })\n } else {\n transport.sendVerb('Session.writeLease.acquire', { sessionId })\n }\n } else if (state === 'reconnecting') {\n // RFC-335 S4:重连期间打 write-leases 不确定——服务端在断开时释放;保险状\n // 本端 reactive 防出被 rub:下状态 acquired 前一正在拒绝(更安全默认)。\n writeLeaseGranted = false\n pushText('[attach] 连接断开,正在重连……')\n } else if (state === 'closed') {\n writeLeaseGranted = false\n pushText('[attach] 连接已关闭。')\n }\n },\n onWriteLease: (ev) => {\n if (ev.state === 'acquired') {\n writeLeaseGranted = true\n leaseOwnerId = ev.leaseOwner\n pushText('[attach] 获会话写权——纯文本会走 Chat.query 到 service。')\n } else if (ev.state === 'denied') {\n writeLeaseGranted = false\n leaseOwnerId = ev.leaseOwner\n pushText(\n `[attach] 会话写权被另一 client 持有(${ev.leaseOwner ?? '?'})——` +\n `本端变只读观察者态;提交纯文本会被本端予拦截。\\n` +\n `若对方是 kill -9 残留,可重启带 \\`--force-write-lease\\` 强抢写权。`,\n )\n } else if (ev.state === 'released') {\n writeLeaseGranted = false\n leaseOwnerId = ev.leaseOwner\n if (ev.reason === 'forced_by_other_client') {\n pushText(\n `[attach] 写权被另一 client 强行剥夺(force_acquire by ${ev.leaseOwner ?? '?'})——` +\n `本端变只读观察者态。`,\n )\n } else {\n pushText('[attach] 写权已释放——重新 conn 上可申请。')\n }\n }\n },\n })\n\n // `reduceToTui` is the only event→view projection. It shares the same TuiHandle\n // store actions as local mode; snapshot hydration resets its derived state first.\n const eventBridge = createSessionEventReduceBridge(\n createStoreTuiSink({\n pushMessage: tuiRef.messages.pushMessage,\n echoUserInput: tuiRef.messages.echoUserInput,\n pushEngineEvent: tuiRef.engine.pushEngineEvent,\n getNotifyStats: tuiRef.info.getNotifyStats,\n setTasks: tuiRef.stores.tasks.setTasks,\n addTurnBoundary: tuiRef.stores.tasks.addTurnBoundary,\n }),\n )\n\n const dataSource = createAttachSessionDataSource({\n transport: transport as never,\n sessionId,\n onSessionEvent: eventBridge.handle,\n hydrateMessages: (target, messages) => {\n // Snapshot is authoritative after initial connect and EVENT_LOG_GAP. Reset the\n // reducer before accepting subsequent deltas so turn-boundary indices start at\n // the hydrated message count instead of an obsolete stream.\n target.messageStore.setState(() => ({ messages: [] }))\n if (messages.length > 0) {\n target.messageStore.setState(() => ({\n messages: [...(messages as readonly ChatMessage[]) as never],\n }))\n }\n eventBridge.reset(messages.length)\n },\n onGap: () => {\n pushText(\n `[attach] 会话事件日志 gap(cursor 被 service 逐出)——已重新水合 messages 快照。`,\n )\n },\n })\n\n // 4) 挂载:TuiHandle.lifecycle.attachSessionSource(RFC-347 收敛面内)——TUI 本体握 store;\n // 重复挂载会 throw(attach 一个数据源是硬约束)。stop 由调用方跟 TUI lifecycles 结。\n await tuiRef.lifecycle.attachSessionSource(dataSource)\n\n // 5) attach 概述 = 这一条句话(恰好是唯一由 cli 经 messages.pushMessage 写的位置)\n pushText(\n `[attach] 已连接会话 ${sessionId}(host=${snapshot.authority.hostname} pid=${snapshot.authority.pid})。\\n` +\n 'snapshot messages 已灌入 store;后续 Session.event 经 WS 实时应用;' +\n '纯文本走 Chat.query;/xxx 斜杠命令暂未支持。',\n )\n}\n"],"mappings":";uLA8DA,MAwCM,EAAY,GAChB,OAAO,GAAM,YAAY,GAAc,CAAC,MAAM,QAAQ,EAAE,CAG1D,SAAgB,EAAY,EAAiB,EAAwB,CACnE,IAAI,EACJ,AAGK,EAHD,EAAQ,WAAW,WAAW,CAAW,SAAS,EAAQ,MAAM,EAAkB,GAC7E,EAAQ,WAAW,UAAU,CAAW,QAAQ,EAAQ,MAAM,EAAiB,GAC/E,EAAQ,WAAW,YAAY,EAAI,EAAQ,WAAW,OAAO,CAAW,QAAQ,IAC3E,SAAS,IACvB,IAAM,EAAM,GAAG,EAAO,QAAQ,MAAO,GAAG,MACxC,OAAO,EAAQ,GAAG,EAAI,SAAS,mBAAmB,EAAM,GAAK,EAG/D,SAAgB,EACd,EACA,EACA,EACkB,CAClB,IAAM,EACJ,EAAK,eACJ,WAAsE,UACnE,EAAiB,EAAK,gBAAkB,WACxC,EAAmB,EAAK,kBAAoB,aAC5C,EAAiB,EAAK,kBAAoB,IAC1C,EAAa,EAAK,cAAgB,IAEpC,EAAuB,KACvB,EAAU,EACV,EAAuD,KACvD,EAAW,GAEX,EAAkB,EAClB,EAA0D,KAC1D,EAA+E,KAG/E,EAAU,EACR,EAAgB,IAAI,IAEtB,EAA0C,KAExC,EAAa,GAAgC,CAC7C,IAAS,IACb,EAAY,EACZ,EAAK,gBAAgB,EAAK,GAGtB,GAAiB,EAA2B,IAAO,CACnD,CAAC,GAAU,EAAO,aAAe,EAAO,MAC5C,EAAO,KACL,KAAK,UAAU,CACb,OAAQ,oBACR,OAAQ,CAAE,YAAW,MAAO,EAAiB,CAC9C,CAAC,CACH,EAGG,MAA0B,CAC1B,GAAY,IAAmB,OACnC,EAAiB,MAAqB,CACpC,EAAiB,KACjB,EAAU,aAAa,CACvB,GAAS,EACR,EAAQ,CACX,EAAU,KAAK,IAAI,EAAU,EAAG,EAAW,GAGvC,EAAe,GAAsB,CACzC,EAAO,OAAS,KAChB,EAAO,UAAY,KACnB,EAAO,QAAU,KACjB,EAAO,QAAU,KACjB,GAAI,CAAE,EAAO,OAAO,MAAS,EACzB,IAAO,IAAQ,EAAK,OAGpB,MAAgB,CACpB,GAAI,EAAU,OACd,EAAU,aAAa,CACvB,IAAI,EACJ,GAAI,CACF,EAAS,IAAI,EAAc,EAAY,EAAQ,CAAC,MAC1C,CACN,GAAmB,CACnB,OAEF,EAAK,EAEL,EAAO,WAAe,CACpB,EAAU,EACV,EAAU,YAAY,CACtB,EAAc,EAAO,EAEvB,EAAO,UAAa,GAAqB,CACvC,IAAI,EACJ,GAAI,CACF,EAAW,KAAK,MAAM,OAAO,EAAG,KAAK,CAAC,MAChC,CACN,OAGF,GAAI,EAAS,OAAS,iBAAmB,EAAS,EAAS,KAAK,CAAE,CAChE,IAAM,EAAO,EAAS,KAItB,GAHI,OAAO,EAAK,WAAc,UAAY,EAAK,YAAc,GAGzD,CAAC,OAAO,cAAc,EAAK,IAAI,EAAK,EAAK,IAAiB,EAAG,OACjE,IAAM,EAAM,EAAK,IACjB,GAAI,EAAM,GAAW,EAAc,IAAI,EAAI,CAAE,OAC7C,GAAM,CAAE,IAAK,EAAM,GAAG,GAAY,EAElC,IADA,EAAc,IAAI,EAAK,CAAE,MAAK,UAAS,CAAC,CACjC,EAAc,IAAI,EAAQ,EAAE,CACjC,IAAM,EAAO,EAAc,IAAI,EAAQ,CACvC,EAAc,OAAO,EAAQ,CAC7B,IAAY,EAAK,CACjB,EAAkB,EAClB,GAAW,EAEb,OAGF,GAAI,EAAS,OAAS,sBAAwB,EAAS,EAAS,KAAK,CAAE,CAGrE,IAAM,EAAI,EAAS,KAMnB,EAAK,eAAe,CAClB,UAAW,OAAO,EAAE,WAAc,SAAW,EAAE,UAAY,EAC3D,MAAQ,EAAE,OAA6D,WACvE,OAAQ,OAAO,EAAE,QAAW,SAAW,EAAE,OAAS,IAAA,GAClD,WAAY,OAAO,EAAE,YAAe,SAAW,EAAE,WAAa,IAAA,GAC/D,CAAC,CACF,OAGF,GAAI,EAAS,OAAS,iBAAmB,EAAS,EAAS,KAAK,CAAE,CAChE,IAAM,EAAI,EAAS,KACb,EAAU,OAAO,EAAE,SAAY,SAAW,EAAE,QAAU,GAC5D,GAAI,EAAE,OAAS,gBAAiB,CAG9B,IAAU,CAAE,OAAQ,MAAO,gBAAiB,EAAS,CAAC,CACtD,EAAY,EAAO,CACnB,GAAmB,CACnB,OAEF,EAAK,WAAW,aAAa,EAAE,MAAQ,UAAU,IAAI,IAAU,GAGnE,EAAO,YAAgB,CACjB,IAAO,IAAQ,EAAK,MACnB,EAKH,EAAU,SAAS,EAHnB,EAAU,eAAe,CACzB,GAAmB,GAKvB,EAAO,YAAgB,IAKzB,MAAO,CACL,cAAgB,GAAQ,EAAK,cAAc,EAAI,CAC/C,UAAU,EAAM,EAAO,EAAS,EAAO,CACrC,EAAkB,EAClB,EAAY,EACZ,EAAU,EAIV,EAAkB,KAAK,IAAI,EAAiB,EAAM,CAClD,EAAU,EAAkB,EAC5B,IAAK,IAAM,KAAO,EAAc,MAAM,CAChC,GAAO,GAAiB,EAAc,OAAO,EAAI,CAOvD,OALK,EAEM,EAAG,aAAe,EAAG,MAC9B,GAAe,CAFf,GAAS,KAIE,CACX,EAAW,GACP,IAAmB,OAAQ,EAAiB,EAAe,CAAE,EAAiB,MAElF,EAAU,SAAS,CACf,GAAI,EAAY,EAAG,CACvB,EAAY,KACZ,EAAU,OAId,SAAS,EAAc,EAAqC,CAGtD,GAAY,CAAC,GAAM,EAAG,aAAe,EAAG,MAC5C,EAAG,KAAK,KAAK,UAAU,CAAE,OAAQ,EAAM,OAAQ,EAAM,CAAC,CAAC,EAE1D,CCrQH,eAAsB,EAAU,EAAuC,CACrE,IAAM,EAAS,EAAK,QAAU,QAAQ,OAChC,EAAQ,EAAK,OAAS,QAAQ,MAC9B,EAAY,EAAK,WAAa,WAAW,MAI3C,EAAoB,GACpB,EAEE,EAAS,EAAoB,EAAK,QAAS,EAAW,CAAE,MAAO,EAAK,MAAO,CAAC,CAG9E,EACJ,GAAI,CACF,EAAW,MAAM,EAAO,cAAc,EAAK,UAAU,OAC9C,EAAK,CAEZ,MADA,EAAO,MAAM,kCAAkC,EAAK,UAAU,GAAG,aAAe,MAAQ,EAAI,QAAU,OAAO,EAAI,CAAC,IAAI,CAChH,EAER,IAAM,EAAY,EAAS,QAAQ,GAG/B,EACE,EAAY,GAAuB,CACvC,GAAI,CAAC,EAAQ,OACb,IAAM,EAAmB,CAAE,KAAM,YAAa,QAAS,CAAC,CAAE,KAAM,OAAQ,OAAM,CAAC,CAAE,CACjF,EAAO,SAAS,YAAY,EAAI,EAGlC,EAAS,MAAM,EAAS,CACtB,QACA,SACA,QAAS,EAAO,SAAW,IAC3B,WAAY,GACZ,QAAS,CAAE,IAAK,IAAA,GAAW,CAC3B,SAAW,GAAiB,CAE1B,IAAM,EAAU,EAAK,WAAW,CAChC,GAAI,EAAQ,WAAW,IAAI,CAAE,CAC3B,EACE,cAAc,EAAQ,MAAM,MAAM,CAAC,GAAG,6EAEvC,CACD,OAEG,KAGL,IAAI,CAAC,EAAmB,CACtB,EACE,gCAAgC,GAAgB,IAAI,wCAErD,CACD,QAEI,SAAY,CAChB,GAAI,CACF,MAAM,EAAO,WAAW,EAAW,EAAK,OAEjC,EAAK,CACZ,EAAS,iBAAiB,aAAe,MAAQ,EAAI,QAAU,OAAO,EAAI,GAAG,KAE7E,GAEP,CAAC,CAGF,IAAM,EAA8B,EAAyB,EAAK,QAAS,EAAW,CACpF,cAAe,KAAO,IACP,MAAM,EAAO,cAAc,EAAI,CAG9C,SAAW,GAAQ,EAAS,YAAY,IAAM,CAC9C,cAAgB,GAAU,CAEpB,IAAU,aACZ,EAAS,sBAAsB,CAI3B,EAAK,iBACP,EAAS,oEAAoE,CAC7E,EAAU,SAAS,mCAAoC,CAAE,YAAW,CAAC,EAErE,EAAU,SAAS,6BAA8B,CAAE,YAAW,CAAC,EAExD,IAAU,gBAGnB,EAAoB,GACpB,EAAS,uBAAuB,EACvB,IAAU,WACnB,EAAoB,GACpB,EAAS,kBAAkB,GAG/B,aAAe,GAAO,CAChB,EAAG,QAAU,YACf,EAAoB,GACpB,EAAe,EAAG,WAClB,EAAS,8CAA8C,EAC9C,EAAG,QAAU,UACtB,EAAoB,GACpB,EAAe,EAAG,WAClB,EACE,8BAA8B,EAAG,YAAc,IAAI,gFAGpD,EACQ,EAAG,QAAU,aACtB,EAAoB,GACpB,EAAe,EAAG,WACd,EAAG,SAAW,yBAChB,EACE,+CAA+C,EAAG,YAAc,IAAI,eAErE,CAED,EAAS,gCAAgC,GAIhD,CAAC,CAII,EAAc,EAClB,EAAmB,CACjB,YAAa,EAAO,SAAS,YAC7B,cAAe,EAAO,SAAS,cAC/B,gBAAiB,EAAO,OAAO,gBAC/B,eAAgB,EAAO,KAAK,eAC5B,SAAU,EAAO,OAAO,MAAM,SAC9B,gBAAiB,EAAO,OAAO,MAAM,gBACtC,CAAC,CACH,CAEK,EAAa,EAA8B,CACpC,YACX,YACA,eAAgB,EAAY,OAC5B,iBAAkB,EAAQ,IAAa,CAIrC,EAAO,aAAa,cAAgB,CAAE,SAAU,EAAE,CAAE,EAAE,CAClD,EAAS,OAAS,GACpB,EAAO,aAAa,cAAgB,CAClC,SAAU,CAAC,GAAI,EAA6C,CAC7D,EAAE,CAEL,EAAY,MAAM,EAAS,OAAO,EAEpC,UAAa,CACX,EACE,+DACD,EAEJ,CAAC,CAIF,MAAM,EAAO,UAAU,oBAAoB,EAAW,CAGtD,EACE,kBAAkB,EAAU,QAAQ,EAAS,UAAU,SAAS,OAAO,EAAS,UAAU,IAAI,2FAG/F"}
|
|
1
|
+
{"version":3,"file":"run-attach-DDpMk2_N.js","names":[],"sources":["../src/commands/remote-transport.ts","../src/commands/run-attach.ts"],"sourcesContent":["/**\n * remote-transport.ts — RFC-335 T335-07 S2:`otto serve` 的 WS 传输端口实现。\n *\n * web-ui `otto-client` 的 cli 对应物:走同一 `ws://<host>/ws`、同一 JSON-RPC 出站\n * 信封 `{method, params}`、同一 `Session.subscribe{sessionId, since}` 接续协议——\n * Node 22 全局 `WebSocket`(不新增依赖、**不**引 `ws` 包)。\n *\n * 职责与边界(严格对齐 RFC-335 §6 + grill 决议 B):\n * - **重连**归本模块(指数退避,上限 10s);重连 = 新连接,按 subscribe 时记住的\n * since 自动 `Session.subscribe{sessionId, since}` 补发断线期间事件。\n * - **本地合成 seq**:线上 `Session.event` envelope 不含 seq(`coding-service.attachSession`\n * 核实——`append()` 只入服务端 log、扇出 envelope 原样)。本模块对到达事件按序自增\n * 编号、写入 `RemoteSessionEvent.seq`;**不去重不重排**(那是 dataSource 的职责——\n * 它持有 snapshot.cursor 起步的 lastSeq,调 `event.seq <= lastSeq → drop`)。\n * 只一处该表:本模块保证**到达递交顺序 = 服务端发送顺序**(单 ws 连接事件按序抵达)。\n * - **gap(EVENT_LOG_GAP)→ onGap 显式上报 + 断开**:重连续接由 dataSource 的 onGap\n * 回调决策(重水合/重订阅新 cursor,RFC-335 §6:绝不静默补发缺失段)。\n *\n * 不做的事:不 fetch(HTTP 归 service-client)、不做 store 写入(归 dataSource+reduce\n * bridge)、不解释事件 kind、不消费 seq(只是分配透明编号)。\n */\n\nimport { ServiceUnreachableError } from './service-client'\n\n/**\n * 与 tui 契约(`packages/tui/src/bootstrap/session-data-source.ts`)对应的结构镜像。\n * 直接深导 `@x-otto/tui/session-data-source` 会破 package.json exports 边界(只暴露\n * `./`、`./compat`、`./standalone`);故本文件自声明最小类型面,消费方(adapter 装配\n * 代码)将本类型 cast 进 tui 的对应类型——字段名一致即成立。\n *\n * **同步纪律**:tui `session-data-source.ts` 增删 SessionTransport/RemoteSessionEvent\n * 字段时本文件必须同步。\n */\nexport interface RemoteSessionEvent {\n /** 本地合成单调序号(快照后首个到达事件 = snapshot.cursor + 1)。 */\n seq: number\n /** 服务端 Session.event.envelope.data 原样(含 sessionId/kind/... 字段)。 */\n payload: unknown\n}\n\nexport interface RemoteSessionSnapshot {\n session: { id: string; status: string; messages: ReadonlyArray<unknown> }\n cursor: number\n}\n\nexport interface SessionTransport {\n fetchSnapshot(sessionId: string): Promise<RemoteSessionSnapshot>\n subscribe(\n sessionId: string,\n since: number,\n onEvent: (event: RemoteSessionEvent) => void,\n onGap: (info: { reason: 'gap'; oldestAvailable: number }) => void,\n ): () => void\n /**\n * RFC-335 S4 协议面:发任意 WS verb(Session.writeLease.acquire/release 等)。\n * 仅 service 加入 WS 面向服务端的「直接命令语」时调(不遇 Session.event)。\n * 连上时不送(重连中 silently queue——最 recent subscribe 联速 prefer not\n * user-initiated verb race with disconnect)。\n */\n sendVerb(verb: string, data: Record<string, unknown>): void\n}\n\nconst INITIAL_BACKOFF_MS = 500\nconst MAX_BACKOFF_MS = 10_000\nconst WS_PATH = '/ws'\n\ninterface SessionEventEnvelope {\n type: 'Session.event'\n data: Record<string, unknown> & { sessionId?: string }\n}\ninterface RuntimeErrorEnvelope {\n type: 'Runtime.error'\n data: { code?: string; sessionId?: string; message?: string }\n}\ntype WireEnvelope = SessionEventEnvelope | RuntimeErrorEnvelope | { type: string; data?: unknown }\n\n/** 连接生命周期状态(S4 用户可感知——不区分 reconnecting-first/second,统一对两(代)发)。 */\nexport type AttachConnectionState = 'connecting' | 'connected' | 'reconnecting' | 'closed'\n\nexport interface ServiceWsTransportDeps {\n /** snapshot HTTP 读取(复用 service-client,不另开 HTTP client)。 */\n fetchSnapshot: (sessionId: string) => Promise<RemoteSessionSnapshot>\n /** WebSocket 构造器注入(单测注入 fake 避免真网络;生产全局)。 */\n WebSocketImpl?: new (url: string) => WebSocket\n /** 非 gap 的 Runtime.error(PROMPT_FAILED 等)/连接异常通知(上层 toast)。 */\n onNotify?: (msg: string) => void\n /** 连接生命周期通知——connect/disconnect/reconnect/gap-oneway。重复事件不发送(去抖)。 */\n onStateChange?: (state: AttachConnectionState) => void\n /** RFC-335 S4:Runtime.writeLease envelope 到达——acquired/denied/released/not-held。 */\n onWriteLease?: (ev: {\n sessionId: string\n state: 'acquired' | 'denied' | 'released' | 'not-held'\n reason?: string\n leaseOwner?: string\n }) => void\n setTimeoutImpl?: typeof setTimeout\n clearTimeoutImpl?: typeof clearTimeout\n /** 退避常数注入(单测加速)。 */\n initialBackoffMs?: number\n maxBackoffMs?: number\n}\n\nconst isRecord = (v: unknown): v is Record<string, unknown> =>\n typeof v === 'object' && v !== null && !Array.isArray(v)\n\n/** `http(s)://host[:port]` → `ws(s)://host[:port]`(与 web-ui otto-client 一致)。 */\nexport function httpToWsUrl(baseUrl: string, token?: string): string {\n let wsBase: string\n if (baseUrl.startsWith('https://')) wsBase = `wss://${baseUrl.slice('https://'.length)}`\n else if (baseUrl.startsWith('http://')) wsBase = `ws://${baseUrl.slice('http://'.length)}`\n else if (baseUrl.startsWith('localhost') || baseUrl.startsWith('127.')) wsBase = `ws://${baseUrl}`\n else wsBase = `wss://${baseUrl}`\n const url = `${wsBase.replace(/\\/$/, '')}${WS_PATH}`\n return token ? `${url}?token=${encodeURIComponent(token)}` : url\n}\n\nexport function createServiceWsTransport(\n baseUrl: string,\n sessionId: string,\n deps: ServiceWsTransportDeps,\n): SessionTransport {\n const WebSocketImpl =\n deps.WebSocketImpl ??\n (globalThis as unknown as { WebSocket: new (u: string) => WebSocket }).WebSocket\n const setTimeoutImpl = deps.setTimeoutImpl ?? setTimeout\n const clearTimeoutImpl = deps.clearTimeoutImpl ?? clearTimeout\n const initialBackoff = deps.initialBackoffMs ?? INITIAL_BACKOFF_MS\n const maxBackoff = deps.maxBackoffMs ?? MAX_BACKOFF_MS\n\n let ws: WebSocket | null = null\n let backoff = initialBackoff\n let reconnectTimer: ReturnType<typeof setTimeout> | null = null\n let disposed = false\n\n let subscribedSince = 0\n let onEventCb: ((event: RemoteSessionEvent) => void) | null = null\n let onGapCb: ((info: { reason: 'gap'; oldestAvailable: number }) => void) | null = null\n // The last contiguous authority sequence delivered to the data source. A replay\n // and a live event may arrive in either order, so do not advance this over a gap.\n let nextSeq = 1\n const pendingEvents = new Map<number, RemoteSessionEvent>()\n /** 当前会话连接生命周期状态(onStateChange 的发火边——防止重复) */\n let lastState: AttachConnectionState | null = null\n\n const emitState = (next: AttachConnectionState) => {\n if (next === lastState) return\n lastState = next\n deps.onStateChange?.(next)\n }\n\n const sendSubscribe = (socket: WebSocket | null = ws) => {\n if (!socket || socket.readyState !== socket.OPEN) return\n socket.send(\n JSON.stringify({\n method: 'Session.subscribe',\n params: { sessionId, since: subscribedSince },\n }),\n )\n }\n\n const scheduleReconnect = () => {\n if (disposed || reconnectTimer !== null) return\n reconnectTimer = setTimeoutImpl(() => {\n reconnectTimer = null\n emitState('connecting')\n connect()\n }, backoff)\n backoff = Math.min(backoff * 2, maxBackoff)\n }\n\n const closeSocket = (socket: WebSocket) => {\n socket.onopen = null\n socket.onmessage = null\n socket.onclose = null\n socket.onerror = null\n try { socket.close() } catch { /* best-effort */ }\n if (ws === socket) ws = null\n }\n\n const connect = () => {\n if (disposed) return\n emitState('connecting')\n let socket: WebSocket\n try {\n socket = new WebSocketImpl(httpToWsUrl(baseUrl))\n } catch {\n scheduleReconnect()\n return\n }\n ws = socket\n\n socket.onopen = () => {\n backoff = initialBackoff\n emitState('connected')\n sendSubscribe(socket)\n }\n socket.onmessage = (ev: MessageEvent) => {\n let envelope: WireEnvelope\n try {\n envelope = JSON.parse(String(ev.data)) as WireEnvelope\n } catch {\n return // 非 JSON:忽略(同 web-ui)\n }\n\n if (envelope.type === 'Session.event' && isRecord(envelope.data)) {\n const data = envelope.data as Record<string, unknown> & { sessionId?: string; seq?: unknown }\n if (typeof data.sessionId !== 'string' || data.sessionId !== sessionId) return\n // RFC-352 D1:replay and live delivery can interleave. Only the service's\n // event-log sequence preserves causal order; client arrival order does not.\n if (!Number.isSafeInteger(data.seq) || (data.seq as number) < 0) return\n const seq = data.seq as number\n if (seq < nextSeq || pendingEvents.has(seq)) return\n const { seq: _seq, ...payload } = data\n pendingEvents.set(seq, { seq, payload })\n while (pendingEvents.has(nextSeq)) {\n const next = pendingEvents.get(nextSeq)!\n pendingEvents.delete(nextSeq)\n onEventCb?.(next)\n subscribedSince = nextSeq\n nextSeq += 1\n }\n return\n }\n\n if (envelope.type === 'Runtime.writeLease' && isRecord(envelope.data)) {\n // RFC-335 S4:write-lease 通知——run-attach 应能感知 acquired/denied 状态,\n // 以便在 denied 时拒绝本地提交、在 acquired 时允许提交。\n const d = envelope.data as {\n sessionId?: string\n state?: string\n reason?: string\n leaseOwner?: string\n }\n deps.onWriteLease?.({\n sessionId: typeof d.sessionId === 'string' ? d.sessionId : sessionId,\n state: (d.state as 'acquired' | 'denied' | 'released' | 'not-held') ?? 'not-held',\n reason: typeof d.reason === 'string' ? d.reason : undefined,\n leaseOwner: typeof d.leaseOwner === 'string' ? d.leaseOwner : undefined,\n })\n return\n }\n\n if (envelope.type === 'Runtime.error' && isRecord(envelope.data)) {\n const d = envelope.data as { code?: string; message?: string; sessionId?: string }\n const message = typeof d.message === 'string' ? d.message : ''\n if (d.code === 'EVENT_LOG_GAP') {\n // onGap 回调先跑(dataSource 里处理重水合),然后断开——避免继续消费断序流。\n // gap 算 'reconnecting' 中加入(正次 connect.onopen 得为 'connected')。\n onGapCb?.({ reason: 'gap', oldestAvailable: nextSeq })\n closeSocket(socket)\n scheduleReconnect()\n return\n }\n deps.onNotify?.(`[service] ${d.code ?? 'runtime'}: ${message}`)\n }\n }\n socket.onclose = () => {\n if (ws === socket) ws = null\n if (!disposed) {\n // 从 'connected'/'connecting' 均退到 'reconnecting',下轮 socket.onopen 才回 'connected'。\n emitState('reconnecting')\n scheduleReconnect()\n } else {\n emitState('closed')\n }\n }\n socket.onerror = () => {\n // onclose 紧随其后统一走重连路径(对齐 web-ui)。\n }\n }\n\n return {\n fetchSnapshot: (sid) => deps.fetchSnapshot(sid),\n subscribe(_sid, since, onEvent, onGap) {\n subscribedSince = since\n onEventCb = onEvent\n onGapCb = onGap\n // Begin only at the snapshot cursor. Reconnect keeps contiguous progress and\n // any buffered out-of-order replay/live events, so subscribe resumes exactly\n // after the last applied authority sequence.\n subscribedSince = Math.max(subscribedSince, since)\n nextSeq = subscribedSince + 1\n for (const seq of pendingEvents.keys()) {\n if (seq <= subscribedSince) pendingEvents.delete(seq)\n }\n if (!ws) {\n connect()\n } else if (ws.readyState === ws.OPEN) {\n sendSubscribe()\n }\n return () => {\n disposed = true\n if (reconnectTimer !== null) { clearTimeoutImpl(reconnectTimer); reconnectTimer = null }\n // 手动发 'closed'——closeSocket 已清 onclose handler,socket.close() 不再代发状态。\n emitState('closed')\n if (ws) closeSocket(ws)\n onEventCb = null\n onGapCb = null\n }\n },\n\n sendVerb(verb: string, data: Record<string, unknown>): void {\n // RFC-335 S4:直接 verb(Session.writeLease.acquire/release)供应商。\n // 未连接 silently drop(重连 deliver-first-subscribe 不 stick 之前的下达)。\n if (disposed || !ws || ws.readyState !== ws.OPEN) return\n ws.send(JSON.stringify({ method: verb, params: data }))\n },\n }\n}\n\n/** attach 入口快捷形式:复用 service-client 的 fetchSnapshot。 */\nexport function createAttachTransport(args: {\n baseUrl: string\n sessionId: string\n fetchSnapshot: (sessionId: string) => Promise<RemoteSessionSnapshot>\n token?: string\n onNotify?: (msg: string) => void\n}): SessionTransport {\n return createServiceWsTransport(args.baseUrl, args.sessionId, {\n fetchSnapshot: args.fetchSnapshot,\n onNotify: args.onNotify,\n })\n}\n\n// 供 attach 入口报错区分。\nexport { ServiceUnreachableError }\n","/**\n * run-attach.ts — RFC-335 T335-07 S2 装配:`otto --attach <sessionId>` attach 模式。\n *\n * 装配链:\n * service snapshot → ServiceWsTransport(WebSocket) → createAttachSessionDataSource\n * → handle.lifecycle.attachSessionSource → 本地 messageStore(TUI 唯一 writer)\n *\n * 关键取舍(RFC-335 §5/§6 + grill 决议 A):\n * - **writer 唯一**:dataSource 的 hydrateMessages/append 都经 handle 出口 → 本地 zustand\n * messageStore 由 TUI 本体写,cli 这层从不手拿 `messageStore` 句柄。\n * - **事件流不再经 streamController**:attach 模式没 live-stream 流水线(streamText\n * Coalescer/agent sync 管线那都是本地 agent 跑起来的产物),事件逐条经 dataSource\n * 按 seq 应用进 store。\n * - **gap 行为可感知**:EVENT_LOG_GAP → dataSource 重水合(拉新 snapshot + messages\n * 整灌 + 重订阅新 cursor)——用户看到「消息重新出现」,绝不静默断一段。\n * - **写**:纯文本经 Chat.query 下发;任何斜杠命令 fail-fast 提示「attach 暂未支持」。\n */\nimport { startTui, type TuiHandle } from '@x-otto/tui'\nimport type { ChatMessage } from '@x-otto/tui'\nimport {\n createAttachSessionDataSource,\n createSessionEventReduceBridge,\n createStoreTuiSink,\n} from '@x-otto/tui'\n\nimport { createServiceClient } from './service-client'\nimport {\n createServiceWsTransport,\n type RemoteSessionSnapshot,\n type SessionTransport,\n} from './remote-transport'\n\nexport interface RunAttachOptions {\n sessionId: string\n baseUrl: string\n token?: string\n stdin?: NodeJS.ReadStream\n stdout?: NodeJS.WriteStream\n /** 单测注入;生产缺省全局 fetch。 */\n fetchImpl?: typeof globalThis.fetch\n /** RFC-335 S4 补丁:强抢写权——kill -9 造成 stuck lease 的唯一正式解锁口。\n * `otto --attach <id> --force-write-lease`。服务端 audit logger.warn 记录,\n * 原 owner 若仍订阅将收「写权被剥夺」通知。 */\n forceWriteLease?: boolean\n}\n\nexport async function runAttach(opts: RunAttachOptions): Promise<void> {\n const stdout = opts.stdout ?? process.stdout\n const stdin = opts.stdin ?? process.stdin\n const fetchImpl = opts.fetchImpl ?? globalThis.fetch\n\n // RFC-335 S4 写租约状态:false 时 onSubmit 最纯文本被拒(只读观察者态)。初始为 true;\n // transport.onWriteLease 会按 Runtime.writeLease envelope 更新。\n let writeLeaseGranted = true\n let leaseOwnerId: string | undefined\n\n const client = createServiceClient(opts.baseUrl, fetchImpl, { token: opts.token })\n\n // 1) snapshot 先行:确认 session 存在 + 拿 cursor。失败 = 显式报错退出(RFC-335 §6:无 local fallback)。\n let snapshot\n try {\n snapshot = await client.fetchSnapshot(opts.sessionId)\n } catch (err) {\n stdout.write(`otto --attach: 无法连接 serve 上的会话 ${opts.sessionId}:${err instanceof Error ? err.message : String(err)}\\n`)\n throw err\n }\n const sessionId = snapshot.session.id\n\n // 2) 起 TUI(不开本地 session、不起 agent workflow——attach 模式的写全走 Chat.query/slash 灰门)\n let tuiRef: TuiHandle | undefined\n const pushText = (text: string): void => {\n if (!tuiRef) return\n const msg: ChatMessage = { role: 'assistant', content: [{ type: 'text', text }] }\n tuiRef.messages.pushMessage(msg)\n }\n\n tuiRef = await startTui({\n stdin,\n stdout,\n columns: stdout.columns ?? 100,\n needsSetup: false,\n welcome: { cwd: undefined },\n onSubmit: (text: string) => {\n // 灰门:任何斜杠命令 attach 期不消费(steer/pause/resume/setTodoList 归下期;RFC-335 §5)。\n const trimmed = text.trimStart()\n if (trimmed.startsWith('/')) {\n pushText(\n `[attach] \\`${trimmed.split(/\\s+/)[0]}\\` 为 attach 暂未支持命令。\\n` +\n `仅支持纯文本提交(经 Chat.query 下发到 serve);如需本地命令请退出 attach 后运行。`,\n )\n return\n }\n if (!tuiRef) return\n // RFC-335 S4 协议面:写租约被另一 client 占有时,本地预拦截(不发 Chat.query\n // 给服务端制造 PROMPT_FAILED spam)——TUI 提示只读观察者语义。\n if (!writeLeaseGranted) {\n pushText(\n `[attach] 会话的写权已被另一 client 持有(${leaseOwnerId ?? '?'})——本端变只读观察者。` +\n `请另选 session 或让对方退出 attach。`,\n )\n return\n }\n void (async () => {\n try {\n await client.sendPrompt(sessionId, text)\n // 响应经 WS 事件流实时回流到 dataSource → messageStore(无需手动同步)。\n } catch (err) {\n pushText(`[attach] 提交失败:${err instanceof Error ? err.message : String(err)}`)\n }\n })()\n },\n })\n\n // 3) transport + dataSource:service socket → 本地 messageStore\n const transport: SessionTransport = createServiceWsTransport(opts.baseUrl, sessionId, {\n fetchSnapshot: async (sid) => {\n const snap = await client.fetchSnapshot(sid)\n return snap as unknown as RemoteSessionSnapshot\n },\n onNotify: (msg) => pushText(`[attach] ${msg}`),\n onStateChange: (state) => {\n // S4 连接生命周期可感知(去抖已由 transport 管的)。\n if (state === 'connected') {\n pushText('[attach] 已连接 serve。')\n // RFC-335 S4:每次连接立刻尝试 acquire 写租约——酸同 clientId;\n // 服务端返回 acquired/denied 由 onWriteLease 通知。\n // RFC-335 S4 补丁:forceWriteLease 时改走 force_acquire(显式人工强抢)。\n if (opts.forceWriteLease) {\n pushText('[attach] --force-write-lease:向服务端发起 force_acquire(kill -9 解锁通道)……')\n transport.sendVerb('Session.writeLease.force_acquire', { sessionId })\n } else {\n transport.sendVerb('Session.writeLease.acquire', { sessionId })\n }\n } else if (state === 'reconnecting') {\n // RFC-335 S4:重连期间打 write-leases 不确定——服务端在断开时释放;保险状\n // 本端 reactive 防出被 rub:下状态 acquired 前一正在拒绝(更安全默认)。\n writeLeaseGranted = false\n pushText('[attach] 连接断开,正在重连……')\n } else if (state === 'closed') {\n writeLeaseGranted = false\n pushText('[attach] 连接已关闭。')\n }\n },\n onWriteLease: (ev) => {\n if (ev.state === 'acquired') {\n writeLeaseGranted = true\n leaseOwnerId = ev.leaseOwner\n pushText('[attach] 获会话写权——纯文本会走 Chat.query 到 service。')\n } else if (ev.state === 'denied') {\n writeLeaseGranted = false\n leaseOwnerId = ev.leaseOwner\n pushText(\n `[attach] 会话写权被另一 client 持有(${ev.leaseOwner ?? '?'})——` +\n `本端变只读观察者态;提交纯文本会被本端予拦截。\\n` +\n `若对方是 kill -9 残留,可重启带 \\`--force-write-lease\\` 强抢写权。`,\n )\n } else if (ev.state === 'released') {\n writeLeaseGranted = false\n leaseOwnerId = ev.leaseOwner\n if (ev.reason === 'forced_by_other_client') {\n pushText(\n `[attach] 写权被另一 client 强行剥夺(force_acquire by ${ev.leaseOwner ?? '?'})——` +\n `本端变只读观察者态。`,\n )\n } else {\n pushText('[attach] 写权已释放——重新 conn 上可申请。')\n }\n }\n },\n })\n\n // `reduceToTui` is the only event→view projection. It shares the same TuiHandle\n // store actions as local mode; snapshot hydration resets its derived state first.\n const eventBridge = createSessionEventReduceBridge(\n createStoreTuiSink({\n pushMessage: tuiRef.messages.pushMessage,\n echoUserInput: tuiRef.messages.echoUserInput,\n pushEngineEvent: tuiRef.engine.pushEngineEvent,\n getNotifyStats: tuiRef.info.getNotifyStats,\n setTasks: tuiRef.stores.tasks.setTasks,\n addTurnBoundary: tuiRef.stores.tasks.addTurnBoundary,\n }),\n )\n\n const dataSource = createAttachSessionDataSource({\n transport: transport as never,\n sessionId,\n onSessionEvent: eventBridge.handle,\n hydrateMessages: (target, messages) => {\n // Snapshot is authoritative after initial connect and EVENT_LOG_GAP. Reset the\n // reducer before accepting subsequent deltas so turn-boundary indices start at\n // the hydrated message count instead of an obsolete stream.\n target.messageStore.setState(() => ({ messages: [] }))\n if (messages.length > 0) {\n target.messageStore.setState(() => ({\n messages: [...(messages as readonly ChatMessage[]) as never],\n }))\n }\n eventBridge.reset(messages.length)\n },\n onGap: () => {\n pushText(\n `[attach] 会话事件日志 gap(cursor 被 service 逐出)——已重新水合 messages 快照。`,\n )\n },\n })\n\n // 4) 挂载:TuiHandle.lifecycle.attachSessionSource(RFC-347 收敛面内)——TUI 本体握 store;\n // 重复挂载会 throw(attach 一个数据源是硬约束)。stop 由调用方跟 TUI lifecycles 结。\n await tuiRef.lifecycle.attachSessionSource(dataSource)\n\n // 5) attach 概述 = 这一条句话(恰好是唯一由 cli 经 messages.pushMessage 写的位置)\n pushText(\n `[attach] 已连接会话 ${sessionId}(host=${snapshot.authority.hostname} pid=${snapshot.authority.pid})。\\n` +\n 'snapshot messages 已灌入 store;后续 Session.event 经 WS 实时应用;' +\n '纯文本走 Chat.query;/xxx 斜杠命令暂未支持。',\n )\n}\n"],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
-
import{t as e}from"./create-host-app-BXQ8bU-B.js";import{t}from"./daemon-base-
|
|
2
|
+
import{t as e}from"./create-host-app-BXQ8bU-B.js";import{t}from"./daemon-base-Y1XI61JY.js";import{SERVICE_PORT as n}from"@x-otto/env";import{resolve as r}from"node:path";import{createCodingService as i}from"@x-otto/service";async function a(n,r={}){let a=r.stdout??(e=>process.stdout.write(e)),c=r.stderr??(e=>process.stderr.write(e));if(n[0]===`help`||n[0]===`--help`)return s(a),0;let l,u,d,f;try{({port:l,inspect:u,staticDir:d,token:f}=o(n))}catch(e){return c(`otto serve: ${e instanceof Error?e.message:String(e)}\n`),1}let p=r.app??e({logger:{name:`otto-serve`,level:r.verbose?`debug`:`info`,destination:`stderr`},inspect:u,workspaceDir:r.projectDir,projectConfigPath:r.configPath,modelId:r.modelId});try{await p.start()}catch(e){return c(`otto serve: failed to start app: ${e instanceof Error?e.message:String(e)}\n`),1}let m=i(p,{port:l,host:`127.0.0.1`,staticDir:d,apiToken:f,wsAuthToken:f,authorityId:process.env.OTTO_AUTHORITY_ID||void 0});try{await m.start()}catch(e){return c(`otto serve: failed to listen on port ${l}: ${e instanceof Error?e.message:String(e)}\n`),await p.stop(),1}let h=m.httpServer.address().port;a(`otto service listening on http://127.0.0.1:${h}${f?` (auth: token required)`:``}
|
|
3
3
|
${d?` web: http://127.0.0.1:${h}/${f?` (打开时附加 ?token=<你的 token>)`:``} (静态页面同源托管 ${d})\n`:``} panels: otto observe summary <session-id>
|
|
4
4
|
otto time-travel checkpoints <session-id>
|
|
5
5
|
otto debug breakpoints list${u?``:" (debugger disabled — restart with `otto serve --inspect`)"}
|
|
@@ -18,4 +18,4 @@ ${d?` web: http://127.0.0.1:${h}/${f?` (打开时附加 ?token=<你的 to
|
|
|
18
18
|
|
|
19
19
|
面板命令默认连 http://127.0.0.1:${n}(可 --remote 覆盖)
|
|
20
20
|
`)}export{a as runServeCommand};
|
|
21
|
-
//# sourceMappingURL=serve-
|
|
21
|
+
//# sourceMappingURL=serve-Ke0nwN9Y.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve-
|
|
1
|
+
{"version":3,"file":"serve-Ke0nwN9Y.js","names":[],"sources":["../src/commands/serve.ts"],"sourcesContent":["import type { AddressInfo } from 'node:net'\nimport { resolve } from 'node:path'\nimport { SERVICE_PORT } from '@x-otto/env'\nimport { createHostApp } from '../create-host-app'\nimport { createCodingService } from '@x-otto/service'\nimport type { AppContext } from '@x-otto/coding'\n\nimport { waitForShutdown } from './daemon-base'\n\nexport interface ServeDeps {\n stdout?: (s: string) => void\n stderr?: (s: string) => void\n /** 全局 CLI 选项透传(与 `otto run` 同源装配)。 */\n projectDir?: string\n configPath?: string\n modelId?: string\n verbose?: boolean\n /** 测试注入:替代生产装配的 app(结构 = AppContext + start/stop)。 */\n app?: AppContext & { start(): Promise<void>; stop(): Promise<void> }\n /** 测试注入:优雅退出信号(生产 = SIGINT/SIGTERM)。 */\n signal?: AbortSignal\n}\n\nexport async function runServeCommand(args: string[], deps: ServeDeps = {}): Promise<number> {\n const stdout = deps.stdout ?? ((s) => process.stdout.write(s))\n const stderr = deps.stderr ?? ((s) => process.stderr.write(s))\n\n if (args[0] === 'help' || args[0] === '--help') {\n printHelp(stdout)\n return 0\n }\n\n let port: number\n let inspect: boolean\n let staticDir: string | undefined\n let token: string | undefined\n try {\n ;({ port, inspect, staticDir, token } = parseServeArgs(args))\n } catch (error) {\n stderr(`otto serve: ${error instanceof Error ? error.message : String(error)}\\n`)\n return 1\n }\n\n const app =\n deps.app ??\n createHostApp({\n logger: {\n name: 'otto-serve',\n level: deps.verbose ? 'debug' : 'info',\n destination: 'stderr',\n },\n // `--inspect` 必须下传:`AppOptions.inspect` 是 `buildInspectDevtools` 的唯一开关\n // (devtools-setup.ts:19 `if (!inspect) return { devtools: null }`)。此前 serve 解析了\n // 该 flag、也据它打印\"调试器已启用\"提示,却从未传给 createApp —— 于是 `app.devtools`\n // 恒为 null,`/api/debugger/*` 全部 503、DebugBridge 也不会被构造。即 `otto serve\n // --inspect` 实际从不启用调试器(提示与事实相反)。\n inspect,\n workspaceDir: deps.projectDir,\n projectConfigPath: deps.configPath,\n modelId: deps.modelId,\n })\n\n try {\n await app.start()\n } catch (error) {\n stderr(`otto serve: failed to start app: ${error instanceof Error ? error.message : String(error)}\\n`)\n return 1\n }\n\n // --token 同时启用 HTTP Bearer(apiToken)与 WS ?token=(wsAuthToken);页面用 URL `?token=` 对上。\n const service = createCodingService(app, {\n port,\n host: '127.0.0.1',\n staticDir,\n apiToken: token,\n wsAuthToken: token,\n // RFC-335 M2:由 `otto daemon start` 下传,使 AuthorityDescriptor.instanceId 与\n // daemon state 记录一致(客户端据此确认\"连上的 authority 就是 state 里那个 daemon\")。\n // 前台直接 `otto serve` 时缺省,由 service 自行生成。\n authorityId: process.env['OTTO_AUTHORITY_ID'] || undefined,\n })\n\n try {\n await service.start()\n } catch (error) {\n stderr(`otto serve: failed to listen on port ${port}: ${error instanceof Error ? error.message : String(error)}\\n`)\n await app.stop()\n return 1\n }\n\n const actualPort = (service.httpServer.address() as AddressInfo).port\n // 不把 token 明文打进 stdout(会落 scrollback/CI 日志)——只提示需附加 ?token=。\n const webHint = token ? ' (打开时附加 ?token=<你的 token>)' : ''\n stdout(`otto service listening on http://127.0.0.1:${actualPort}${token ? ' (auth: token required)' : ''}\n${staticDir ? ` web: http://127.0.0.1:${actualPort}/${webHint} (静态页面同源托管 ${staticDir})\\n` : ''} panels: otto observe summary <session-id>\n otto time-travel checkpoints <session-id>\n otto debug breakpoints list${inspect ? '' : ' (debugger disabled — restart with `otto serve --inspect`)'}\n stop: Ctrl-C\n`)\n\n await waitForShutdown(deps.signal)\n\n stdout('otto serve: shutting down...\\n')\n await service.stop()\n await app.stop()\n // 硬退出:service.stop()/app.stop() 可能留下孤儿 handle(worker_threads port、\n // DB pool、trace tail),吊住事件循环导致 Ctrl+C 后进程不退。与 interactive 路径\n // (cli.ts 末尾 process.exit)对齐。stdio 已同步写,无截断风险。\n process.exit(0)\n}\n\nfunction parseServeArgs(args: string[]): {\n port: number\n inspect: boolean\n staticDir?: string\n token?: string\n} {\n let port = SERVICE_PORT\n let inspect = false\n let staticDir: string | undefined\n let token: string | undefined\n\n // 取下一个值;缺失或形如 --flag(误把下个选项当值)即报错,避免静默吞掉选项。\n const takeValue = (i: number, name: string): string => {\n const raw = args[i + 1]\n if (raw === undefined || raw.startsWith('--')) {\n throw new Error(`${name} requires a value`)\n }\n return raw\n }\n\n for (let i = 0; i < args.length; i++) {\n const arg = args[i]\n if (arg === '--port' || arg === '-p') {\n const raw = takeValue(i, '--port')\n i++\n const n = Number(raw)\n if (!Number.isInteger(n) || n < 0 || n > 65535) {\n throw new Error(`invalid --port value: ${raw}`)\n }\n port = n\n } else if (arg === '--inspect') {\n inspect = true\n } else if (arg === '--static') {\n staticDir = resolve(takeValue(i, '--static'))\n i++\n } else if (arg === '--token') {\n token = takeValue(i, '--token')\n i++\n }\n // 其它(含全局 flag --verbose/--model 等,经 ctx.args 透传进来)忽略——\n // 不能 throw,否则 `otto serve --verbose` 会误伤(全局 flag 由 parseCLI 已解析)。\n }\n\n return { port, inspect, staticDir, token }\n}\n\nfunction printHelp(stdout: (s: string) => void): void {\n stdout(`otto serve — 启动 HTTP/WS service(观测/调试/时间旅行面板的对端)\n\n用法:\n otto serve [--port <n>] [--inspect] [--static <dir>] [--token <t>]\n\n选项:\n --port, -p <n> 监听端口(默认 ${SERVICE_PORT},可经 OTTO_SERVICE_PORT 覆盖;0 = 随机)\n --inspect 启用调试器(断点/暂停面板需要)\n --static <dir> 同源托管一个已构建的前端目录(SPA),页面与 /api、/ws 同端口免 CORS\n --token <t> 启用鉴权:HTTP /api/* 需 Bearer,WS 需 ?token=;页面用 URL ?token=<t> 对上\n\n面板命令默认连 http://127.0.0.1:${SERVICE_PORT}(可 --remote 覆盖)\n`)\n}\n"],"mappings":";gOAuBA,eAAsB,EAAgB,EAAgB,EAAkB,EAAE,CAAmB,CAC3F,IAAM,EAAS,EAAK,SAAY,GAAM,QAAQ,OAAO,MAAM,EAAE,EACvD,EAAS,EAAK,SAAY,GAAM,QAAQ,OAAO,MAAM,EAAE,EAE7D,GAAI,EAAK,KAAO,QAAU,EAAK,KAAO,SAEpC,OADA,EAAU,EAAO,CACV,EAGT,IAAI,EACA,EACA,EACA,EACJ,GAAI,EACA,uCAAsC,EAAe,EAAK,QACrD,EAAO,CAEd,OADA,EAAO,eAAe,aAAiB,MAAQ,EAAM,QAAU,OAAO,EAAM,CAAC,IAAI,CAC1E,EAGT,IAAM,EACJ,EAAK,KACL,EAAc,CACZ,OAAQ,CACN,KAAM,aACN,MAAO,EAAK,QAAU,QAAU,OAChC,YAAa,SACd,CAMD,UACA,aAAc,EAAK,WACnB,kBAAmB,EAAK,WACxB,QAAS,EAAK,QACf,CAAC,CAEJ,GAAI,CACF,MAAM,EAAI,OAAO,OACV,EAAO,CAEd,OADA,EAAO,oCAAoC,aAAiB,MAAQ,EAAM,QAAU,OAAO,EAAM,CAAC,IAAI,CAC/F,EAIT,IAAM,EAAU,EAAoB,EAAK,CACvC,OACA,KAAM,YACN,YACA,SAAU,EACV,YAAa,EAIb,YAAa,QAAQ,IAAI,mBAAwB,IAAA,GAClD,CAAC,CAEF,GAAI,CACF,MAAM,EAAQ,OAAO,OACd,EAAO,CAGd,OAFA,EAAO,wCAAwC,EAAK,IAAI,aAAiB,MAAQ,EAAM,QAAU,OAAO,EAAM,CAAC,IAAI,CACnH,MAAM,EAAI,MAAM,CACT,EAGT,IAAM,EAAc,EAAQ,WAAW,SAAS,CAAiB,KAGjE,EAAO,8CAA8C,IAAa,EAAQ,4BAA8B,GAAG;EAC3G,EAAY,+BAA+B,EAAW,GAFtC,EAAQ,6BAA+B,GAEU,eAAe,EAAU,KAAO,GAAG;;wCAE9D,EAAU,GAAK,+DAA+D;;EAEpH,CAEA,MAAM,EAAgB,EAAK,OAAO,CAElC,EAAO;EAAiC,CACxC,MAAM,EAAQ,MAAM,CACpB,MAAM,EAAI,MAAM,CAIhB,QAAQ,KAAK,EAAE,CAGjB,SAAS,EAAe,EAKtB,CACA,IAAI,EAAO,EACP,EAAU,GACV,EACA,EAGE,GAAa,EAAW,IAAyB,CACrD,IAAM,EAAM,EAAK,EAAI,GACrB,GAAI,IAAQ,IAAA,IAAa,EAAI,WAAW,KAAK,CAC3C,MAAU,MAAM,GAAG,EAAK,mBAAmB,CAE7C,OAAO,GAGT,IAAK,IAAI,EAAI,EAAG,EAAI,EAAK,OAAQ,IAAK,CACpC,IAAM,EAAM,EAAK,GACjB,GAAI,IAAQ,UAAY,IAAQ,KAAM,CACpC,IAAM,EAAM,EAAU,EAAG,SAAS,CAClC,IACA,IAAM,EAAI,OAAO,EAAI,CACrB,GAAI,CAAC,OAAO,UAAU,EAAE,EAAI,EAAI,GAAK,EAAI,MACvC,MAAU,MAAM,yBAAyB,IAAM,CAEjD,EAAO,OACE,IAAQ,YACjB,EAAU,GACD,IAAQ,YACjB,EAAY,EAAQ,EAAU,EAAG,WAAW,CAAC,CAC7C,KACS,IAAQ,YACjB,EAAQ,EAAU,EAAG,UAAU,CAC/B,KAMJ,MAAO,CAAE,OAAM,UAAS,YAAW,QAAO,CAG5C,SAAS,EAAU,EAAmC,CACpD,EAAO;;;;;;6BAMoB,EAAa;;;;;2BAKf,EAAa;EACtC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
-
import{n as e}from"./build-id-
|
|
3
|
-
//# sourceMappingURL=version-
|
|
2
|
+
import{n as e}from"./build-id-D_JURZdd.js";import{createRequire as t}from"node:module";const n=t(import.meta.url);function r(){return`${n(`../package.json`).version??`0.0.0`} (build ${e})`}export{r as t};
|
|
3
|
+
//# sourceMappingURL=version-BKPdYoHG.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version-
|
|
1
|
+
{"version":3,"file":"version-BKPdYoHG.js","names":[],"sources":["../src/version.ts"],"sourcesContent":["import { createRequire } from 'node:module'\n\nimport { BUILD_ID } from './build-id'\n\nconst require = createRequire(import.meta.url)\n\n/**\n * 版本号 + build ID。\n * 格式:`0.1.0 (build 2072)`。build ID = git rev-list --count HEAD,随每次构建自增。\n */\nexport function getVersion(): string {\n const pkg = require('../package.json') as { version?: string }\n const ver = pkg.version ?? '0.0.0'\n return `${ver} (build ${BUILD_ID})`\n}\n"],"mappings":";uFAIA,MAAM,EAAU,EAAc,OAAO,KAAK,IAAI,CAM9C,SAAgB,GAAqB,CAGnC,MAAO,GAFK,EAAQ,kBAAkB,CACtB,SAAW,QACb,UAAU,EAAS"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@x-otto/cli",
|
|
3
|
-
"version": "0.0.1-alpha.
|
|
3
|
+
"version": "0.0.1-alpha.44",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"types": "./dist/index.d.ts",
|
|
@@ -19,25 +19,25 @@
|
|
|
19
19
|
"dependencies": {
|
|
20
20
|
"react": "^19.2.4",
|
|
21
21
|
"@x-otto/agent": "0.0.1-alpha.2",
|
|
22
|
-
"@x-otto/env": "0.1.0-alpha.6",
|
|
23
22
|
"@x-otto/ai": "0.0.1-alpha.2",
|
|
24
|
-
"@x-otto/schedule": "0.0.1-alpha.2",
|
|
25
23
|
"@x-otto/coding": "0.0.1-alpha.16",
|
|
26
|
-
"@x-otto/
|
|
27
|
-
"@x-otto/mcp": "0.0.1-alpha.2",
|
|
24
|
+
"@x-otto/schedule": "0.0.1-alpha.2",
|
|
28
25
|
"@x-otto/persistence": "0.0.1-alpha.3",
|
|
26
|
+
"@x-otto/env": "0.1.0-alpha.6",
|
|
29
27
|
"@x-otto/memory": "0.0.1-alpha.2",
|
|
30
|
-
"@x-otto/
|
|
28
|
+
"@x-otto/mcp": "0.0.1-alpha.2",
|
|
31
29
|
"@x-otto/remote-persistence-server": "0.0.1-alpha.3",
|
|
30
|
+
"@x-otto/interchange": "0.1.0-alpha.5",
|
|
32
31
|
"@x-otto/service": "0.0.1-alpha.2",
|
|
33
|
-
"@x-otto/setting": "0.0.1-alpha.3",
|
|
34
32
|
"@x-otto/session-contract": "0.0.1-alpha.2",
|
|
35
|
-
"@x-otto/
|
|
33
|
+
"@x-otto/hooks": "0.0.1-alpha.2",
|
|
34
|
+
"@x-otto/runtime": "0.0.1-alpha.7",
|
|
36
35
|
"@x-otto/shared": "0.1.0-alpha.6",
|
|
37
|
-
"@x-otto/
|
|
36
|
+
"@x-otto/session": "0.0.1-alpha.4",
|
|
37
|
+
"@x-otto/tools": "0.0.1-alpha.3",
|
|
38
|
+
"@x-otto/setting": "0.0.1-alpha.3",
|
|
38
39
|
"@x-otto/trace-view": "0.0.1-alpha.2",
|
|
39
|
-
"@x-otto/tui": "0.0.1-alpha.
|
|
40
|
-
"@x-otto/tools": "0.0.1-alpha.3"
|
|
40
|
+
"@x-otto/tui": "0.0.1-alpha.16"
|
|
41
41
|
},
|
|
42
42
|
"publishConfig": {
|
|
43
43
|
"access": "public",
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"build-id-CGCF2QT6.js","names":[],"sources":["../src/build-id.ts"],"sourcesContent":["// auto-generated by scripts/gen-build-id.mjs — DO NOT EDIT\nexport const BUILD_ID = 4895\nexport const BUILD_BRANCH = 'dev'\nexport const BUILD_HASH = '054819aa0'\n"],"mappings":";AACA,MAAa,EAAW,KAEX,EAAa"}
|