neoctl 0.2.35 → 0.2.37

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.
Files changed (180) hide show
  1. package/dist/agents/agent-report-security.test.d.ts +1 -0
  2. package/dist/agents/agent-report-security.test.js +301 -0
  3. package/dist/agents/agent-report-security.test.js.map +1 -0
  4. package/dist/agents/agent-tool-persistence.test.d.ts +1 -0
  5. package/dist/agents/agent-tool-persistence.test.js +319 -0
  6. package/dist/agents/agent-tool-persistence.test.js.map +1 -0
  7. package/dist/agents/agent-tool.d.ts +3 -0
  8. package/dist/agents/agent-tool.js +246 -76
  9. package/dist/agents/agent-tool.js.map +1 -1
  10. package/dist/agents/live-preview-redaction-security.test.d.ts +1 -0
  11. package/dist/agents/live-preview-redaction-security.test.js +286 -0
  12. package/dist/agents/live-preview-redaction-security.test.js.map +1 -0
  13. package/dist/agents/local-agent-task.d.ts +68 -1
  14. package/dist/agents/local-agent-task.js +78 -5
  15. package/dist/agents/local-agent-task.js.map +1 -1
  16. package/dist/agents/no-nested-delegation.test.d.ts +1 -0
  17. package/dist/agents/no-nested-delegation.test.js +38 -0
  18. package/dist/agents/no-nested-delegation.test.js.map +1 -0
  19. package/dist/agents/obs07-11-run-facts.test.d.ts +1 -0
  20. package/dist/agents/obs07-11-run-facts.test.js +459 -0
  21. package/dist/agents/obs07-11-run-facts.test.js.map +1 -0
  22. package/dist/agents/smoke-agent-lifecycle.d.ts +1 -0
  23. package/dist/agents/smoke-agent-lifecycle.js +192 -0
  24. package/dist/agents/smoke-agent-lifecycle.js.map +1 -0
  25. package/dist/agents/smoke-agents.js +7 -3
  26. package/dist/agents/smoke-agents.js.map +1 -1
  27. package/dist/context/context-manager.d.ts +1 -0
  28. package/dist/context/context-manager.js +10 -6
  29. package/dist/context/context-manager.js.map +1 -1
  30. package/dist/context/smoke-context.js +46 -3
  31. package/dist/context/smoke-context.js.map +1 -1
  32. package/dist/core/image-registry.js +1 -1
  33. package/dist/core/image-registry.js.map +1 -1
  34. package/dist/core/obs04-visible-data.test.d.ts +1 -0
  35. package/dist/core/obs04-visible-data.test.js +147 -0
  36. package/dist/core/obs04-visible-data.test.js.map +1 -0
  37. package/dist/core/query-engine.d.ts +5 -0
  38. package/dist/core/query-engine.js +36 -3
  39. package/dist/core/query-engine.js.map +1 -1
  40. package/dist/core/query.d.ts +5 -1
  41. package/dist/core/query.js +120 -18
  42. package/dist/core/query.js.map +1 -1
  43. package/dist/core/run-agent-pause.test.d.ts +1 -0
  44. package/dist/core/run-agent-pause.test.js +52 -0
  45. package/dist/core/run-agent-pause.test.js.map +1 -0
  46. package/dist/core/run-agent-persistence.test.d.ts +1 -0
  47. package/dist/core/run-agent-persistence.test.js +222 -0
  48. package/dist/core/run-agent-persistence.test.js.map +1 -0
  49. package/dist/core/run-agent.d.ts +13 -0
  50. package/dist/core/run-agent.js +72 -17
  51. package/dist/core/run-agent.js.map +1 -1
  52. package/dist/core/smoke-core-loop.js +8 -7
  53. package/dist/core/smoke-core-loop.js.map +1 -1
  54. package/dist/model/model-gateway.d.ts +1 -0
  55. package/dist/model/openai-native-image-guard.test.d.ts +1 -0
  56. package/dist/model/openai-native-image-guard.test.js +101 -0
  57. package/dist/model/openai-native-image-guard.test.js.map +1 -0
  58. package/dist/model/openai-responses-mapper.js +91 -16
  59. package/dist/model/openai-responses-mapper.js.map +1 -1
  60. package/dist/plugins/smoke-plugin-system.js +14 -14
  61. package/dist/repl/index.js +22 -28
  62. package/dist/repl/index.js.map +1 -1
  63. package/dist/secrets/secret-redaction.d.ts +6 -5
  64. package/dist/secrets/secret-redaction.js +7 -79
  65. package/dist/secrets/secret-redaction.js.map +1 -1
  66. package/dist/secrets/secret-types.d.ts +4 -1
  67. package/dist/secrets/secret-types.js.map +1 -1
  68. package/dist/session/session-store-safety.test.d.ts +1 -0
  69. package/dist/session/session-store-safety.test.js +107 -0
  70. package/dist/session/session-store-safety.test.js.map +1 -0
  71. package/dist/session/session-store.d.ts +5 -1
  72. package/dist/session/session-store.js +69 -7
  73. package/dist/session/session-store.js.map +1 -1
  74. package/dist/session/tool-result-memory.d.ts +3 -1
  75. package/dist/session/tool-result-memory.js.map +1 -1
  76. package/dist/tasks/subagent-tools.d.ts +4 -1
  77. package/dist/tasks/subagent-tools.js +85 -24
  78. package/dist/tasks/subagent-tools.js.map +1 -1
  79. package/dist/tasks/subagent-tools.test.d.ts +1 -0
  80. package/dist/tasks/subagent-tools.test.js +159 -0
  81. package/dist/tasks/subagent-tools.test.js.map +1 -0
  82. package/dist/tasks/task-ack-size.test.d.ts +1 -0
  83. package/dist/tasks/task-ack-size.test.js +101 -0
  84. package/dist/tasks/task-ack-size.test.js.map +1 -0
  85. package/dist/tasks/task-persistence.d.ts +23 -0
  86. package/dist/tasks/task-persistence.js +216 -0
  87. package/dist/tasks/task-persistence.js.map +1 -0
  88. package/dist/tasks/task-persistence.test.d.ts +1 -0
  89. package/dist/tasks/task-persistence.test.js +331 -0
  90. package/dist/tasks/task-persistence.test.js.map +1 -0
  91. package/dist/tasks/task-store.d.ts +51 -7
  92. package/dist/tasks/task-store.js +333 -31
  93. package/dist/tasks/task-store.js.map +1 -1
  94. package/dist/tools/builtins/exec-process-manager.d.ts +97 -2
  95. package/dist/tools/builtins/exec-process-manager.js +218 -19
  96. package/dist/tools/builtins/exec-process-manager.js.map +1 -1
  97. package/dist/tools/builtins/exec-tool.js +14 -1
  98. package/dist/tools/builtins/exec-tool.js.map +1 -1
  99. package/dist/tools/builtins/image-generation-tool.js +24 -24
  100. package/dist/tools/builtins/image-generation-tool.js.map +1 -1
  101. package/dist/tools/smoke-exec-process.js +2 -1
  102. package/dist/tools/smoke-exec-process.js.map +1 -1
  103. package/dist/tools/smoke-terminal-output-chain.d.ts +1 -0
  104. package/dist/tools/smoke-terminal-output-chain.js +245 -0
  105. package/dist/tools/smoke-terminal-output-chain.js.map +1 -0
  106. package/dist/tools/smoke-tool-system.js +6 -6
  107. package/dist/tools/smoke-tool-system.js.map +1 -1
  108. package/dist/tools/terminal-output-persistence.test.d.ts +1 -0
  109. package/dist/tools/terminal-output-persistence.test.js +50 -0
  110. package/dist/tools/terminal-output-persistence.test.js.map +1 -0
  111. package/dist/tools/terminal-output-store.d.ts +150 -0
  112. package/dist/tools/terminal-output-store.js +562 -0
  113. package/dist/tools/terminal-output-store.js.map +1 -0
  114. package/dist/tools/terminal-output-store.test.d.ts +1 -0
  115. package/dist/tools/terminal-output-store.test.js +364 -0
  116. package/dist/tools/terminal-output-store.test.js.map +1 -0
  117. package/dist/tools/tool.d.ts +5 -0
  118. package/dist/tools/tool.js.map +1 -1
  119. package/dist/types/events.d.ts +1 -0
  120. package/dist/types/messages.d.ts +1 -0
  121. package/dist/web/agent-content-detail.d.ts +78 -0
  122. package/dist/web/agent-content-detail.js +495 -0
  123. package/dist/web/agent-content-detail.js.map +1 -0
  124. package/dist/web/agent-content-detail.test.d.ts +1 -0
  125. package/dist/web/agent-content-detail.test.js +307 -0
  126. package/dist/web/agent-content-detail.test.js.map +1 -0
  127. package/dist/web/agent-parent-messages.test.d.ts +1 -0
  128. package/dist/web/agent-parent-messages.test.js +58 -0
  129. package/dist/web/agent-parent-messages.test.js.map +1 -0
  130. package/dist/web/agent-tool-payload-security.test.d.ts +1 -0
  131. package/dist/web/agent-tool-payload-security.test.js +120 -0
  132. package/dist/web/agent-tool-payload-security.test.js.map +1 -0
  133. package/dist/web/index.d.ts +213 -9
  134. package/dist/web/index.js +260 -108
  135. package/dist/web/index.js.map +1 -1
  136. package/dist/web/smoke-agent-content-http.d.ts +1 -0
  137. package/dist/web/smoke-agent-content-http.js +446 -0
  138. package/dist/web/smoke-agent-content-http.js.map +1 -0
  139. package/dist/web/smoke-status-semantics.d.ts +1 -0
  140. package/dist/web/smoke-status-semantics.js +90 -0
  141. package/dist/web/smoke-status-semantics.js.map +1 -0
  142. package/dist/web/smoke-task-session-entrypoints.d.ts +1 -0
  143. package/dist/web/smoke-task-session-entrypoints.js +96 -0
  144. package/dist/web/smoke-task-session-entrypoints.js.map +1 -0
  145. package/dist/web/smoke-terminal-output-http.d.ts +1 -0
  146. package/dist/web/smoke-terminal-output-http.js +372 -0
  147. package/dist/web/smoke-terminal-output-http.js.map +1 -0
  148. package/dist/web/smoke-tool-call-detail.d.ts +1 -0
  149. package/dist/web/smoke-tool-call-detail.js +106 -0
  150. package/dist/web/smoke-tool-call-detail.js.map +1 -0
  151. package/dist/web/smoke-tool-call-http.d.ts +1 -0
  152. package/dist/web/smoke-tool-call-http.js +100 -0
  153. package/dist/web/smoke-tool-call-http.js.map +1 -0
  154. package/dist/web/smoke-tool-detail-fields-http.d.ts +1 -0
  155. package/dist/web/smoke-tool-detail-fields-http.js +121 -0
  156. package/dist/web/smoke-tool-detail-fields-http.js.map +1 -0
  157. package/dist/web/smoke-web-agent-tasks.d.ts +1 -0
  158. package/dist/web/smoke-web-agent-tasks.js +50 -0
  159. package/dist/web/smoke-web-agent-tasks.js.map +1 -0
  160. package/dist/web/smoke-web-terminal-tasks.js +126 -76
  161. package/dist/web/smoke-web-terminal-tasks.js.map +1 -1
  162. package/dist/web/status-semantics.d.ts +11 -0
  163. package/dist/web/status-semantics.js +59 -0
  164. package/dist/web/status-semantics.js.map +1 -0
  165. package/dist/web/terminal-presentation.d.ts +15 -0
  166. package/dist/web/terminal-presentation.js +61 -0
  167. package/dist/web/terminal-presentation.js.map +1 -0
  168. package/dist/web/terminal-presentation.test.d.ts +1 -0
  169. package/dist/web/terminal-presentation.test.js +33 -0
  170. package/dist/web/terminal-presentation.test.js.map +1 -0
  171. package/dist/web/tool-call-detail.d.ts +40 -0
  172. package/dist/web/tool-call-detail.js +167 -0
  173. package/dist/web/tool-call-detail.js.map +1 -0
  174. package/dist/web/tool-detail-fields.d.ts +59 -0
  175. package/dist/web/tool-detail-fields.js +119 -0
  176. package/dist/web/tool-detail-fields.js.map +1 -0
  177. package/dist/web/tool-detail-fields.test.d.ts +1 -0
  178. package/dist/web/tool-detail-fields.test.js +121 -0
  179. package/dist/web/tool-detail-fields.test.js.map +1 -0
  180. package/package.json +90 -90
