dsh-agent-lines 0.3.5 → 0.3.6
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/CHANGELOG.en.md +9 -1
- package/CHANGELOG.md +9 -1
- package/README.en.md +17 -3
- package/README.md +17 -3
- package/docs/PROTOCOL.en.md +15 -1
- package/docs/PROTOCOL.md +15 -1
- package/docs/en/index.html +3 -3
- package/docs/index.html +3 -3
- package/docs/market-index.json +2 -2
- package/examples/market-index.json +2 -2
- package/lib/index.js +165 -11
- package/lib/store.js +135 -3
- package/lib/tools.js +75 -2
- package/package.json +1 -1
package/CHANGELOG.en.md
CHANGED
|
@@ -2,6 +2,14 @@
|
|
|
2
2
|
|
|
3
3
|
English | [中文](CHANGELOG.md)
|
|
4
4
|
|
|
5
|
+
## 0.3.6 (2026-11-09)
|
|
6
|
+
|
|
7
|
+
- Added line lifecycle: line_retire, line_rebind, line_create replace:true, line_rename.
|
|
8
|
+
- Schema v7: lines.title/lifecycle/generation/rebind_at/rebind_from + line_events audit; additive migration from v6.
|
|
9
|
+
- Backlog migration: queued/claimed migrate; delivered/acked are never re-delivered; migrate:none fails closed when backlog is non-empty.
|
|
10
|
+
- Persistent titles: line_create/line_rename write lines.title and survive restarts.
|
|
11
|
+
- Tests 32/32 pass; existing 0.3.5 behavior unchanged.
|
|
12
|
+
|
|
5
13
|
## 0.3.5 (2026-11-05)
|
|
6
14
|
|
|
7
15
|
- Integrated P0/P1 bootstrap: line_create queues an onboarding message by default, adds bootstrapOnCreate, and line_status/line_list expose materialized / visibleInSidebar / bootstrapQueued.
|
|
@@ -69,4 +77,4 @@ English | [中文](CHANGELOG.md)
|
|
|
69
77
|
- Explicit `delivered` vs `acked`; at-least-once with effectively-once Session log semantics.
|
|
70
78
|
- Local filesystem check (NFS/CIFS/SMB/FUSE refused).
|
|
71
79
|
|
|
72
|
-
Not included: HTTP transport, Web UI, Postgres adapter, automatic process wake.
|
|
80
|
+
Not included: HTTP transport, Web UI, Postgres adapter, automatic process wake.
|
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,14 @@
|
|
|
2
2
|
|
|
3
3
|
[English](CHANGELOG.en.md) | 中文
|
|
4
4
|
|
|
5
|
+
## 0.3.6 (2026-11-09)
|
|
6
|
+
|
|
7
|
+
- 新增线生命周期:line_retire、line_rebind、line_create replace:true、line_rename。
|
|
8
|
+
- schema v7:lines.title/lifecycle/generation/rebind_at/rebind_from + line_events 审计;旧 DB additive 迁移。
|
|
9
|
+
- 积压迁移:queued/claimed 迁移,delivered/acked 不重投;migrate:none 在 backlog 非空时 fail-closed。
|
|
10
|
+
- 标题持久化:line_create/line_rename 写 lines.title,重启保留。
|
|
11
|
+
- 测试 32/32 通过;旧 0.3.5 行为不变。
|
|
12
|
+
|
|
5
13
|
## 0.3.5 (2026-11-05)
|
|
6
14
|
|
|
7
15
|
- 集成 P0/P1 bootstrap:line_create 默认排队 onboarding 消息,新增 bootstrapOnCreate,line_status/line_list 暴露 materialized / visibleInSidebar / bootstrapQueued。
|
|
@@ -68,4 +76,4 @@
|
|
|
68
76
|
- 显式区分 delivered 和 acked;至少一次投递,Session 日志有效一次。
|
|
69
77
|
- 本地文件系统检查(拒绝 NFS/CIFS/SMB/FUSE)。
|
|
70
78
|
|
|
71
|
-
未包含:HTTP transport、Web UI、Postgres adapter、自动拉起进程。
|
|
79
|
+
未包含:HTTP transport、Web UI、Postgres adapter、自动拉起进程。
|
package/README.en.md
CHANGED
|
@@ -36,7 +36,7 @@ The script picks the DSH Web profile, installs the plugin, and verifies agent-li
|
|
|
36
36
|
|
|
37
37
|
Offline or when npm is unavailable, use the local tarball:
|
|
38
38
|
|
|
39
|
-
bash install.sh ./dsh-agent-lines-0.3.
|
|
39
|
+
bash install.sh ./dsh-agent-lines-0.3.6.tgz
|
|
40
40
|
|
|
41
41
|
After install and restart, it works without a config. When you want a fixed manager/worker setup, paste the "Manager config" block below into the file printed by the installer.
|
|
42
42
|
|
|
@@ -137,7 +137,10 @@ Tools:
|
|
|
137
137
|
| `line_status` | Read-only: current Session binding, manager Session live/persisted, lines, repair command; visible even when unbound |
|
|
138
138
|
| `line_claim_manager` | Bind this live root Session as manager; requires `allowClaim: true` and `confirm: "bind-manager"`; global, no shell needed |
|
|
139
139
|
| `line_list` | List lines, status, unread counts, current line and role |
|
|
140
|
-
| `line_create` | Manager only: create a
|
|
140
|
+
| `line_create` | Manager only: create a line; same label is idempotent; replace:true swaps the label to a fresh Session |
|
|
141
|
+
| `line_retire` | Manager only: soft-retire; reject new sends, keep Session and history |
|
|
142
|
+
| `line_rebind` | Manager only: atomically switch a line to a new live Session, optionally migrating backlog |
|
|
143
|
+
| `line_rename` | Manager only: rename the sidebar title and persist it in lines.db |
|
|
141
144
|
| `line_move_workspace` | Manager only: attach an existing line Session to a workspace whose path exactly matches the Session cwd |
|
|
142
145
|
| `line_send` | Send to `line` or `agent#line`; optional `idempotencyKey`, `replyTo`, `noReply`, `forceDistinct`, `ttlMs` |
|
|
143
146
|
| `line_inbox` | Read delivered messages for the current line |
|
|
@@ -147,6 +150,17 @@ Line tools other than `line_status` and `line_claim_manager` are registered only
|
|
|
147
150
|
|
|
148
151
|
`line_create` creates an ordinary DSH Session in the manager workspace (or in the manager cwd when no workspace exists). It does **not** create a separate OS process, profile, or port; all lines in that call share the DSH process. It also does not transfer an existing Session.
|
|
149
152
|
|
|
153
|
+
### Replacing a line when context is full
|
|
154
|
+
|
|
155
|
+
A line does not inherit the old Session context. Recommended flow:
|
|
156
|
+
|
|
157
|
+
1. Have the old line write a handoff file (line_handoff is available from 0.3.7);
|
|
158
|
+
2. The manager calls `line_create({ label, replace: true, force: true, reason: "context full" })`;
|
|
159
|
+
3. The plugin creates a clean Session, atomically swaps the same label, and marks the old Session retired but keeps it;
|
|
160
|
+
4. queued/claimed messages migrate to the new line; delivered/acked stay on the old Session and are never re-delivered.
|
|
161
|
+
|
|
162
|
+
With `migrate: "none"`, a non-empty queue returns `LINE_BACKLOG_NOT_EMPTY` instead of silently switching.
|
|
163
|
+
|
|
150
164
|
Created lines are recorded with `created_by` and restored by the manager on process startup. line_create uses the manager's workspace (workspaceId, so DSH attaches the Session) when one exists; otherwise it falls back to the manager cwd and the line is ungrouped. Pass `workspace` (existing path or id) to create in another workspace. A line whose Session was never materialized may fail on first delivery with `session/not-found`; send it a task (or recreate it) to persist the Session.
|
|
151
165
|
|
|
152
166
|
CLI:
|
|
@@ -274,4 +288,4 @@ See [CONTRIBUTING.en.md](CONTRIBUTING.en.md); code of conduct [CODE_OF_CONDUCT.e
|
|
|
274
288
|
|
|
275
289
|
## License
|
|
276
290
|
|
|
277
|
-
Apache-2.0. See [LICENSE](LICENSE).
|
|
291
|
+
Apache-2.0. See [LICENSE](LICENSE).
|
package/README.md
CHANGED
|
@@ -36,7 +36,7 @@ DSH 的 super agent 平替插件。
|
|
|
36
36
|
|
|
37
37
|
离线或 npm 不可用时,用本地 tarball:
|
|
38
38
|
|
|
39
|
-
bash install.sh ./dsh-agent-lines-0.3.
|
|
39
|
+
bash install.sh ./dsh-agent-lines-0.3.6.tgz
|
|
40
40
|
|
|
41
41
|
安装并重启后,不写配置也可以直接使用;需要固定管理线/worker 时,再把下面“管理线配置”粘贴到脚本打印的配置文件。
|
|
42
42
|
|
|
@@ -137,7 +137,10 @@ line_create({ label: "ops", role: "运维" })
|
|
|
137
137
|
| `line_status` | 只读:当前会话绑定、manager Session 是否存在/live、线列表、修复命令;未绑定也可见 |
|
|
138
138
|
| `line_claim_manager` | 把当前 live 根 Session 绑成 manager;需要 `allowClaim: true` 和 `confirm: "bind-manager"`;全局工具,不需要 shell |
|
|
139
139
|
| `line_list` | 列出线、状态、未读数、当前线和 role |
|
|
140
|
-
| `line_create` |
|
|
140
|
+
| `line_create` | 仅管理线:创建新线;同 label 幂等;传 replace:true 可给同 label 换新 Session |
|
|
141
|
+
| `line_retire` | 仅管理线:软下线;拒绝新发送,保留 Session/历史 |
|
|
142
|
+
| `line_rebind` | 仅管理线:把线原子切到新的 live Session,可迁移积压 |
|
|
143
|
+
| `line_rename` | 仅管理线:改侧栏标题,持久化到 lines.db |
|
|
141
144
|
| `line_move_workspace` | 仅管理线:把已有线的 Session 挂到路径完全匹配的工作区 |
|
|
142
145
|
| `line_send` | 发到 `line` 或 `agent#line`;可选 `idempotencyKey`、`replyTo`、`noReply`、`forceDistinct`、`ttlMs` |
|
|
143
146
|
| `line_inbox` | 读当前线已投递消息 |
|
|
@@ -147,6 +150,17 @@ line_create({ label: "ops", role: "运维" })
|
|
|
147
150
|
|
|
148
151
|
`line_create` 在管理线所属工作区(没有工作区时回退当前目录)创建普通 DSH Session;它**不会**创建独立 OS 进程、profile 或端口,也不转移已有 Session。
|
|
149
152
|
|
|
153
|
+
### 上下文满时换人
|
|
154
|
+
|
|
155
|
+
线不会自动继承旧 Session 的上下文。推荐流程:
|
|
156
|
+
|
|
157
|
+
1. 让旧线写交接单(0.3.7 起可用 `line_handoff`);
|
|
158
|
+
2. 管理线调用 `line_create({ label, replace: true, force: true, reason: "context full" })`;
|
|
159
|
+
3. 插件创建干净 Session、同 label 原子切换,旧 Session 标记 retired 但保留;
|
|
160
|
+
4. queued/claimed 消息迁移到新线;delivered/acked 留在旧 Session,不重投。
|
|
161
|
+
|
|
162
|
+
`migrate: "none"` 时若还有 queued/claimed 会直接报 `LINE_BACKLOG_NOT_EMPTY`,不会静默切走。
|
|
163
|
+
|
|
150
164
|
创建的线会记录 `created_by`,进程重启时由管理线恢复。line_create 会解析管理线所属工作区并传 workspaceId(DSH 会自动 attach),所以新线出现在该工作区而不是“未分组”;如果管理线本身不在工作区,则回退 cwd,线保持未分组。传 `workspace`(已有路径或 id)可指定其他工作区。若某条线的 Session 还从未落盘,首次投递可能 `session/not-found`;给它发一条任务(或重新创建)即可让它持久化。
|
|
151
165
|
|
|
152
166
|
CLI:
|
|
@@ -267,4 +281,4 @@ claim 不会对每个新会话自动执行:需要用户明确要求,或运
|
|
|
267
281
|
|
|
268
282
|
## 许可
|
|
269
283
|
|
|
270
|
-
Apache-2.0,见 [LICENSE](LICENSE)。
|
|
284
|
+
Apache-2.0,见 [LICENSE](LICENSE)。
|
package/docs/PROTOCOL.en.md
CHANGED
|
@@ -98,6 +98,20 @@ The new line is an ordinary DSH Session in the same DSH process; no OS process,
|
|
|
98
98
|
|
|
99
99
|
`line_move_workspace({ line, workspace })` attaches an existing line Session to an existing workspace. DSH's `attachSession` validates that the Session's stored cwd resolves exactly to the workspace path; a different directory fails with `WORKSPACE_ATTACH_FAILED`. It does not move a Session between different directories. If Session creation succeeds but registration fails, the error carries `detail.sessionId` and the Session is not deleted automatically.
|
|
100
100
|
|
|
101
|
+
## Line lifecycle (0.3.6)
|
|
102
|
+
|
|
103
|
+
line_retire({ line, reason? })
|
|
104
|
+
line_rebind({ line, sessionId, migrate?: "queued" | "none", reason? })
|
|
105
|
+
line_create({ label, replace: true, force?, migrate?, title?, reason? })
|
|
106
|
+
line_rename({ line, title })
|
|
107
|
+
|
|
108
|
+
- retired: line_send returns LINE_RETIRED; the Session and history are kept.
|
|
109
|
+
- rebind: atomically switches lines.session_id and increments generation; the old Session is never deleted.
|
|
110
|
+
- migrate=queued: queued/claimed messages move to the new Session; delivered/acked are never re-delivered.
|
|
111
|
+
- migrate=none: returns LINE_BACKLOG_NOT_EMPTY if the backlog is non-empty.
|
|
112
|
+
- replace: creates a fresh Session for the same label and rebinds; an active line requires force + reason.
|
|
113
|
+
- line_events records title/retire/rebind audit; titles survive restarts.
|
|
114
|
+
|
|
101
115
|
## Echo and reply depth
|
|
102
116
|
|
|
103
117
|
- `rootMessageId` groups a reply chain; a root message has null.
|
|
@@ -141,4 +155,4 @@ The new line is an ordinary DSH Session in the same DSH process; no OS process,
|
|
|
141
155
|
| `LINE_NO_REPLY` | Reply to a noReply message |
|
|
142
156
|
| `LINE_REPLY_DEPTH_EXCEEDED` | Reply chain exceeds maxReplyDepth |
|
|
143
157
|
| `LINE_REPLY_TARGET_NOT_FOUND` | replyTo names an unknown message |
|
|
144
|
-
| `session/writer-held` (DSH) | Another DSH process holds the target Session's writer lock; close the other view or use a dedicated Session |
|
|
158
|
+
| `session/writer-held` (DSH) | Another DSH process holds the target Session's writer lock; close the other view or use a dedicated Session |
|
package/docs/PROTOCOL.md
CHANGED
|
@@ -90,6 +90,20 @@ line_create 通过 workspaceRegistry.resolveByPath(managerCwd) 解析管理线
|
|
|
90
90
|
|
|
91
91
|
line_move_workspace({ line, workspace }) 把已有线 Session 挂到已有工作区。DSH 的 attachSession 要求 Session 存储的 cwd 与工作区 path 完全一致;不同目录会 WORKSPACE_ATTACH_FAILED,不会迁移 Session。如果 Session 创建成功但注册失败,错误里带 detail.sessionId,Session 不会自动删除。
|
|
92
92
|
|
|
93
|
+
## 线生命周期(0.3.6)
|
|
94
|
+
|
|
95
|
+
line_retire({ line, reason? })
|
|
96
|
+
line_rebind({ line, sessionId, migrate?: "queued" | "none", reason? })
|
|
97
|
+
line_create({ label, replace: true, force?, migrate?, title?, reason? })
|
|
98
|
+
line_rename({ line, title })
|
|
99
|
+
|
|
100
|
+
- retired:line_send 返回 LINE_RETIRED;Session 和消息历史保留。
|
|
101
|
+
- rebind:原子切换 lines.session_id,generation+1;旧 Session 不删除。
|
|
102
|
+
- migrate=queued:queued/claimed 迁移到新 Session;delivered/acked 不重投。
|
|
103
|
+
- migrate=none:backlog 非空时返回 LINE_BACKLOG_NOT_EMPTY。
|
|
104
|
+
- replace:同 label 创建新 Session 并 rebind;active 线需 force + reason。
|
|
105
|
+
- line_events 记录 title/retire/rebind 审计;title 持久化,重启保留。
|
|
106
|
+
|
|
93
107
|
## 回声与回复深度
|
|
94
108
|
|
|
95
109
|
- rootMessageId 标识回复链;根消息为 null。
|
|
@@ -133,4 +147,4 @@ line_move_workspace({ line, workspace }) 把已有线 Session 挂到已有工作
|
|
|
133
147
|
| LINE_NO_REPLY | 回复 noReply 消息 |
|
|
134
148
|
| LINE_REPLY_DEPTH_EXCEEDED | 回复链超过 maxReplyDepth |
|
|
135
149
|
| LINE_REPLY_TARGET_NOT_FOUND | replyTo 指向未知消息 |
|
|
136
|
-
| session/writer-held (DSH) | 另一个 DSH 进程持有目标 Session 的 writer 锁;关闭另一个视图或使用专用 Session |
|
|
150
|
+
| session/writer-held (DSH) | 另一个 DSH 进程持有目标 Session 的 writer 锁;关闭另一个视图或使用专用 Session |
|
package/docs/en/index.html
CHANGED
|
@@ -43,7 +43,7 @@ footer{padding:34px 0 48px;color:var(--muted);font-size:12px}
|
|
|
43
43
|
<div class="wrap">
|
|
44
44
|
<header>
|
|
45
45
|
<a class="brand" href="../"><span class="mark"></span>dsh-agent-lines</a>
|
|
46
|
-
<nav><a href="../">中文</a><a href="https://github.com/Lencen/dsh-agent-lines">GitHub</a><a href="https://github.com/Lencen/dsh-agent-lines/releases/tag/v0.3.
|
|
46
|
+
<nav><a href="../">中文</a><a href="https://github.com/Lencen/dsh-agent-lines">GitHub</a><a href="https://github.com/Lencen/dsh-agent-lines/releases/tag/v0.3.6">Release</a></nav>
|
|
47
47
|
</header>
|
|
48
48
|
<main>
|
|
49
49
|
<section class="hero" style="border:0;padding-bottom:22px">
|
|
@@ -54,7 +54,7 @@ footer{padding:34px 0 48px;color:var(--muted);font-size:12px}
|
|
|
54
54
|
<div class="install">curl -fsSL https://raw.githubusercontent.com/Lencen/dsh-agent-lines/main/install.sh -o install.sh && bash install.sh</div>
|
|
55
55
|
<div class="actions">
|
|
56
56
|
<a class="btn primary" href="https://github.com/Lencen/dsh-agent-lines">GitHub repository</a>
|
|
57
|
-
<a class="btn" href="https://github.com/Lencen/dsh-agent-lines/releases/tag/v0.3.
|
|
57
|
+
<a class="btn" href="https://github.com/Lencen/dsh-agent-lines/releases/tag/v0.3.6">Download 0.3.6</a>
|
|
58
58
|
</div>
|
|
59
59
|
</div>
|
|
60
60
|
<div class="shot">
|
|
@@ -92,7 +92,7 @@ research (调研), architecture (架构), uiux (UIUX), dev (开发), test (测
|
|
|
92
92
|
After the team is ready, wait for my first task. Do not start by yourself.</pre>
|
|
93
93
|
<p style="color:var(--muted);font-size:14px">Restart DSH Web after install or update. Technical details, protocol, and limits: <a href="https://github.com/Lencen/dsh-agent-lines">README / architecture</a>. Community plugin, not an official DeepSeek product.</p>
|
|
94
94
|
</section>
|
|
95
|
-
<footer>dsh-agent-lines 0.3.
|
|
95
|
+
<footer>dsh-agent-lines 0.3.6 · Apache-2.0 · Community plugin for DeepSeek Harness. Not an official DeepSeek product.</footer>
|
|
96
96
|
</main>
|
|
97
97
|
</div>
|
|
98
98
|
</body>
|
package/docs/index.html
CHANGED
|
@@ -43,7 +43,7 @@ footer{padding:34px 0 48px;color:var(--muted);font-size:12px}
|
|
|
43
43
|
<div class="wrap">
|
|
44
44
|
<header>
|
|
45
45
|
<a class="brand" href="./"><span class="mark"></span>dsh-agent-lines</a>
|
|
46
|
-
<nav><a href="en/index.html">English</a><a href="https://github.com/Lencen/dsh-agent-lines">GitHub</a><a href="https://github.com/Lencen/dsh-agent-lines/releases/tag/v0.3.
|
|
46
|
+
<nav><a href="en/index.html">English</a><a href="https://github.com/Lencen/dsh-agent-lines">GitHub</a><a href="https://github.com/Lencen/dsh-agent-lines/releases/tag/v0.3.6">Release</a></nav>
|
|
47
47
|
</header>
|
|
48
48
|
<main>
|
|
49
49
|
<section class="hero" style="border:0;padding-bottom:22px">
|
|
@@ -54,7 +54,7 @@ footer{padding:34px 0 48px;color:var(--muted);font-size:12px}
|
|
|
54
54
|
<div class="install">curl -fsSL https://raw.githubusercontent.com/Lencen/dsh-agent-lines/main/install.sh -o install.sh && bash install.sh</div>
|
|
55
55
|
<div class="actions">
|
|
56
56
|
<a class="btn primary" href="https://github.com/Lencen/dsh-agent-lines">GitHub 仓库</a>
|
|
57
|
-
<a class="btn" href="https://github.com/Lencen/dsh-agent-lines/releases/tag/v0.3.
|
|
57
|
+
<a class="btn" href="https://github.com/Lencen/dsh-agent-lines/releases/tag/v0.3.6">下载 0.3.6</a>
|
|
58
58
|
</div>
|
|
59
59
|
</div>
|
|
60
60
|
<div class="shot">
|
|
@@ -92,7 +92,7 @@ research(调研)、architecture(架构)、uiux(UIUX)、dev(开发
|
|
|
92
92
|
团队建好后先待命,不要自动开工,等我发第一个任务。</pre>
|
|
93
93
|
<p style="color:var(--muted);font-size:14px">安装或更新后需要重启 DSH Web。技术细节、协议和限制见 <a href="https://github.com/Lencen/dsh-agent-lines">README / 架构文档</a>。社区插件,不是 DeepSeek 官方产品。</p>
|
|
94
94
|
</section>
|
|
95
|
-
<footer>dsh-agent-lines 0.3.
|
|
95
|
+
<footer>dsh-agent-lines 0.3.6 · Apache-2.0 · Community plugin for DeepSeek Harness. Not an official DeepSeek product.</footer>
|
|
96
96
|
</main>
|
|
97
97
|
</div>
|
|
98
98
|
</body>
|
package/docs/market-index.json
CHANGED
package/lib/index.js
CHANGED
|
@@ -34,7 +34,8 @@ function normalizeLine(entry, agentId, index) {
|
|
|
34
34
|
const sessionId = String(entry.sessionId ?? '').trim()
|
|
35
35
|
if (sessionId.length === 0) throw new LineError('LINE_INVALID_CONFIG', `lines[${index}].sessionId is required`)
|
|
36
36
|
const role = entry.role === undefined || entry.role === null ? null : String(entry.role).trim() || null
|
|
37
|
-
|
|
37
|
+
const title = entry.title === undefined || entry.title === null ? null : String(entry.title).trim() || null
|
|
38
|
+
return { agentId, label, sessionId, lineId: lineId(agentId, label), role, title }
|
|
38
39
|
}
|
|
39
40
|
|
|
40
41
|
/** Validate and normalize plugin config. Exported for tests and the CLI. */
|
|
@@ -131,7 +132,7 @@ export async function apply(ctx, rawConfig) {
|
|
|
131
132
|
if (def === undefined || bindings.has(agent.session.id)) return
|
|
132
133
|
const binding = {
|
|
133
134
|
prompt: bindAgentPrompt(agent, def),
|
|
134
|
-
tools: registerToolsForAgent(agent, def, { config, store, lineDefs, createLine, moveLineWorkspace }),
|
|
135
|
+
tools: registerToolsForAgent(agent, def, { config, store, lineDefs, createLine, moveLineWorkspace, retireLine, rebindLine, renameLine }),
|
|
135
136
|
}
|
|
136
137
|
bindings.set(agent.session.id, binding)
|
|
137
138
|
}
|
|
@@ -147,10 +148,21 @@ export async function apply(ctx, rawConfig) {
|
|
|
147
148
|
}
|
|
148
149
|
}
|
|
149
150
|
|
|
151
|
+
const renameTitle = async (def) => {
|
|
152
|
+
if (def.sessionId === undefined || def.sessionId === '') return
|
|
153
|
+
const title = String(def.title || def.role || def.label || 'agent line').slice(0, 120)
|
|
154
|
+
try {
|
|
155
|
+
await ctx.sessionController?.rename?.({ sessionId: def.sessionId, title })
|
|
156
|
+
} catch (error) {
|
|
157
|
+
ctx.logger?.warn?.('agent-lines: rename %s failed: %s', def.label, String(error))
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
|
|
150
161
|
const startLoop = (def) => {
|
|
151
162
|
const loop = new DeliveryLoop({ ctx, config: loopConfig(config, def), store, logger: ctx.logger })
|
|
152
163
|
loops.push(loop)
|
|
153
164
|
loop.start()
|
|
165
|
+
void renameTitle(def)
|
|
154
166
|
}
|
|
155
167
|
|
|
156
168
|
const sessionExists = async (sessionId) => {
|
|
@@ -281,13 +293,147 @@ export async function apply(ctx, rawConfig) {
|
|
|
281
293
|
}
|
|
282
294
|
process.once('exit', releaseAll)
|
|
283
295
|
|
|
296
|
+
const rebinding = new Set()
|
|
297
|
+
|
|
298
|
+
const lineTitle = (def, row) => String((row && row.title) || (def && def.title) || (def && def.role) || (def && def.label) || 'agent line').slice(0, 120)
|
|
299
|
+
|
|
300
|
+
const rebindLine = async ({ label, sessionId, actor, reason, migrate = 'queued', force = false }) => {
|
|
301
|
+
if (label === config.createFrom) throw new LineError('LINE_MANAGER_REBIND_UNSUPPORTED', 'The manager line is rebound with line_claim_manager, not line_rebind', { line: label })
|
|
302
|
+
const row = store.getLineRow(config.agentId, label)
|
|
303
|
+
if (row === undefined) throw new LineError('LINE_NOT_FOUND', `No such line: ${config.agentId}#${label}`)
|
|
304
|
+
if (rebinding.has(label) || row.lifecycle === 'rebinding') throw new LineError('LINE_REBIND_BUSY', `Line ${label} is already rebinding`, { line: label })
|
|
305
|
+
if (!(await sessionExists(sessionId))) throw new LineError('LINE_SESSION_NOT_FOUND', `Session is not live or persisted: ${sessionId}`, { sessionId })
|
|
306
|
+
const target = lineDefs.get(sessionId)
|
|
307
|
+
if (target !== undefined && target.label !== label) throw new LineError('LINE_SESSION_BOUND', `Session ${sessionId} is already bound to ${target.label}`, { sessionId, line: target.label })
|
|
308
|
+
const oldDef = [...lineDefs.values()].find(line => line.label === label)
|
|
309
|
+
if (oldDef !== undefined && oldDef.sessionId === sessionId) {
|
|
310
|
+
return { line: label, oldSessionId: row.session_id, newSessionId: sessionId, generation: row.generation, counts: store.messageCounts({ agentId: config.agentId, line: label }), already: true }
|
|
311
|
+
}
|
|
312
|
+
const oldLifecycle = row.lifecycle || 'active'
|
|
313
|
+
const oldAgent = oldDef === undefined ? undefined : ctx.agents.get(oldDef.sessionId)
|
|
314
|
+
rebinding.add(label)
|
|
315
|
+
let locked = false
|
|
316
|
+
try {
|
|
317
|
+
store.setLifecycle({ agentId: config.agentId, line: label, lifecycle: 'rebinding', actor, reason })
|
|
318
|
+
locked = true
|
|
319
|
+
await stopLoopFor(label)
|
|
320
|
+
if (oldDef !== undefined) lineDefs.delete(oldDef.sessionId)
|
|
321
|
+
if (oldAgent !== undefined) unbindAgent(oldAgent)
|
|
322
|
+
const updated = store.rebind({
|
|
323
|
+
agentId: config.agentId, line: label, sessionId, actor, reason, migrate, locked: true,
|
|
324
|
+
})
|
|
325
|
+
const def = {
|
|
326
|
+
agentId: config.agentId, label, sessionId, lineId: lineId(config.agentId, label),
|
|
327
|
+
role: (oldDef && oldDef.role) || row.role || null,
|
|
328
|
+
title: lineTitle(oldDef, updated), createdBy: row.created_by || (oldDef && oldDef.createdBy) || null,
|
|
329
|
+
lifecycle: 'active', generation: updated.generation,
|
|
330
|
+
}
|
|
331
|
+
lineDefs.set(sessionId, def)
|
|
332
|
+
startLoop(def)
|
|
333
|
+
const agent = ctx.agents.get(sessionId)
|
|
334
|
+
if (agent !== undefined) bindAgent(agent)
|
|
335
|
+
return { line: label, oldSessionId: row.session_id, newSessionId: sessionId, generation: updated.generation, counts: updated.counts }
|
|
336
|
+
} catch (error) {
|
|
337
|
+
try { await stopLoopFor(label) } catch { /* best effort */ }
|
|
338
|
+
if (oldDef !== undefined) {
|
|
339
|
+
lineDefs.set(oldDef.sessionId, oldDef)
|
|
340
|
+
startLoop(oldDef)
|
|
341
|
+
const agent = ctx.agents.get(oldDef.sessionId)
|
|
342
|
+
if (agent !== undefined) bindAgent(agent)
|
|
343
|
+
}
|
|
344
|
+
if (locked) {
|
|
345
|
+
try { store.setLifecycle({ agentId: config.agentId, line: label, lifecycle: oldLifecycle === 'rebinding' ? 'active' : oldLifecycle, actor, reason: 'rebind rollback' }) } catch { /* best effort */ }
|
|
346
|
+
}
|
|
347
|
+
throw error
|
|
348
|
+
} finally {
|
|
349
|
+
rebinding.delete(label)
|
|
350
|
+
}
|
|
351
|
+
}
|
|
352
|
+
|
|
353
|
+
const retireLine = async ({ label, actor, reason }) => {
|
|
354
|
+
if (label === config.createFrom) throw new LineError('LINE_MANAGER_RETIRE_UNSUPPORTED', 'The manager line cannot be retired', { line: label })
|
|
355
|
+
const row = store.getLineRow(config.agentId, label)
|
|
356
|
+
if (row === undefined) throw new LineError('LINE_NOT_FOUND', `No such line: ${config.agentId}#${label}`)
|
|
357
|
+
const def = [...lineDefs.values()].find(line => line.label === label)
|
|
358
|
+
if (def !== undefined) def.lifecycle = 'retired'
|
|
359
|
+
await stopLoopFor(label)
|
|
360
|
+
const updated = store.retire({ agentId: config.agentId, line: label, actor, reason })
|
|
361
|
+
return { line: label, lifecycle: updated.lifecycle, counts: updated.counts, already: row.lifecycle === 'retired' }
|
|
362
|
+
}
|
|
363
|
+
|
|
364
|
+
const renameLine = async ({ label, title, actor }) => {
|
|
365
|
+
const row = store.getLineRow(config.agentId, label)
|
|
366
|
+
if (row === undefined) throw new LineError('LINE_NOT_FOUND', `No such line: ${config.agentId}#${label}`)
|
|
367
|
+
const updated = store.setTitle({ agentId: config.agentId, line: label, title, actor })
|
|
368
|
+
const def = [...lineDefs.values()].find(line => line.label === label)
|
|
369
|
+
if (def !== undefined) def.title = updated.title
|
|
370
|
+
try { await ctx.sessionController?.rename?.({ sessionId: row.session_id, title: updated.title || title }) } catch { /* blank session can rename later */ }
|
|
371
|
+
return { line: label, title: updated.title }
|
|
372
|
+
}
|
|
373
|
+
|
|
374
|
+
const replaceLine = async (existing, args, exec) => {
|
|
375
|
+
if (existing.label === config.createFrom) throw new LineError('LINE_MANAGER_REBIND_UNSUPPORTED', 'The manager line cannot be replaced', { line: existing.label })
|
|
376
|
+
if (existing.lifecycle === 'active' && args.force !== true) {
|
|
377
|
+
throw new LineError('LINE_REPLACE_ACTIVE', `Line ${existing.label} is active; pass force:true to replace it`, { line: existing.label, lifecycle: existing.lifecycle })
|
|
378
|
+
}
|
|
379
|
+
if (args.migrate === 'none') {
|
|
380
|
+
const backlog = store.messageCounts({ agentId: config.agentId, line: existing.label })
|
|
381
|
+
if (backlog.queued + backlog.claimed > 0) {
|
|
382
|
+
throw new LineError('LINE_BACKLOG_NOT_EMPTY', `Line ${existing.label} has ${backlog.queued + backlog.claimed} queued/claimed messages`, { line: existing.label, counts: backlog })
|
|
383
|
+
}
|
|
384
|
+
}
|
|
385
|
+
const baseCwd = exec?.agent?.session?.header?.cwd ?? process.cwd()
|
|
386
|
+
if (args.workspace !== undefined && args.cwd !== undefined) throw new LineError('LINE_INVALID_ARGUMENT', 'workspace and cwd are mutually exclusive')
|
|
387
|
+
const cwd = args.cwd === undefined || String(args.cwd).trim() === '' ? baseCwd : resolve(baseCwd, String(args.cwd).trim())
|
|
388
|
+
const targetWorkspace = args.workspace !== undefined ? await resolveWorkspace(args.workspace) : await managerWorkspace(baseCwd)
|
|
389
|
+
const role = args.role === undefined || args.role === null ? null : String(args.role).trim() || null
|
|
390
|
+
const title = args.title === undefined || args.title === null ? (role || existing.title || existing.role || existing.label) : String(args.title).trim().slice(0, 120)
|
|
391
|
+
const sessionId = `session-${randomUUID()}`
|
|
392
|
+
const created = await ctx.sessionController.create({
|
|
393
|
+
sessionId,
|
|
394
|
+
...(targetWorkspace === undefined ? { cwd } : { workspaceId: targetWorkspace.id }),
|
|
395
|
+
agentPreset: args.agentPreset === undefined ? config.childPreset : String(args.agentPreset),
|
|
396
|
+
})
|
|
397
|
+
const actualSessionId = created.sessionId
|
|
398
|
+
const result = await rebindLine({
|
|
399
|
+
label: existing.label, sessionId: actualSessionId, actor: (exec && exec.agent && exec.agent.session && exec.agent.session.id) || null,
|
|
400
|
+
reason: String(args.reason || 'line_create replace'), migrate: args.migrate === 'none' ? 'none' : 'queued', force: args.force === true,
|
|
401
|
+
})
|
|
402
|
+
const newDef = lineDefs.get(actualSessionId)
|
|
403
|
+
if (newDef !== undefined) {
|
|
404
|
+
newDef.role = role
|
|
405
|
+
newDef.title = title
|
|
406
|
+
try { store.setTitle({ agentId: config.agentId, line: existing.label, title }) } catch { /* best effort */ }
|
|
407
|
+
}
|
|
408
|
+
let bootstrapQueued = false
|
|
409
|
+
if (args.bootstrap !== false && config.bootstrapOnCreate !== false) {
|
|
410
|
+
const creator = lineDefs.get(exec.agent.session.id)
|
|
411
|
+
if (creator !== undefined) {
|
|
412
|
+
try {
|
|
413
|
+
store.send({
|
|
414
|
+
agentId: config.agentId, fromLine: creator.label, to: existing.label,
|
|
415
|
+
text: `[Agent Line] ${existing.label} replaced. You are ${role ?? existing.role ?? existing.label}. Read the handoff file before starting; this is an identity message, do not modify files yet.`,
|
|
416
|
+
noReply: true, maxReplyDepth: config.maxReplyDepth, maxMessageBytes: config.maxMessageBytes,
|
|
417
|
+
})
|
|
418
|
+
bootstrapQueued = true
|
|
419
|
+
} catch (error) { ctx.logger?.warn?.('agent-lines: replace bootstrap failed: %s', String(error)) }
|
|
420
|
+
}
|
|
421
|
+
}
|
|
422
|
+
return {
|
|
423
|
+
line: existing.label, sessionId: actualSessionId, oldSessionId: result.oldSessionId,
|
|
424
|
+
role, title, created: true, replaced: true, generation: result.generation, counts: result.counts,
|
|
425
|
+
cwd: targetWorkspace?.path ?? cwd, workspaceId: targetWorkspace?.id ?? null, bootstrapQueued,
|
|
426
|
+
}
|
|
427
|
+
}
|
|
428
|
+
|
|
284
429
|
const createLine = async (args, exec) => {
|
|
285
430
|
if (closed) throw new LineError('LINE_CLOSED', 'The agent-lines plugin is shutting down')
|
|
286
431
|
if (!config.allowCreate) throw new LineError('LINE_CREATE_DISABLED', 'line_create is disabled by config')
|
|
287
432
|
const label = validateLineLabel(args.label)
|
|
288
433
|
const existing = store.getLineRow(config.agentId, label)
|
|
289
434
|
if (existing !== undefined) {
|
|
290
|
-
|
|
435
|
+
if (args.replace === true) return replaceLine(existing, args, exec)
|
|
436
|
+
return { line: existing.label, sessionId: existing.session_id, role: existing.role, title: existing.title ?? existing.role ?? existing.label, lifecycle: existing.lifecycle, created: false }
|
|
291
437
|
}
|
|
292
438
|
if (store.countLines(config.agentId) >= config.maxLines) {
|
|
293
439
|
throw new LineError('LINE_LIMIT', `Line limit reached: ${config.maxLines}`, { maxLines: config.maxLines })
|
|
@@ -303,6 +449,7 @@ export async function apply(ctx, rawConfig) {
|
|
|
303
449
|
? await resolveWorkspace(args.workspace)
|
|
304
450
|
: await managerWorkspace(baseCwd)
|
|
305
451
|
const role = args.role === undefined || args.role === null ? null : String(args.role).trim() || null
|
|
452
|
+
const title = args.title === undefined || args.title === null ? (role || label) : String(args.title).trim().slice(0, 120)
|
|
306
453
|
const sessionId = `session-${randomUUID()}`
|
|
307
454
|
const created = await ctx.sessionController.create({
|
|
308
455
|
sessionId,
|
|
@@ -311,7 +458,7 @@ export async function apply(ctx, rawConfig) {
|
|
|
311
458
|
})
|
|
312
459
|
const creator = lineDefs.get(exec.agent.session.id)
|
|
313
460
|
const actualSessionId = created.sessionId
|
|
314
|
-
const def = { agentId: config.agentId, label, sessionId: actualSessionId, lineId: lineId(config.agentId, label), role, createdBy: creator?.lineId ?? null }
|
|
461
|
+
const def = { agentId: config.agentId, label, sessionId: actualSessionId, lineId: lineId(config.agentId, label), role, title, createdBy: creator?.lineId ?? null, lifecycle: 'active', generation: 1 }
|
|
315
462
|
try {
|
|
316
463
|
store.acquire({
|
|
317
464
|
agentId: config.agentId,
|
|
@@ -329,13 +476,11 @@ export async function apply(ctx, rawConfig) {
|
|
|
329
476
|
ctx.logger?.warn?.('agent-lines: created Session %s but failed to register line %s', actualSessionId, label)
|
|
330
477
|
throw error
|
|
331
478
|
}
|
|
479
|
+
try { store.setTitle({ agentId: config.agentId, line: label, title }) } catch { /* title is best-effort after acquire */ }
|
|
332
480
|
lineDefs.set(actualSessionId, def)
|
|
333
481
|
startLoop(def)
|
|
334
482
|
const agent = ctx.agents.get(actualSessionId)
|
|
335
483
|
if (agent !== undefined) bindAgent(agent)
|
|
336
|
-
try {
|
|
337
|
-
await ctx.sessionController.rename({ sessionId: actualSessionId, title: `line: ${label}` })
|
|
338
|
-
} catch { /* a blank session may not materialize on rename; bootstrap/first delivery will */ }
|
|
339
484
|
let bootstrapQueued = false
|
|
340
485
|
if (args.bootstrap !== false && config.bootstrapOnCreate !== false && creator !== undefined) {
|
|
341
486
|
try {
|
|
@@ -357,6 +502,8 @@ export async function apply(ctx, rawConfig) {
|
|
|
357
502
|
line: label,
|
|
358
503
|
sessionId: actualSessionId,
|
|
359
504
|
role,
|
|
505
|
+
title,
|
|
506
|
+
lifecycle: 'active',
|
|
360
507
|
cwd: targetWorkspace?.path ?? cwd,
|
|
361
508
|
workspaceId: targetWorkspace?.id ?? null,
|
|
362
509
|
created: true,
|
|
@@ -384,6 +531,11 @@ export async function apply(ctx, rawConfig) {
|
|
|
384
531
|
ctx.logger?.info?.('agent-lines: manager %s is unbound; waiting for claim', def.label)
|
|
385
532
|
continue
|
|
386
533
|
}
|
|
534
|
+
const stored = store.getLineRow(config.agentId, def.label)
|
|
535
|
+
if (stored !== undefined && stored.lifecycle !== 'active') {
|
|
536
|
+
ctx.logger?.info?.('agent-lines: line %s is %s; skipping delivery loop', def.label, stored.lifecycle)
|
|
537
|
+
continue
|
|
538
|
+
}
|
|
387
539
|
if (!(await sessionExists(def.sessionId))) {
|
|
388
540
|
ctx.logger?.warn?.('agent-lines: Session %s for line %s is missing; line stays unbound until claimed', def.sessionId, def.label)
|
|
389
541
|
lineDefs.set(def.sessionId, { ...def, missing: true })
|
|
@@ -397,8 +549,9 @@ export async function apply(ctx, rawConfig) {
|
|
|
397
549
|
ttlMs: config.leaseTtlMs,
|
|
398
550
|
role: def.role,
|
|
399
551
|
})
|
|
400
|
-
|
|
401
|
-
|
|
552
|
+
const effective = { ...def, title: lineTitle(def, stored), lifecycle: 'active', generation: Number(stored?.generation ?? 1) }
|
|
553
|
+
lineDefs.set(def.sessionId, effective)
|
|
554
|
+
startLoop(effective)
|
|
402
555
|
}
|
|
403
556
|
cleanupFns.push(ctx.on('agent/created', ({ agent }) => { bindAgent(agent) }))
|
|
404
557
|
cleanupFns.push(ctx.on('agent/disposed', ({ agent }) => { unbindAgent(agent) }))
|
|
@@ -406,6 +559,7 @@ export async function apply(ctx, rawConfig) {
|
|
|
406
559
|
const managerLineId = lineId(config.agentId, config.createFrom)
|
|
407
560
|
for (const row of store.listLines()) {
|
|
408
561
|
if (row.created_by !== managerLineId || lineDefs.has(row.session_id)) continue
|
|
562
|
+
if (row.lifecycle !== 'active') continue
|
|
409
563
|
if (!(await sessionExists(row.session_id))) {
|
|
410
564
|
ctx.logger?.warn?.('agent-lines: dynamic line %s has no persisted Session; skipped restore', row.label)
|
|
411
565
|
continue
|
|
@@ -420,7 +574,7 @@ export async function apply(ctx, rawConfig) {
|
|
|
420
574
|
role: row.role,
|
|
421
575
|
createdBy: row.created_by,
|
|
422
576
|
})
|
|
423
|
-
const def = { agentId: config.agentId, label: row.label, sessionId: row.session_id, lineId: row.line_id, role: row.role, createdBy: row.created_by }
|
|
577
|
+
const def = { agentId: config.agentId, label: row.label, sessionId: row.session_id, lineId: row.line_id, role: row.role, title: lineTitle({ role: row.role, label: row.label }, row), createdBy: row.created_by, lifecycle: 'active', generation: Number(row.generation ?? 1) }
|
|
424
578
|
lineDefs.set(row.session_id, def)
|
|
425
579
|
startLoop(def)
|
|
426
580
|
} catch (error) {
|
|
@@ -469,4 +623,4 @@ export async function apply(ctx, rawConfig) {
|
|
|
469
623
|
store.close()
|
|
470
624
|
throw error
|
|
471
625
|
}
|
|
472
|
-
}
|
|
626
|
+
}
|
package/lib/store.js
CHANGED
|
@@ -33,10 +33,15 @@ CREATE TABLE IF NOT EXISTS lines (
|
|
|
33
33
|
agent_id TEXT NOT NULL,
|
|
34
34
|
label TEXT NOT NULL,
|
|
35
35
|
role TEXT,
|
|
36
|
+
title TEXT,
|
|
36
37
|
created_by TEXT,
|
|
37
38
|
session_id TEXT NOT NULL,
|
|
38
39
|
instance_id TEXT,
|
|
39
40
|
status TEXT NOT NULL DEFAULT 'offline',
|
|
41
|
+
lifecycle TEXT NOT NULL DEFAULT 'active',
|
|
42
|
+
generation INTEGER NOT NULL DEFAULT 1,
|
|
43
|
+
rebind_at INTEGER,
|
|
44
|
+
rebind_from TEXT,
|
|
40
45
|
last_seen INTEGER NOT NULL DEFAULT 0,
|
|
41
46
|
created_at INTEGER NOT NULL,
|
|
42
47
|
UNIQUE(agent_id, label)
|
|
@@ -97,7 +102,20 @@ CREATE TABLE IF NOT EXISTS manager_bindings (
|
|
|
97
102
|
updated_at INTEGER NOT NULL
|
|
98
103
|
);
|
|
99
104
|
|
|
100
|
-
|
|
105
|
+
CREATE TABLE IF NOT EXISTS line_events (
|
|
106
|
+
id TEXT PRIMARY KEY,
|
|
107
|
+
line_id TEXT NOT NULL,
|
|
108
|
+
action TEXT NOT NULL,
|
|
109
|
+
old_session_id TEXT,
|
|
110
|
+
new_session_id TEXT,
|
|
111
|
+
actor TEXT,
|
|
112
|
+
reason TEXT,
|
|
113
|
+
detail TEXT,
|
|
114
|
+
created_at INTEGER NOT NULL
|
|
115
|
+
);
|
|
116
|
+
CREATE INDEX IF NOT EXISTS line_events_line ON line_events(line_id, created_at);
|
|
117
|
+
|
|
118
|
+
PRAGMA user_version = 7;
|
|
101
119
|
`
|
|
102
120
|
|
|
103
121
|
export function defaultDbPath() {
|
|
@@ -140,12 +158,19 @@ export class LineStore {
|
|
|
140
158
|
this.db.exec(SCHEMA)
|
|
141
159
|
const columns = this.db.prepare('PRAGMA table_info(lines)').all().map(column => column.name)
|
|
142
160
|
if (!columns.includes('role')) this.db.exec('ALTER TABLE lines ADD COLUMN role TEXT')
|
|
161
|
+
if (!columns.includes('title')) this.db.exec('ALTER TABLE lines ADD COLUMN title TEXT')
|
|
143
162
|
if (!columns.includes('created_by')) this.db.exec('ALTER TABLE lines ADD COLUMN created_by TEXT')
|
|
163
|
+
if (!columns.includes('lifecycle')) this.db.exec("ALTER TABLE lines ADD COLUMN lifecycle TEXT NOT NULL DEFAULT 'active'")
|
|
164
|
+
if (!columns.includes('generation')) this.db.exec('ALTER TABLE lines ADD COLUMN generation INTEGER NOT NULL DEFAULT 1')
|
|
165
|
+
if (!columns.includes('rebind_at')) this.db.exec('ALTER TABLE lines ADD COLUMN rebind_at INTEGER')
|
|
166
|
+
if (!columns.includes('rebind_from')) this.db.exec('ALTER TABLE lines ADD COLUMN rebind_from TEXT')
|
|
144
167
|
const messageColumns = this.db.prepare('PRAGMA table_info(messages)').all().map(column => column.name)
|
|
145
168
|
if (!messageColumns.includes('root_message_id')) this.db.exec('ALTER TABLE messages ADD COLUMN root_message_id TEXT')
|
|
146
169
|
if (!messageColumns.includes('hop')) this.db.exec('ALTER TABLE messages ADD COLUMN hop INTEGER NOT NULL DEFAULT 0')
|
|
147
170
|
if (!messageColumns.includes('no_reply')) this.db.exec('ALTER TABLE messages ADD COLUMN no_reply INTEGER NOT NULL DEFAULT 0')
|
|
148
|
-
this.db.exec('
|
|
171
|
+
this.db.exec('CREATE TABLE IF NOT EXISTS line_events (id TEXT PRIMARY KEY, line_id TEXT NOT NULL, action TEXT NOT NULL, old_session_id TEXT, new_session_id TEXT, actor TEXT, reason TEXT, detail TEXT, created_at INTEGER NOT NULL)')
|
|
172
|
+
this.db.exec('CREATE INDEX IF NOT EXISTS line_events_line ON line_events(line_id, created_at)')
|
|
173
|
+
this.db.exec('PRAGMA user_version = 7')
|
|
149
174
|
this.prepared = new Map()
|
|
150
175
|
this.closed = false
|
|
151
176
|
this.fresh = fresh
|
|
@@ -244,6 +269,8 @@ export class LineStore {
|
|
|
244
269
|
const from = this.#stmt('SELECT * FROM lines WHERE agent_id = ? AND label = ?').get(agentId, fromLine)
|
|
245
270
|
if (from === undefined) throw new LineError('LINE_NOT_FOUND', `Sender line is not registered: ${agentId}#${fromLine}`)
|
|
246
271
|
const target = this.resolveTarget(agentId, to)
|
|
272
|
+
if (target.row.lifecycle === 'retired') throw new LineError('LINE_RETIRED', `Line ${target.lineId} is retired`, { line: target.lineId })
|
|
273
|
+
if (target.row.lifecycle === 'rebinding') throw new LineError('LINE_REBINDING', `Line ${target.lineId} is rebinding`, { line: target.lineId })
|
|
247
274
|
const body = assertMessageSize(text, maxMessageBytes)
|
|
248
275
|
let parent
|
|
249
276
|
if (replyTo !== undefined && replyTo !== null && String(replyTo).trim() !== '') {
|
|
@@ -413,6 +440,111 @@ export class LineStore {
|
|
|
413
440
|
}
|
|
414
441
|
}
|
|
415
442
|
|
|
443
|
+
/** Update the display title of a line. Persisted so restarts keep it. */
|
|
444
|
+
setTitle({ agentId, line, title, actor = null, now = Date.now() }) {
|
|
445
|
+
const id = lineId(agentId, line)
|
|
446
|
+
return this.#tx(() => {
|
|
447
|
+
const row = this.#stmt('SELECT * FROM lines WHERE line_id = ?').get(id)
|
|
448
|
+
if (row === undefined) throw new LineError('LINE_NOT_FOUND', `No such line: ${id}`, { line: id })
|
|
449
|
+
const value = title === null || title === undefined ? null : String(title).trim().slice(0, 120) || null
|
|
450
|
+
this.#stmt('UPDATE lines SET title = ? WHERE line_id = ?').run(value, id)
|
|
451
|
+
this.#event({ lineId: id, action: 'title', actor, detail: { title: value }, now })
|
|
452
|
+
return { ...this.#stmt('SELECT * FROM lines WHERE line_id = ?').get(id) }
|
|
453
|
+
})
|
|
454
|
+
}
|
|
455
|
+
|
|
456
|
+
/** Set lifecycle without a Session rebind (used to lock a rebind in progress). */
|
|
457
|
+
setLifecycle({ agentId, line, lifecycle, actor = null, reason = null, now = Date.now() }) {
|
|
458
|
+
const id = lineId(agentId, line)
|
|
459
|
+
if (!['active', 'retired', 'rebinding'].includes(String(lifecycle))) {
|
|
460
|
+
throw new LineError('LINE_INVALID_LIFECYCLE', `Invalid lifecycle: ${lifecycle}`)
|
|
461
|
+
}
|
|
462
|
+
return this.#tx(() => {
|
|
463
|
+
const row = this.#stmt('SELECT * FROM lines WHERE line_id = ?').get(id)
|
|
464
|
+
if (row === undefined) throw new LineError('LINE_NOT_FOUND', `No such line: ${id}`, { line: id })
|
|
465
|
+
this.#stmt("UPDATE lines SET lifecycle = ?, status = CASE WHEN ? = 'active' THEN status ELSE 'offline' END WHERE line_id = ?")
|
|
466
|
+
.run(String(lifecycle), String(lifecycle), id)
|
|
467
|
+
this.#event({ lineId: id, action: lifecycle, actor, reason, now })
|
|
468
|
+
return { ...this.#stmt('SELECT * FROM lines WHERE line_id = ?').get(id) }
|
|
469
|
+
})
|
|
470
|
+
}
|
|
471
|
+
|
|
472
|
+
/** Queue/claimed/delivered counts for one line. */
|
|
473
|
+
messageCounts({ agentId, line }) {
|
|
474
|
+
const rows = this.#stmt(`SELECT state, COUNT(*) AS n FROM messages
|
|
475
|
+
WHERE to_agent = ? AND to_line = ? GROUP BY state`).all(agentId, line)
|
|
476
|
+
const out = { queued: 0, claimed: 0, delivered: 0, acked: 0, failed: 0, expired: 0, dead: 0 }
|
|
477
|
+
for (const row of rows) out[row.state] = Number(row.n)
|
|
478
|
+
return out
|
|
479
|
+
}
|
|
480
|
+
|
|
481
|
+
/** Retire a line: no new sends, keep Session/queue/history. */
|
|
482
|
+
retire({ agentId, line, actor = null, reason = null, now = Date.now() }) {
|
|
483
|
+
const id = lineId(agentId, line)
|
|
484
|
+
return this.#tx(() => {
|
|
485
|
+
const row = this.#stmt('SELECT * FROM lines WHERE line_id = ?').get(id)
|
|
486
|
+
if (row === undefined) throw new LineError('LINE_NOT_FOUND', `No such line: ${id}`, { line: id })
|
|
487
|
+
if (row.lifecycle !== 'retired') {
|
|
488
|
+
this.#stmt("UPDATE lines SET lifecycle = 'retired', status = 'offline' WHERE line_id = ?").run(id)
|
|
489
|
+
this.#event({ lineId: id, action: 'retire', actor, reason, detail: this.messageCounts({ agentId, line }), now })
|
|
490
|
+
}
|
|
491
|
+
return { ...this.#stmt('SELECT * FROM lines WHERE line_id = ?').get(id), counts: this.messageCounts({ agentId, line }) }
|
|
492
|
+
})
|
|
493
|
+
}
|
|
494
|
+
|
|
495
|
+
/**
|
|
496
|
+
* Atomically switch a line to a new Session.
|
|
497
|
+
* migrate=queued: requeue claimed messages; queued/claimed will be delivered by the new loop.
|
|
498
|
+
* migrate=none: fail-closed if queued+claimed > 0 (manager must drain first).
|
|
499
|
+
* delivered/acked/failed/expired are never re-delivered.
|
|
500
|
+
*/
|
|
501
|
+
rebind({ agentId, line, sessionId, actor = null, reason = null, migrate = 'queued', locked = false, now = Date.now() }) {
|
|
502
|
+
const id = lineId(agentId, line)
|
|
503
|
+
if (!['queued', 'none'].includes(String(migrate))) {
|
|
504
|
+
throw new LineError('LINE_INVALID_ARGUMENT', `migrate must be queued or none: ${migrate}`)
|
|
505
|
+
}
|
|
506
|
+
return this.#tx(() => {
|
|
507
|
+
const row = this.#stmt('SELECT * FROM lines WHERE line_id = ?').get(id)
|
|
508
|
+
if (row === undefined) throw new LineError('LINE_NOT_FOUND', `No such line: ${id}`, { line: id })
|
|
509
|
+
if (row.lifecycle === 'rebinding' && locked !== true) throw new LineError('LINE_REBIND_BUSY', `Line ${id} is already rebinding`, { line: id })
|
|
510
|
+
const counts = this.messageCounts({ agentId, line })
|
|
511
|
+
if (String(migrate) === 'none' && counts.queued + counts.claimed > 0) {
|
|
512
|
+
throw new LineError('LINE_BACKLOG_NOT_EMPTY', `Line ${id} has ${counts.queued + counts.claimed} queued/claimed messages; drain or use migrate=queued`, { line: id, counts })
|
|
513
|
+
}
|
|
514
|
+
if (String(migrate) === 'queued') {
|
|
515
|
+
this.#stmt(`UPDATE messages SET state = 'queued', claimed_by = NULL, claimed_at = NULL, next_attempt_at = ?
|
|
516
|
+
WHERE to_agent = ? AND to_line = ? AND state = 'claimed'`).run(now, agentId, line)
|
|
517
|
+
}
|
|
518
|
+
this.#stmt('DELETE FROM leases WHERE line_id = ?').run(id)
|
|
519
|
+
const generation = Number(row.generation ?? 1) + 1
|
|
520
|
+
this.#stmt(`UPDATE lines SET session_id = ?, lifecycle = 'active', generation = ?, rebind_at = ?, rebind_from = ?,
|
|
521
|
+
instance_id = NULL, status = 'offline', last_seen = ? WHERE line_id = ?`)
|
|
522
|
+
.run(String(sessionId), generation, now, row.session_id, now, id)
|
|
523
|
+
const detail = { migrate: String(migrate), before: counts, after: this.messageCounts({ agentId, line }), generation }
|
|
524
|
+
this.#event({ lineId: id, action: 'rebind', oldSessionId: row.session_id, newSessionId: String(sessionId), actor, reason, detail, now })
|
|
525
|
+
return { ...this.#stmt('SELECT * FROM lines WHERE line_id = ?').get(id), oldSessionId: row.session_id, counts: detail.after }
|
|
526
|
+
})
|
|
527
|
+
}
|
|
528
|
+
|
|
529
|
+
/** Last rebind event for a line (used to show oldSessionId without overwriting the row). */
|
|
530
|
+
lastLineEvent({ agentId, line, action = 'rebind' }) {
|
|
531
|
+
const id = lineId(agentId, line)
|
|
532
|
+
return this.#stmt('SELECT * FROM line_events WHERE line_id = ? AND action = ? ORDER BY created_at DESC LIMIT 1').get(id, action)
|
|
533
|
+
}
|
|
534
|
+
|
|
535
|
+
/** Recent lifecycle events for diagnostics. */
|
|
536
|
+
lineEvents({ agentId, line, limit = 20 }) {
|
|
537
|
+
const id = lineId(agentId, line)
|
|
538
|
+
return this.#stmt('SELECT * FROM line_events WHERE line_id = ? ORDER BY created_at DESC LIMIT ?').all(id, limit)
|
|
539
|
+
}
|
|
540
|
+
|
|
541
|
+
#event({ lineId: target, action, oldSessionId = null, newSessionId = null, actor = null, reason = null, detail = null, now = Date.now() }) {
|
|
542
|
+
const id = 'lineev_' + randomUUID().replaceAll('-', '')
|
|
543
|
+
this.#stmt(`INSERT INTO line_events(id, line_id, action, old_session_id, new_session_id, actor, reason, detail, created_at)
|
|
544
|
+
VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(id, target, action, oldSessionId, newSessionId, actor, reason, detail === null ? null : JSON.stringify(detail), now)
|
|
545
|
+
return id
|
|
546
|
+
}
|
|
547
|
+
|
|
416
548
|
counts(now = Date.now()) {
|
|
417
549
|
const states = this.#stmt('SELECT state, COUNT(*) AS n FROM messages GROUP BY state ORDER BY state').all()
|
|
418
550
|
const leases = this.#stmt('SELECT COUNT(*) AS n FROM leases WHERE expires_at > ?').get(now)
|
|
@@ -421,4 +553,4 @@ export class LineStore {
|
|
|
421
553
|
}
|
|
422
554
|
}
|
|
423
555
|
|
|
424
|
-
export { expandHome }
|
|
556
|
+
export { expandHome }
|
package/lib/tools.js
CHANGED
|
@@ -51,6 +51,7 @@ function materializationOf(ctx, sessionId) {
|
|
|
51
51
|
function currentView(def) {
|
|
52
52
|
return def === undefined ? null : {
|
|
53
53
|
agentId: def.agentId, line: def.label, sessionId: def.sessionId, lineId: def.lineId, role: def.role,
|
|
54
|
+
title: def.title ?? def.role ?? def.label, lifecycle: def.lifecycle ?? 'active', generation: def.generation ?? 1,
|
|
54
55
|
}
|
|
55
56
|
}
|
|
56
57
|
|
|
@@ -94,6 +95,9 @@ export function registerStatusTool(ctx, { config, store, lineDefs }) {
|
|
|
94
95
|
const lines = store.listLines().map(line => ({
|
|
95
96
|
label: line.label,
|
|
96
97
|
role: line.role,
|
|
98
|
+
title: line.title ?? line.role ?? line.label,
|
|
99
|
+
lifecycle: line.lifecycle ?? 'active',
|
|
100
|
+
generation: line.generation ?? 1,
|
|
97
101
|
sessionId: line.session_id,
|
|
98
102
|
createdBy: line.created_by,
|
|
99
103
|
lease: line.lease,
|
|
@@ -107,6 +111,8 @@ export function registerStatusTool(ctx, { config, store, lineDefs }) {
|
|
|
107
111
|
bound: currentDef !== undefined,
|
|
108
112
|
line: currentDef?.label ?? null,
|
|
109
113
|
role: currentDef?.role ?? null,
|
|
114
|
+
title: currentDef?.title ?? currentDef?.role ?? null,
|
|
115
|
+
lifecycle: currentDef?.lifecycle ?? null,
|
|
110
116
|
}
|
|
111
117
|
const repair = current === null
|
|
112
118
|
? 'No calling Session; line_status is informational.'
|
|
@@ -157,7 +163,7 @@ export function registerClaimTool(ctx, { config, lineDefs, rebindManager }) {
|
|
|
157
163
|
}
|
|
158
164
|
|
|
159
165
|
/** Register the model tools; returns their disposers. */
|
|
160
|
-
export function registerToolsForAgent(agent, def, { config, store, lineDefs, createLine, moveLineWorkspace }) {
|
|
166
|
+
export function registerToolsForAgent(agent, def, { config, store, lineDefs, createLine, moveLineWorkspace, retireLine, rebindLine, renameLine }) {
|
|
161
167
|
const disposers = []
|
|
162
168
|
|
|
163
169
|
disposers.push(agent.ctx.tools.register({
|
|
@@ -195,6 +201,7 @@ export function registerToolsForAgent(agent, def, { config, store, lineDefs, cre
|
|
|
195
201
|
output: OUTPUT,
|
|
196
202
|
execute: async (args, exec) => {
|
|
197
203
|
const def = currentLine(exec, lineDefs)
|
|
204
|
+
if (def.lifecycle === 'retired') throw new LineError('LINE_RETIRED', `Line ${def.label} is retired; it cannot send new messages`, { line: def.label })
|
|
198
205
|
const text = assertMessageSize(args.text, config.maxMessageBytes)
|
|
199
206
|
const target = parseTarget(args.to, def.agentId)
|
|
200
207
|
if (target.lineId === def.lineId && config.allowSelfSend !== true) {
|
|
@@ -291,6 +298,11 @@ export function registerToolsForAgent(agent, def, { config, store, lineDefs, cre
|
|
|
291
298
|
properties: {
|
|
292
299
|
label: { type: 'string', description: 'Stable line label, e.g. "frontend-line"' },
|
|
293
300
|
role: { type: 'string', description: 'Short role or responsibility description for the new line' },
|
|
301
|
+
title: { type: 'string', description: 'Sidebar title; defaults to role or label' },
|
|
302
|
+
replace: { type: 'boolean', description: 'Replace an existing line with a fresh Session; old Session is retired (manager only)' },
|
|
303
|
+
force: { type: 'boolean', description: 'Allow replacing an active line; use with reason' },
|
|
304
|
+
migrate: { type: 'string', enum: ['queued', 'none'], description: 'Backlog policy on replace; none fails if queued/claimed exists' },
|
|
305
|
+
reason: { type: 'string', description: 'Reason for replace; shown in line_events' },
|
|
294
306
|
agentPreset: { type: 'string', description: 'DSH agent preset; defaults to the plugin childPreset' },
|
|
295
307
|
workspace: { type: 'string', description: 'Target workspace path or id; defaults to the manager workspace. Existing workspace only.' },
|
|
296
308
|
cwd: { type: 'string', description: 'Working directory when no workspace is named; defaults to the manager Session cwd' },
|
|
@@ -310,6 +322,67 @@ export function registerToolsForAgent(agent, def, { config, store, lineDefs, cre
|
|
|
310
322
|
},
|
|
311
323
|
}))
|
|
312
324
|
|
|
325
|
+
disposers.push(agent.ctx.tools.register({
|
|
326
|
+
name: 'line_retire',
|
|
327
|
+
description: 'Retire an existing line: new line_send is rejected, the Session and message history are kept, and the delivery loop stops. Only the configured manager line may call this. Use line_create replace:true to hand the same role to a fresh Session.',
|
|
328
|
+
parameters: {
|
|
329
|
+
type: 'object', additionalProperties: false,
|
|
330
|
+
properties: {
|
|
331
|
+
line: { type: 'string', description: 'Existing line label' },
|
|
332
|
+
reason: { type: 'string', description: 'Why this line is being retired' },
|
|
333
|
+
},
|
|
334
|
+
required: ['line'],
|
|
335
|
+
},
|
|
336
|
+
output: OUTPUT,
|
|
337
|
+
execute: async (args, exec) => {
|
|
338
|
+
const caller = currentLine(exec, lineDefs)
|
|
339
|
+
if (caller.label !== config.createFrom) throw new LineError('LINE_CREATE_FORBIDDEN', `Only ${config.createFrom} may retire lines`, { caller: caller.label })
|
|
340
|
+
return retireLine({ label: String(args.line), actor: caller.label, reason: args.reason ?? null })
|
|
341
|
+
},
|
|
342
|
+
}))
|
|
343
|
+
|
|
344
|
+
disposers.push(agent.ctx.tools.register({
|
|
345
|
+
name: 'line_rebind',
|
|
346
|
+
description: 'Atomically switch an existing line to a new live Session, migrating queued/claimed messages. The old Session is kept, never deleted. Only the configured manager line may call this; use line_create replace:true to create a fresh Session in one step.',
|
|
347
|
+
parameters: {
|
|
348
|
+
type: 'object', additionalProperties: false,
|
|
349
|
+
properties: {
|
|
350
|
+
line: { type: 'string', description: 'Existing line label' },
|
|
351
|
+
sessionId: { type: 'string', description: 'Live root Session id to bind' },
|
|
352
|
+
migrate: { type: 'string', enum: ['queued', 'none'], description: 'queued migrates queued/claimed; none fails if backlog is non-empty' },
|
|
353
|
+
reason: { type: 'string', description: 'Why this line is being rebound' },
|
|
354
|
+
force: { type: 'boolean', description: 'Accepted for API compatibility; active replacement is gated by line_create replace' },
|
|
355
|
+
},
|
|
356
|
+
required: ['line', 'sessionId'],
|
|
357
|
+
},
|
|
358
|
+
output: OUTPUT,
|
|
359
|
+
execute: async (args, exec) => {
|
|
360
|
+
const caller = currentLine(exec, lineDefs)
|
|
361
|
+
if (caller.label !== config.createFrom) throw new LineError('LINE_CREATE_FORBIDDEN', `Only ${config.createFrom} may rebind lines`, { caller: caller.label })
|
|
362
|
+
return rebindLine({ label: String(args.line), sessionId: String(args.sessionId), actor: caller.label, reason: args.reason ?? null, migrate: args.migrate === 'none' ? 'none' : 'queued', force: args.force === true })
|
|
363
|
+
},
|
|
364
|
+
}))
|
|
365
|
+
|
|
366
|
+
disposers.push(agent.ctx.tools.register({
|
|
367
|
+
name: 'line_rename',
|
|
368
|
+
description: 'Rename a line display title in the sidebar. The title is persisted in lines.db and survives restarts. Only the configured manager line may call this.',
|
|
369
|
+
parameters: {
|
|
370
|
+
type: 'object', additionalProperties: false,
|
|
371
|
+
properties: {
|
|
372
|
+
line: { type: 'string', description: 'Existing line label' },
|
|
373
|
+
title: { type: 'string', description: 'New title, 1-120 chars' },
|
|
374
|
+
},
|
|
375
|
+
required: ['line', 'title'],
|
|
376
|
+
},
|
|
377
|
+
output: OUTPUT,
|
|
378
|
+
execute: async (args, exec) => {
|
|
379
|
+
const caller = currentLine(exec, lineDefs)
|
|
380
|
+
if (caller.label !== config.createFrom) throw new LineError('LINE_CREATE_FORBIDDEN', `Only ${config.createFrom} may rename lines`, { caller: caller.label })
|
|
381
|
+
if (String(args.title ?? '').trim() === '') throw new LineError('LINE_INVALID_ARGUMENT', 'title must not be empty')
|
|
382
|
+
return renameLine({ label: String(args.line), title: String(args.title), actor: caller.label })
|
|
383
|
+
},
|
|
384
|
+
}))
|
|
385
|
+
|
|
313
386
|
disposers.push(agent.ctx.tools.register({
|
|
314
387
|
name: 'line_move_workspace',
|
|
315
388
|
description: 'Move an existing line Session into a target workspace record so it appears under that workspace in the sidebar. DSH only allows attachment when the Session cwd exactly matches the workspace path; it cannot move a Session to a different directory (use a new line for that).',
|
|
@@ -334,4 +407,4 @@ export function registerToolsForAgent(agent, def, { config, store, lineDefs, cre
|
|
|
334
407
|
}
|
|
335
408
|
|
|
336
409
|
return disposers
|
|
337
|
-
}
|
|
410
|
+
}
|