@@ -1,12 +1,104 @@
1
+ import { randomUUID } from "node:crypto";
2
+ import { resolve } from "node:path";
3
+ import { INTERRUPTED_TASK_ERROR, loadTasks, persistTask } from "./task-persistence.js";
1
4
  import { createTextMessage } from "../types/messages.js";
2
- import { writeLocalAgentTaskOutput } from "../agents/local-agent-task.js";
5
+ import { agentRunDurationMs, writeLocalAgentTaskOutput } from "../agents/local-agent-task.js";
3
6
  export class TaskStore {
4
7
  tasks = new Map();
5
8
  agentNames = new Map();
6
9
  waiters = new Set();
7
10
  subscribers = new Set();
8
- upsert(task) {
11
+ sessionDir;
12
+ loadedSessions = new Set();
13
+ /** Activate a view; background tasks in other sessions retain their lifecycle. */
14
+ bindSession(sessionDir) {
15
+ this.sessionDir = sessionDir ? resolve(sessionDir) : undefined;
16
+ const summary = { loaded: 0, interrupted: 0, errors: [] };
17
+ if (this.sessionDir && !this.loadedSessions.has(this.sessionDir)) {
18
+ const loaded = loadTasks(this.sessionDir);
19
+ Object.assign(summary, loaded.summary);
20
+ for (const task of loaded.tasks) {
21
+ if (this.tasks.has(task.id)) {
22
+ summary.loaded--;
23
+ summary.errors.push("Skipped conflicting task identifier");
24
+ continue;
25
+ }
26
+ this.tasks.set(task.id, task);
27
+ try {
28
+ persistTask(task);
29
+ }
30
+ catch {
31
+ summary.errors.push("Unable to persist recovered task state");
32
+ }
33
+ }
34
+ this.loadedSessions.add(this.sessionDir);
35
+ }
36
+ this.notify();
37
+ return summary;
38
+ }
39
+ loadSession(sessionDir) { return this.bindSession(sessionDir); }
40
+ get activeSessionDir() { return this.sessionDir; }
41
+ getActive(id) {
42
+ const task = this.get(id);
43
+ return task && this.isActive(task) ? task : undefined;
44
+ }
45
+ isActive(task) { return task.ownerSessionDir === this.sessionDir; }
46
+ persistenceTimers = new Map();
47
+ activateSession(sessionDir) { return this.bindSession(sessionDir); }
48
+ getInSession(id, sessionDir) {
49
+ const task = this.get(id);
50
+ return task?.ownerSessionDir === (sessionDir ? resolve(sessionDir) : undefined) ? task : undefined;
51
+ }
52
+ explicitlyOwnedTasks = new WeakSet();
53
+ attachTask(task, sessionDir) {
54
+ this.explicitlyOwnedTasks.add(task);
55
+ task.ownerSessionDir = sessionDir ? resolve(sessionDir) : undefined;
56
+ this.upsert(task);
57
+ }
58
+ /** Progress only: coalesce token deltas; message and lifecycle methods remain durable. */
59
+ updateProgress(task) { this.upsert(task, { persist: false }); }
60
+ flush() {
61
+ for (const [id, timer] of this.persistenceTimers) {
62
+ clearTimeout(timer);
63
+ const task = this.get(id);
64
+ if (task)
65
+ persistTask(task);
66
+ this.persistenceTimers.delete(id);
67
+ }
68
+ }
69
+ upsert(task, options = {}) {
70
+ const existing = this.tasks.get(task.id);
71
+ if (existing && existing !== task && existing.ownerSessionDir !== task.ownerSessionDir)
72
+ throw new Error("Conflicting task owner");
73
+ if (!existing && task.ownerSessionDir === undefined && !this.explicitlyOwnedTasks.has(task))
74
+ task.ownerSessionDir = this.sessionDir;
75
+ if (task.ownerSessionDir)
76
+ task.ownerSessionDir = resolve(task.ownerSessionDir);
77
+ if ([...this.tasks.values()].some((other) => other.id !== task.id && other.ownerSessionDir === task.ownerSessionDir && other.agentId === task.agentId))
78
+ throw new Error("Conflicting agent identifier");
9
79
  task.updatedAt = new Date().toISOString();
80
+ if (options.persist === false && existing && task.ownerSessionDir) {
81
+ if (!this.persistenceTimers.has(task.id)) {
82
+ const timer = setTimeout(() => {
83
+ this.persistenceTimers.delete(task.id);
84
+ const current = this.get(task.id);
85
+ try {
86
+ if (current)
87
+ persistTask(current);
88
+ }
89
+ catch { /* Progress is best effort; the next durable boundary retries. */ }
90
+ }, 500);
91
+ timer.unref();
92
+ this.persistenceTimers.set(task.id, timer);
93
+ }
94
+ }
95
+ else {
96
+ const timer = this.persistenceTimers.get(task.id);
97
+ if (timer)
98
+ clearTimeout(timer);
99
+ this.persistenceTimers.delete(task.id);
100
+ persistTask(task);
101
+ }
10
102
  this.tasks.set(task.id, task);
11
103
  this.notify();
12
104
  }
@@ -14,10 +106,16 @@ export class TaskStore {
14
106
  return this.tasks.get(id);
15
107
  }
16
108
  getByAgentId(agentId) {
17
- return [...this.tasks.values()].find((task) => task.agentId === agentId);
109
+ return this.list().find((task) => task.agentId === agentId);
18
110
  }
19
- list() {
20
- return [...this.tasks.values()].sort((left, right) => left.createdAt.localeCompare(right.createdAt));
111
+ list() { return this.listInSession(this.sessionDir); }
112
+ recoverableInterruptedTasks(sessionDir) {
113
+ return this.listInSession(sessionDir ?? this.sessionDir).filter((task) => !task.notified && isRecoverableInterruptedTask(task));
114
+ }
115
+ /** Explicit query scope; undefined means unowned, never the foreground view. */
116
+ listInSession(sessionDir) {
117
+ const owner = sessionDir ? resolve(sessionDir) : undefined;
118
+ return [...this.tasks.values()].filter((task) => task.ownerSessionDir === owner).sort((left, right) => left.createdAt.localeCompare(right.createdAt));
21
119
  }
22
120
  activeCount() {
23
121
  return this.list().filter((task) => !this.isTerminal(task)).length;
@@ -27,10 +125,15 @@ export class TaskStore {
27
125
  return () => this.subscribers.delete(listener);
28
126
  }
29
127
  registerName(name, agentId) {
30
- this.agentNames.set(name, agentId);
128
+ this.agentNames.set(`${this.sessionDir ?? ""}\0${name}`, agentId);
129
+ const task = this.getByAgentId(agentId);
130
+ if (task) {
131
+ task.names = [...new Set([...(task.names ?? []), name])];
132
+ this.upsert(task);
133
+ }
31
134
  }
32
135
  resolveAgentName(nameOrId) {
33
- return this.agentNames.get(nameOrId) ?? (this.getByAgentId(nameOrId) ? nameOrId : undefined);
136
+ return this.list().find((task) => task.names?.includes(nameOrId))?.agentId ?? this.agentNames.get(`${this.sessionDir ?? ""}\0${nameOrId}`) ?? (this.getByAgentId(nameOrId) ? nameOrId : undefined);
34
137
  }
35
138
  appendMessage(taskId, message) {
36
139
  const task = this.require(taskId);
@@ -38,47 +141,230 @@ export class TaskStore {
38
141
  this.upsert(task);
39
142
  }
40
143
  queueMessage(agentNameOrId, text) {
41
- const agentId = this.resolveAgentName(agentNameOrId);
144
+ return this.queueMessageInSession(agentNameOrId, text, this.sessionDir);
145
+ }
146
+ queueMessageInSession(agentNameOrId, text, sessionDir) {
147
+ const owner = sessionDir ? resolve(sessionDir) : undefined;
148
+ const tasks = this.listInSession(owner);
149
+ const agentId = tasks.find((task) => task.names?.includes(agentNameOrId))?.agentId
150
+ ?? this.agentNames.get(`${owner ?? ""}\0${agentNameOrId}`)
151
+ ?? tasks.find((task) => task.agentId === agentNameOrId)?.agentId;
42
152
  if (!agentId)
43
153
  return { ok: false, error: `Unknown agent: ${agentNameOrId}` };
44
- const task = this.getByAgentId(agentId);
154
+ const task = tasks.find((task) => task.agentId === agentId);
45
155
  if (!task)
46
156
  return { ok: false, error: `No task found for agent: ${agentNameOrId}` };
47
- task.pendingMessages.push(createTextMessage("user", text));
48
- this.upsert(task);
49
- return { ok: true, task };
157
+ if (task.pendingMessages.length >= 256)
158
+ return { ok: false, error: "Agent inbox is full (256 pending messages); retry after delivery or resume" };
159
+ if (text.length > 16 * 1024)
160
+ return { ok: false, error: "Agent message exceeds 16384 characters; split it into smaller messages" };
161
+ const message = createTextMessage("user", text);
162
+ const receipt = { id: randomUUID(), messageId: message.id, status: "queued", queuedAt: new Date().toISOString(), runGeneration: task.runGeneration };
163
+ task.pendingMessages.push(message);
164
+ (task.messageReceipts ??= []).push(receipt);
165
+ try {
166
+ this.upsert(task);
167
+ }
168
+ catch {
169
+ task.pendingMessages = task.pendingMessages.filter((entry) => entry.id !== message.id);
170
+ task.messageReceipts = task.messageReceipts?.filter((entry) => entry.id !== receipt.id);
171
+ return { ok: false, error: "Unable to persist queued agent message" };
172
+ }
173
+ return { ok: true, task, receipt };
50
174
  }
51
175
  drainPendingMessages(taskId) {
52
176
  const task = this.get(taskId);
53
177
  if (!task || task.pendingMessages.length === 0)
54
178
  return [];
55
179
  const drained = task.pendingMessages.splice(0);
56
- this.upsert(task);
180
+ try {
181
+ this.upsert(task);
182
+ }
183
+ catch {
184
+ task.pendingMessages = drained;
185
+ throw new Error("Unable to persist inbox drain");
186
+ }
57
187
  return drained;
58
188
  }
59
- collectUnnotifiedCompletions() {
60
- return [...this.tasks.values()].filter((task) => this.isTerminal(task) && !task.notified);
61
- }
62
- markRunning(taskId) {
63
- this.patch(taskId, { status: "running" });
189
+ /** Synchronous handoff at the next model-request boundary, never during tool execution. */
190
+ deliverPendingMessages(taskId, runGeneration) {
191
+ const task = this.get(taskId);
192
+ if (!task || task.runGeneration !== runGeneration || task.status !== "running" || task.abortController?.signal.aborted)
193
+ return [];
194
+ let count = 0;
195
+ let characters = 0;
196
+ for (const message of task.pendingMessages) {
197
+ const size = message.blocks.reduce((total, block) => total + (block.type === "text" ? block.text.length : JSON.stringify(block).length), 0);
198
+ if (characters + size > 32 * 1024)
199
+ break;
200
+ characters += size;
201
+ count += 1;
202
+ }
203
+ const recoveryTask = task;
204
+ const previousRecovery = recoveryTask.deliveryRecoveryMessages;
205
+ const previousPending = [...task.pendingMessages];
206
+ const previousMessages = [...task.messages];
207
+ const previousReceipts = structuredClone(task.messageReceipts);
208
+ const messages = task.pendingMessages.splice(0, count);
209
+ if (!messages.length)
210
+ return messages;
211
+ recoveryTask.deliveryRecoveryMessages = [...(previousRecovery ?? []), ...messages.map((message) => ({ message, runGeneration }))];
212
+ const now = new Date().toISOString();
213
+ const receipts = task.messageReceipts ??= [];
214
+ for (const message of messages) {
215
+ let receipt = receipts.find((entry) => entry.messageId === message.id);
216
+ if (!receipt) {
217
+ receipt = { id: randomUUID(), messageId: message.id, status: "queued", queuedAt: now, runGeneration };
218
+ receipts.push(receipt);
219
+ }
220
+ Object.assign(receipt, { status: "delivered", deliveredAt: now, runGeneration });
221
+ task.messages.push(message);
222
+ }
223
+ const delivered = receipts.filter((entry) => entry.status === "delivered").slice(-128);
224
+ task.messageReceipts = receipts.filter((entry) => entry.status === "queued" || delivered.includes(entry));
225
+ try {
226
+ this.upsert(task);
227
+ }
228
+ catch {
229
+ recoveryTask.deliveryRecoveryMessages = previousRecovery;
230
+ task.pendingMessages = previousPending;
231
+ task.messages = previousMessages;
232
+ task.messageReceipts = previousReceipts;
233
+ throw new Error("Unable to persist inbox delivery");
234
+ }
235
+ return messages;
64
236
  }
65
- complete(taskId, result) {
66
- this.patchTerminal(taskId, { status: "completed", result, completedAt: new Date().toISOString() });
237
+ /** Call after durable transcript append and BEFORE compaction/model execution.
238
+ * A stale generation cannot acknowledge a newer handoff. Failure must stop the run.
239
+ */
240
+ confirmDelivery(taskId, messageIds, runGeneration) {
241
+ const task = this.require(taskId);
242
+ if (task.runGeneration !== runGeneration)
243
+ return;
244
+ const previous = task.deliveryRecoveryMessages;
245
+ if (!previous?.length)
246
+ return;
247
+ const ids = new Set(messageIds);
248
+ task.deliveryRecoveryMessages = previous.filter((entry) => entry.runGeneration !== runGeneration || !ids.has(entry.message.id));
249
+ if (task.deliveryRecoveryMessages.length === previous.length)
250
+ return;
251
+ try {
252
+ this.upsert(task);
253
+ }
254
+ catch {
255
+ task.deliveryRecoveryMessages = previous;
256
+ throw new Error("Unable to persist delivery confirmation");
257
+ }
67
258
  }
68
- fail(taskId, error) {
69
- this.patchTerminal(taskId, { status: "failed", error, completedAt: new Date().toISOString() });
259
+ /** Only unconfirmed outbox entries may be retried. Missing historical receipt IDs
260
+ * may simply have been compacted, so they NEVER imply an undelivered message.
261
+ * persistedMessageIds can include IDs from the complete append-only transcript log.
262
+ */
263
+ reconcileMessages(taskId, transcript, persistedMessageIds = transcript.map((message) => message.id)) {
264
+ const task = this.require(taskId);
265
+ const present = new Set(persistedMessageIds);
266
+ const previousRecovery = task.deliveryRecoveryMessages;
267
+ const previousPending = task.pendingMessages;
268
+ const previousMessages = task.messages;
269
+ const previousReceipts = structuredClone(task.messageReceipts);
270
+ task.pendingMessages = task.pendingMessages.filter((message) => !present.has(message.id));
271
+ for (const entry of previousRecovery ?? []) {
272
+ const receipt = task.messageReceipts?.find((receipt) => receipt.messageId === entry.message.id);
273
+ if (present.has(entry.message.id)) {
274
+ if (receipt)
275
+ receipt.status = "delivered";
276
+ }
277
+ else {
278
+ if (!task.pendingMessages.some((message) => message.id === entry.message.id))
279
+ task.pendingMessages.push(entry.message);
280
+ if (receipt) {
281
+ receipt.status = "queued";
282
+ receipt.deliveredAt = undefined;
283
+ }
284
+ }
285
+ }
286
+ for (const receipt of task.messageReceipts ?? []) {
287
+ if (present.has(receipt.messageId))
288
+ receipt.status = "delivered";
289
+ }
290
+ task.deliveryRecoveryMessages = [];
291
+ task.messages = [...transcript];
292
+ try {
293
+ this.upsert(task);
294
+ }
295
+ catch {
296
+ task.deliveryRecoveryMessages = previousRecovery;
297
+ task.pendingMessages = previousPending;
298
+ task.messages = previousMessages;
299
+ task.messageReceipts = previousReceipts;
300
+ throw new Error("Unable to persist delivery reconciliation");
301
+ }
70
302
  }
71
- kill(taskId, reason = "Task stopped") {
303
+ prepareResume(taskId, abortController) {
72
304
  const task = this.require(taskId);
73
- task.abortController?.abort(reason);
74
- task.status = "killed";
75
- task.error = reason;
76
- task.completedAt = new Date().toISOString();
305
+ if (task.type !== "agent" || !this.isTerminal(task))
306
+ throw new Error("Only terminal agent tasks can be resumed");
307
+ const previousController = task.abortController;
308
+ task.runHistory = [...(task.runHistory ?? []), {
309
+ runGeneration: task.runGeneration, status: task.status, result: task.result,
310
+ error: task.error, progress: structuredClone(task.progress), completedAt: task.completedAt,
311
+ startedAt: task.startedAt, durationMs: agentRunDurationMs(task),
312
+ archivedAt: new Date().toISOString(),
313
+ }].slice(-8);
314
+ task.runGeneration += 1;
315
+ task.status = "pending";
316
+ task.abortController = abortController;
317
+ task.result = undefined;
318
+ task.error = undefined;
319
+ task.progress = { totalEvents: 0, totalToolUseCount: 0 };
320
+ task.completedAt = undefined;
321
+ task.startedAt = undefined;
322
+ task.durationMs = undefined;
323
+ task.notified = false;
324
+ // Replace the stable output file so it cannot masquerade as the new generation's result.
77
325
  this.persistTerminalOutput(task);
78
326
  this.upsert(task);
327
+ previousController?.abort("Superseded by resumed generation");
328
+ return task;
329
+ }
330
+ collectUnnotifiedCompletions(...scope) {
331
+ const owner = scope.length ? (scope[0] ? resolve(scope[0]) : undefined) : this.sessionDir;
332
+ return [...this.tasks.values()].filter((task) => task.ownerSessionDir === owner && this.isTerminal(task) && !task.notified && !isRecoverableInterruptedTask(task));
333
+ }
334
+ markRunning(taskId, runGeneration) {
335
+ const task = this.require(taskId);
336
+ if ((runGeneration !== undefined && task.runGeneration !== runGeneration) || task.status !== "pending")
337
+ return;
338
+ this.patch(taskId, { status: "running", startedAt: new Date().toISOString(), completedAt: undefined, durationMs: undefined });
339
+ }
340
+ complete(taskId, result, runGeneration) {
341
+ this.patchTerminal(taskId, { status: "completed", result }, runGeneration);
342
+ }
343
+ fail(taskId, error, result, runGeneration) {
344
+ this.patchTerminal(taskId, { status: "failed", error, result: result ? { ...result, status: "incomplete" } : undefined }, runGeneration);
345
+ }
346
+ kill(taskId, reason = "Task stopped", result, runGeneration) {
347
+ const task = this.require(taskId);
348
+ if (runGeneration !== undefined && task.runGeneration !== runGeneration)
349
+ return;
350
+ if (this.isTerminal(task) && task.status !== "killed")
351
+ return;
352
+ const controller = task.abortController;
353
+ // Freeze before notifying/aborting: synchronous callbacks may resume the task.
354
+ this.patchTerminal(taskId, { status: "killed", error: reason, result: result ? { ...result, status: "incomplete" } : undefined }, runGeneration);
355
+ controller?.abort(reason);
79
356
  }
80
357
  markNotified(taskId) {
81
- this.patch(taskId, { notified: true });
358
+ const task = this.require(taskId);
359
+ if (task.notified || !this.isTerminal(task))
360
+ return;
361
+ // Collection is read-only. Commit the acknowledgement before exposing it in
362
+ // memory; a failed atomic write must leave the completion retryable.
363
+ const acknowledged = { ...task, notified: true, updatedAt: new Date().toISOString() };
364
+ persistTask(acknowledged);
365
+ task.notified = true;
366
+ task.updatedAt = acknowledged.updatedAt;
367
+ this.notify();
82
368
  }
83
369
  isTerminal(task) {
84
370
  return isTerminalStatus(task.status);
@@ -87,7 +373,7 @@ export class TaskStore {
87
373
  const existing = this.get(taskId);
88
374
  if (!existing)
89
375
  return Promise.resolve(undefined);
90
- if (this.isTerminal(existing))
376
+ if (this.isTerminal(existing) || options.signal?.aborted)
91
377
  return Promise.resolve(existing);
92
378
  return new Promise((resolve) => {
93
379
  const deadline = options.timeoutMs ? Date.now() + options.timeoutMs : undefined;
@@ -116,9 +402,22 @@ export class TaskStore {
116
402
  Object.assign(task, fields);
117
403
  this.upsert(task);
118
404
  }
119
- patchTerminal(taskId, fields) {
405
+ patchTerminal(taskId, fields, runGeneration) {
120
406
  const task = this.require(taskId);
121
- Object.assign(task, fields);
407
+ if (runGeneration !== undefined && task.runGeneration !== runGeneration)
408
+ return;
409
+ if (this.isTerminal(task)) {
410
+ // A stopped runner may finish finalizing its allowed report after kill().
411
+ // Enrich only that exact terminal generation; never restart its clock/status.
412
+ if (runGeneration === undefined || task.status !== fields.status || task.result || !fields.result || fields.status === "completed")
413
+ return;
414
+ task.result = fields.result;
415
+ }
416
+ else {
417
+ const completedAt = new Date().toISOString();
418
+ const durationMs = task.status === "running" ? agentRunDurationMs(task, Date.parse(completedAt)) : undefined;
419
+ Object.assign(task, fields, { completedAt, durationMs });
420
+ }
122
421
  this.persistTerminalOutput(task);
123
422
  this.upsert(task);
124
423
  }
@@ -146,5 +445,8 @@ export class TaskStore {
146
445
  export function isTerminalStatus(status) {
147
446
  return status === "completed" || status === "failed" || status === "killed";
148
447
  }
448
+ export function isRecoverableInterruptedTask(task) {
449
+ return task.type === "agent" && task.status === "killed" && task.error === INTERRUPTED_TASK_ERROR;
450
+ }
149
451
  export const globalTaskStore = new TaskStore();
150
452
  //# sourceMappingURL=task-store.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"task-store.js","sourceRoot":"","sources":["../../src/tasks/task-store.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"task-store.js","sourceRoot":"","sources":["../../src/tasks/task-store.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,37 @@
1
+ import { TerminalOutputStore, type StoreResult, type RunView, type OutputPage } from "../terminal-output-store.js";
2
+ export type { StoreResult, RunView, OutputPage } from "../terminal-output-store.js";
3
+ /** UTF-8 byte offsets in ONE redacted stream; marker text is not part of these ranges. */
4
+ export interface ExecOutputRange {
5
+ start: number;
6
+ end: number;
7
+ retained: Array<{
8
+ start: number;
9
+ end: number;
10
+ }>;
11
+ gaps: Array<{
12
+ start: number;
13
+ end: number;
14
+ }>;
15
+ truncated: boolean;
16
+ }
17
+ export interface ExecOutputReference {
18
+ owner_session_id: string | null;
19
+ run_id: string;
20
+ availability: RunView["record"]["availability"] | "unavailable";
21
+ reason?: string;
22
+ persistence?: RunView["persistence"];
23
+ truncated?: boolean;
24
+ byte_limit?: number;
25
+ expires_at?: number | null;
26
+ streams?: RunView["record"]["streams"];
27
+ }
1
28
  export type ExecOutputStream = "stdout" | "stderr";
2
29
  export type ExecProcessStatus = "running" | "exited" | "failed" | "timed_out" | "killed";
3
30
  export type ExecTerminationReason = "completed" | "failed" | "user_interrupt" | "user_terminate" | "user_kill" | "timeout" | "external_signal" | "spawn_error";
4
31
  export interface ExecProcessStartOptions {
5
32
  ownerId?: string;
33
+ /** Trusted runtime session directory, never a tool argument. */
34
+ sessionDir?: string;
6
35
  command: string;
7
36
  description?: string;
8
37
  cwd: string;
@@ -26,6 +55,15 @@ export interface ExecProcessOutputDelta {
26
55
  sessionId: string;
27
56
  stream: ExecOutputStream;
28
57
  text: string;
58
+ ownerSessionId?: string;
59
+ outputKind?: "incremental";
60
+ /** Authoritative stream text; legacy background text may include a display prefix. */
61
+ streamText?: string;
62
+ streamStart?: number;
63
+ streamEnd?: number;
64
+ cursorUnit?: "utf8_bytes";
65
+ streamMode?: "separate" | "tty_merged";
66
+ /** Legacy mixed-display UTF-16 offsets, NOT output-store cursors. */
29
67
  outputStart?: number;
30
68
  outputEnd?: number;
31
69
  }
@@ -53,6 +91,14 @@ export interface ExecProcessResult {
53
91
  stdout: number;
54
92
  stderr: number;
55
93
  };
94
+ owner_session_id?: string;
95
+ started_at: number;
96
+ finished_at: number | null;
97
+ output_kind: "incremental";
98
+ output_cursor_unit: "utf8_bytes";
99
+ stream_mode: "separate" | "tty_merged";
100
+ output_ranges: Record<ExecOutputStream, ExecOutputRange>;
101
+ output_ref: ExecOutputReference;
56
102
  }
57
103
  export interface ExecProcessInteraction {
58
104
  ownerId?: string;
@@ -68,18 +114,67 @@ export declare class ExecProcessManager {
68
114
  private readonly subscribers;
69
115
  private readonly outputSubscribers;
70
116
  private nextId;
117
+ private readonly ownerBindings;
118
+ private readonly stores;
71
119
  constructor(options?: {
72
120
  maxProcesses?: number;
73
121
  completedRetentionMs?: number;
122
+ /** Trusted global root, optional for legacy runtimes. */
123
+ sessionsRoot?: string;
124
+ /** Injectable independent store for tests/hosts already owning a single store. */
125
+ outputStore?: TerminalOutputStore;
74
126
  });
127
+ /** Bind only an authorized runtime session's actual directory. Never accept an HTTP path. */
128
+ registerOwnerSession(ownerSessionId: string, sessionDir: string): StoreResult<{
129
+ records: RunView[];
130
+ rejected: number;
131
+ }>;
132
+ listHistory(ownerSessionId: string, pagination?: {
133
+ offset?: number;
134
+ limit?: number;
135
+ }): StoreResult<{
136
+ records: RunView[];
137
+ nextOffset: number | null;
138
+ }>;
139
+ readOutput(ownerSessionId: string, runId: string, page: {
140
+ stream: ExecOutputStream;
141
+ offset?: number;
142
+ limitBytes?: number;
143
+ }): StoreResult<OutputPage>;
144
+ /** Cleanup is independent of process execution and never turns a successful exit into a tool error. */
145
+ sweepOutput(): void;
146
+ private storeGuard;
147
+ private recordOutputResult;
148
+ private outputReference;
75
149
  start(options: ExecProcessStartOptions): string;
76
150
  interact(sessionId: string, interaction: ExecProcessInteraction): Promise<ExecProcessResult>;
77
151
  execute(options: ExecProcessStartOptions, yieldTimeMs: number, onOutput?: (delta: ExecProcessOutputDelta) => void, abortSignal?: AbortSignal): Promise<ExecProcessResult>;
78
- list(): Array<Pick<ExecProcessResult, "session_id" | "process_id" | "status" | "command" | "description" | "cwd" | "shell" | "duration_ms" | "tty" | "termination_reason"> & {
152
+ /** No owner argument preserves the trusted internal legacy view. Web MUST supply an owner. */
153
+ list(ownerSessionId?: string): {
154
+ session_id: string;
155
+ owner_session_id: string | undefined;
156
+ process_id: number | null;
157
+ status: ExecProcessStatus;
158
+ command: string;
159
+ description: string | undefined;
160
+ cwd: string;
161
+ shell: string;
162
+ started_at: number;
163
+ finished_at: number | null;
164
+ duration_ms: number;
165
+ tty: boolean;
166
+ exit_code: number | null;
167
+ signal: string | number | null;
168
+ termination_reason: ExecTerminationReason | null;
79
169
  backgrounded: boolean;
80
170
  output: string;
81
171
  outputEnd: number;
82
- }>;
172
+ output_kind: "snapshot";
173
+ output_cursor_unit: "utf16_code_units";
174
+ output_truncated: boolean;
175
+ stream_mode: "separate" | "tty_merged";
176
+ output_ref: ExecOutputReference;
177
+ }[];
83
178
  activeCount(): number;
84
179
  isBackgroundRunning(sessionId: string): boolean;
85
180
  subscribe(listener: () => void): () => void;