@dorokuma/herdsman 0.9.0 → 0.11.4
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/dist/src/agent-history/antigravity-proto.js +1 -1
- package/dist/src/agent-history/antigravity-proto.js.map +1 -1
- package/dist/src/agent-history/antigravity-reader.d.ts +13 -1
- package/dist/src/agent-history/antigravity-reader.d.ts.map +1 -1
- package/dist/src/agent-history/antigravity-reader.js +22 -1
- package/dist/src/agent-history/antigravity-reader.js.map +1 -1
- package/dist/src/agent-history/discovery.d.ts +2 -1
- package/dist/src/agent-history/discovery.d.ts.map +1 -1
- package/dist/src/agent-history/discovery.js +24 -4
- package/dist/src/agent-history/discovery.js.map +1 -1
- package/dist/src/agent-history/readers.d.ts +15 -1
- package/dist/src/agent-history/readers.d.ts.map +1 -1
- package/dist/src/agent-history/readers.js +77 -31
- package/dist/src/agent-history/readers.js.map +1 -1
- package/dist/src/agent-history/service.d.ts +4 -2
- package/dist/src/agent-history/service.d.ts.map +1 -1
- package/dist/src/agent-history/service.js +22 -22
- package/dist/src/agent-history/service.js.map +1 -1
- package/dist/src/agent-history/source-fingerprint.d.ts +7 -0
- package/dist/src/agent-history/source-fingerprint.d.ts.map +1 -0
- package/dist/src/agent-history/source-fingerprint.js +26 -0
- package/dist/src/agent-history/source-fingerprint.js.map +1 -0
- package/dist/src/agent-history/text.d.ts.map +1 -1
- package/dist/src/agent-history/text.js +5 -0
- package/dist/src/agent-history/text.js.map +1 -1
- package/dist/src/cli/herdsman.d.ts.map +1 -1
- package/dist/src/cli/herdsman.js +31 -9
- package/dist/src/cli/herdsman.js.map +1 -1
- package/dist/src/daemon/agent-event-reconciler.d.ts +7 -0
- package/dist/src/daemon/agent-event-reconciler.d.ts.map +1 -1
- package/dist/src/daemon/agent-event-reconciler.js +39 -5
- package/dist/src/daemon/agent-event-reconciler.js.map +1 -1
- package/dist/src/daemon/herdr-session-watch-manager.d.ts +1 -0
- package/dist/src/daemon/herdr-session-watch-manager.d.ts.map +1 -1
- package/dist/src/daemon/herdr-session-watch-manager.js +176 -55
- package/dist/src/daemon/herdr-session-watch-manager.js.map +1 -1
- package/dist/src/daemon/observability-server.d.ts +3 -0
- package/dist/src/daemon/observability-server.d.ts.map +1 -1
- package/dist/src/daemon/observability-server.js +64 -9
- package/dist/src/daemon/observability-server.js.map +1 -1
- package/dist/src/daemon/process-manager.d.ts +41 -2
- package/dist/src/daemon/process-manager.d.ts.map +1 -1
- package/dist/src/daemon/process-manager.js +340 -19
- package/dist/src/daemon/process-manager.js.map +1 -1
- package/dist/src/daemon/service.d.ts +46 -0
- package/dist/src/daemon/service.d.ts.map +1 -1
- package/dist/src/daemon/service.js +171 -12
- package/dist/src/daemon/service.js.map +1 -1
- package/dist/src/db/agent-events.d.ts +27 -0
- package/dist/src/db/agent-events.d.ts.map +1 -1
- package/dist/src/db/agent-events.js +157 -26
- package/dist/src/db/agent-events.js.map +1 -1
- package/dist/src/db/agent-orchestrator-scopes.d.ts +8 -0
- package/dist/src/db/agent-orchestrator-scopes.d.ts.map +1 -1
- package/dist/src/db/agent-orchestrator-scopes.js +13 -0
- package/dist/src/db/agent-orchestrator-scopes.js.map +1 -1
- package/dist/src/db/agents.d.ts +44 -0
- package/dist/src/db/agents.d.ts.map +1 -1
- package/dist/src/db/agents.js +71 -0
- package/dist/src/db/agents.js.map +1 -1
- package/dist/src/db/client.d.ts +1 -0
- package/dist/src/db/client.d.ts.map +1 -1
- package/dist/src/db/client.js +12 -0
- package/dist/src/db/client.js.map +1 -1
- package/dist/src/db/schema.d.ts +391 -0
- package/dist/src/db/schema.d.ts.map +1 -1
- package/dist/src/db/schema.js +34 -0
- package/dist/src/db/schema.js.map +1 -1
- package/dist/src/db/status-event-plans.d.ts +62 -0
- package/dist/src/db/status-event-plans.d.ts.map +1 -0
- package/dist/src/db/status-event-plans.js +147 -0
- package/dist/src/db/status-event-plans.js.map +1 -0
- package/dist/src/herdr/pane-identity-resolver.d.ts +4 -0
- package/dist/src/herdr/pane-identity-resolver.d.ts.map +1 -1
- package/dist/src/herdr/pane-identity-resolver.js +13 -1
- package/dist/src/herdr/pane-identity-resolver.js.map +1 -1
- package/dist/src/herdr/socket-client.d.ts +2 -0
- package/dist/src/herdr/socket-client.d.ts.map +1 -1
- package/dist/src/herdr/socket-client.js +64 -20
- package/dist/src/herdr/socket-client.js.map +1 -1
- package/dist/src/observability/agent-context-service.d.ts.map +1 -1
- package/dist/src/observability/agent-context-service.js +3 -6
- package/dist/src/observability/agent-context-service.js.map +1 -1
- package/dist/src/observability/agent-index-service.d.ts +47 -2
- package/dist/src/observability/agent-index-service.d.ts.map +1 -1
- package/dist/src/observability/agent-index-service.js +1075 -103
- package/dist/src/observability/agent-index-service.js.map +1 -1
- package/dist/src/observability/agent-orchestrator-service.d.ts.map +1 -1
- package/dist/src/observability/agent-orchestrator-service.js +34 -12
- package/dist/src/observability/agent-orchestrator-service.js.map +1 -1
- package/dist/src/observability/contracts.d.ts +1 -1
- package/dist/src/observability/contracts.d.ts.map +1 -1
- package/dist/src/observability/contracts.js.map +1 -1
- package/dist/src/observability/interactive-pi.d.ts +1 -1
- package/dist/src/observability/interactive-pi.d.ts.map +1 -1
- package/dist/src/observability/interactive-pi.js +1 -1
- package/dist/src/observability/interactive-pi.js.map +1 -1
- package/dist/src/observability/turn-completion.d.ts +2 -1
- package/dist/src/observability/turn-completion.d.ts.map +1 -1
- package/dist/src/observability/turn-completion.js +10 -1
- package/dist/src/observability/turn-completion.js.map +1 -1
- package/dist/src/shared/unix-peercred.d.ts +14 -0
- package/dist/src/shared/unix-peercred.d.ts.map +1 -0
- package/dist/src/shared/unix-peercred.js +144 -0
- package/dist/src/shared/unix-peercred.js.map +1 -0
- package/drizzle/0008_pane_tombstones.sql +9 -0
- package/drizzle/0009_high_lake.sql +24 -0
- package/drizzle/meta/0008_snapshot.json +823 -0
- package/drizzle/meta/0009_snapshot.json +975 -0
- package/drizzle/meta/_journal.json +14 -0
- package/package.json +24 -22
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
import type { DatabaseSync } from "node:sqlite";
|
|
2
|
+
import type { AgentStatus, CompactAgentHistory } from "../observability/contracts.js";
|
|
3
|
+
export declare const STATUS_PLAN_MAX_ATTEMPTS = 8;
|
|
4
|
+
export type StatusEventPlanStatus = "pending" | "running" | "completed" | "cancelled" | "failed";
|
|
5
|
+
export type StatusEventPlanRecord = {
|
|
6
|
+
agentId: string;
|
|
7
|
+
attempts: number;
|
|
8
|
+
compactHistory?: CompactAgentHistory;
|
|
9
|
+
createdAt: Date;
|
|
10
|
+
fromStatus: AgentStatus;
|
|
11
|
+
herdrEventKey: string | null;
|
|
12
|
+
herdrSessionName: string;
|
|
13
|
+
id: number;
|
|
14
|
+
lastError: string | null;
|
|
15
|
+
paneGeneration: string | null;
|
|
16
|
+
paneId: string;
|
|
17
|
+
status: StatusEventPlanStatus;
|
|
18
|
+
toStatus: AgentStatus;
|
|
19
|
+
updatedAt: Date;
|
|
20
|
+
};
|
|
21
|
+
export declare class StatusEventPlanStore {
|
|
22
|
+
#private;
|
|
23
|
+
constructor(sqlite: DatabaseSync);
|
|
24
|
+
insertPending(plan: {
|
|
25
|
+
agentId: string;
|
|
26
|
+
compactHistory?: CompactAgentHistory;
|
|
27
|
+
fromStatus: AgentStatus;
|
|
28
|
+
herdrEventKey?: string | null;
|
|
29
|
+
herdrSessionName: string;
|
|
30
|
+
paneGeneration?: string | null;
|
|
31
|
+
paneId: string;
|
|
32
|
+
toStatus: AgentStatus;
|
|
33
|
+
}): StatusEventPlanRecord;
|
|
34
|
+
insertPending(plan: {
|
|
35
|
+
agent: {
|
|
36
|
+
herdrSessionName: string;
|
|
37
|
+
id: string;
|
|
38
|
+
paneId: string;
|
|
39
|
+
paneGeneration?: string | null;
|
|
40
|
+
};
|
|
41
|
+
compactHistory?: CompactAgentHistory;
|
|
42
|
+
from: AgentStatus;
|
|
43
|
+
herdrEventKey?: string | null;
|
|
44
|
+
to: AgentStatus;
|
|
45
|
+
}): StatusEventPlanRecord;
|
|
46
|
+
get(id: number): StatusEventPlanRecord;
|
|
47
|
+
listUnfinished(): StatusEventPlanRecord[];
|
|
48
|
+
listFailed(): StatusEventPlanRecord[];
|
|
49
|
+
listWaitingHistory(): StatusEventPlanRecord[];
|
|
50
|
+
resetRunningToPending(): number;
|
|
51
|
+
markRunning(id: number): void;
|
|
52
|
+
markCompleted(id: number): void;
|
|
53
|
+
markCancelled(id: number): void;
|
|
54
|
+
markRetry(id: number, error: unknown): void;
|
|
55
|
+
/**
|
|
56
|
+
* Purges settled plans (completed/cancelled/failed) whose updated_at is
|
|
57
|
+
* older than ageMs. Pending and running rows are never touched: they are
|
|
58
|
+
* still owned by the drain/retry cycle.
|
|
59
|
+
*/
|
|
60
|
+
deleteSettledOlderThan(ageMs: number): number;
|
|
61
|
+
}
|
|
62
|
+
//# sourceMappingURL=status-event-plans.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"status-event-plans.d.ts","sourceRoot":"","sources":["../../../src/db/status-event-plans.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAErF,eAAO,MAAM,wBAAwB,IAAI,CAAC;AAE1C,MAAM,MAAM,qBAAqB,GAAG,SAAS,GAAG,SAAS,GAAG,WAAW,GAAG,WAAW,GAAG,QAAQ,CAAC;AAEjG,MAAM,MAAM,qBAAqB,GAAG;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,mBAAmB,CAAC;IACrC,SAAS,EAAE,IAAI,CAAC;IAChB,UAAU,EAAE,WAAW,CAAC;IACxB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,gBAAgB,EAAE,MAAM,CAAC;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,qBAAqB,CAAC;IAC9B,QAAQ,EAAE,WAAW,CAAC;IACtB,SAAS,EAAE,IAAI,CAAC;CACjB,CAAC;AA8CF,qBAAa,oBAAoB;;gBAGnB,MAAM,EAAE,YAAY;IAIhC,aAAa,CAAC,IAAI,EAAE;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,cAAc,CAAC,EAAE,mBAAmB,CAAC;QACrC,UAAU,EAAE,WAAW,CAAC;QACxB,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAC9B,gBAAgB,EAAE,MAAM,CAAC;QACzB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAC/B,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,WAAW,CAAC;KACvB,GAAG,qBAAqB;IACzB,aAAa,CAAC,IAAI,EAAE;QAClB,KAAK,EAAE;YAAE,gBAAgB,EAAE,MAAM,CAAC;YAAC,EAAE,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;YAAC,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;SAAE,CAAC;QAChG,cAAc,CAAC,EAAE,mBAAmB,CAAC;QACrC,IAAI,EAAE,WAAW,CAAC;QAClB,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAC9B,EAAE,EAAE,WAAW,CAAC;KACjB,GAAG,qBAAqB;IA8EzB,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,qBAAqB;IAQtC,cAAc,IAAI,qBAAqB,EAAE;IASzC,UAAU,IAAI,qBAAqB,EAAE;IAOrC,kBAAkB,IAAI,qBAAqB,EAAE;IAS7C,qBAAqB,IAAI,MAAM;IAU/B,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAO7B,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAO/B,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAO/B,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI;IAe3C;;;;OAIG;IACH,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;CAU9C"}
|
|
@@ -0,0 +1,147 @@
|
|
|
1
|
+
export const STATUS_PLAN_MAX_ATTEMPTS = 8;
|
|
2
|
+
function mapStatusEventPlan(row) {
|
|
3
|
+
let compactHistory;
|
|
4
|
+
if (row.compact_history_json) {
|
|
5
|
+
try {
|
|
6
|
+
compactHistory = JSON.parse(row.compact_history_json);
|
|
7
|
+
}
|
|
8
|
+
catch {
|
|
9
|
+
compactHistory = undefined;
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
return {
|
|
13
|
+
agentId: row.agent_id,
|
|
14
|
+
attempts: row.attempts,
|
|
15
|
+
...(compactHistory ? { compactHistory } : {}),
|
|
16
|
+
createdAt: new Date(row.created_at),
|
|
17
|
+
fromStatus: row.from_status,
|
|
18
|
+
herdrEventKey: row.herdr_event_key,
|
|
19
|
+
herdrSessionName: row.herdr_session_name,
|
|
20
|
+
id: row.id,
|
|
21
|
+
lastError: row.last_error,
|
|
22
|
+
paneGeneration: row.pane_generation,
|
|
23
|
+
paneId: row.pane_id,
|
|
24
|
+
status: row.status,
|
|
25
|
+
toStatus: row.to_status,
|
|
26
|
+
updatedAt: new Date(row.updated_at),
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
export class StatusEventPlanStore {
|
|
30
|
+
#sqlite;
|
|
31
|
+
constructor(sqlite) {
|
|
32
|
+
this.#sqlite = sqlite;
|
|
33
|
+
}
|
|
34
|
+
insertPending(plan) {
|
|
35
|
+
const herdrSessionName = plan.herdrSessionName ?? plan.agent?.herdrSessionName;
|
|
36
|
+
const agentId = plan.agentId ?? plan.agent?.id;
|
|
37
|
+
const paneId = plan.paneId ?? plan.agent?.paneId;
|
|
38
|
+
const paneGeneration = plan.paneGeneration ?? plan.agent?.paneGeneration ?? null;
|
|
39
|
+
const fromStatus = plan.fromStatus ?? plan.from;
|
|
40
|
+
const toStatus = plan.toStatus ?? plan.to;
|
|
41
|
+
const herdrEventKey = plan.herdrEventKey ?? null;
|
|
42
|
+
if (!herdrSessionName || !agentId || !paneId || !fromStatus || !toStatus) {
|
|
43
|
+
throw new Error("Missing required fields for status event plan");
|
|
44
|
+
}
|
|
45
|
+
if (herdrEventKey) {
|
|
46
|
+
const existing = this.#sqlite
|
|
47
|
+
.prepare("select * from status_event_plans where herdr_session_name = ? and herdr_event_key = ?")
|
|
48
|
+
.get(herdrSessionName, herdrEventKey);
|
|
49
|
+
if (existing) {
|
|
50
|
+
return mapStatusEventPlan(existing);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
const now = Date.now();
|
|
54
|
+
const compactHistoryJson = plan.compactHistory ? JSON.stringify(plan.compactHistory) : null;
|
|
55
|
+
try {
|
|
56
|
+
const result = this.#sqlite
|
|
57
|
+
.prepare(`insert into status_event_plans
|
|
58
|
+
(agent_id, attempts, compact_history_json, created_at, from_status, herdr_event_key, herdr_session_name, last_error, pane_generation, pane_id, status, to_status, updated_at)
|
|
59
|
+
values (?, 0, ?, ?, ?, ?, ?, null, ?, ?, 'pending', ?, ?)`)
|
|
60
|
+
.run(agentId, compactHistoryJson, now, fromStatus, herdrEventKey, herdrSessionName, paneGeneration, paneId, toStatus, now);
|
|
61
|
+
return this.get(Number(result.lastInsertRowid));
|
|
62
|
+
}
|
|
63
|
+
catch (error) {
|
|
64
|
+
if (herdrEventKey) {
|
|
65
|
+
const existing = this.#sqlite
|
|
66
|
+
.prepare("select * from status_event_plans where herdr_session_name = ? and herdr_event_key = ?")
|
|
67
|
+
.get(herdrSessionName, herdrEventKey);
|
|
68
|
+
if (existing)
|
|
69
|
+
return mapStatusEventPlan(existing);
|
|
70
|
+
}
|
|
71
|
+
throw error;
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
get(id) {
|
|
75
|
+
const row = this.#sqlite.prepare("select * from status_event_plans where id = ?").get(id);
|
|
76
|
+
if (!row)
|
|
77
|
+
throw new Error(`StatusEventPlan with id ${id} not found`);
|
|
78
|
+
return mapStatusEventPlan(row);
|
|
79
|
+
}
|
|
80
|
+
listUnfinished() {
|
|
81
|
+
const rows = this.#sqlite
|
|
82
|
+
.prepare("select * from status_event_plans where status in ('pending', 'running') order by id asc")
|
|
83
|
+
.all();
|
|
84
|
+
return rows.map(mapStatusEventPlan);
|
|
85
|
+
}
|
|
86
|
+
listFailed() {
|
|
87
|
+
const rows = this.#sqlite
|
|
88
|
+
.prepare("select * from status_event_plans where status = 'failed' order by id asc")
|
|
89
|
+
.all();
|
|
90
|
+
return rows.map(mapStatusEventPlan);
|
|
91
|
+
}
|
|
92
|
+
listWaitingHistory() {
|
|
93
|
+
const rows = this.#sqlite
|
|
94
|
+
.prepare("select * from status_event_plans where status = 'pending' and last_error = 'PLAN_WAITING_HISTORY' order by id asc")
|
|
95
|
+
.all();
|
|
96
|
+
return rows.map(mapStatusEventPlan);
|
|
97
|
+
}
|
|
98
|
+
resetRunningToPending() {
|
|
99
|
+
const now = Date.now();
|
|
100
|
+
const result = this.#sqlite
|
|
101
|
+
.prepare("update status_event_plans set status = 'pending', updated_at = ? where status = 'running'")
|
|
102
|
+
.run(now);
|
|
103
|
+
return Number(result.changes);
|
|
104
|
+
}
|
|
105
|
+
markRunning(id) {
|
|
106
|
+
const now = Date.now();
|
|
107
|
+
this.#sqlite
|
|
108
|
+
.prepare("update status_event_plans set status = 'running', updated_at = ? where id = ?")
|
|
109
|
+
.run(now, id);
|
|
110
|
+
}
|
|
111
|
+
markCompleted(id) {
|
|
112
|
+
const now = Date.now();
|
|
113
|
+
this.#sqlite
|
|
114
|
+
.prepare("update status_event_plans set status = 'completed', updated_at = ? where id = ?")
|
|
115
|
+
.run(now, id);
|
|
116
|
+
}
|
|
117
|
+
markCancelled(id) {
|
|
118
|
+
const now = Date.now();
|
|
119
|
+
this.#sqlite
|
|
120
|
+
.prepare("update status_event_plans set status = 'cancelled', updated_at = ? where id = ?")
|
|
121
|
+
.run(now, id);
|
|
122
|
+
}
|
|
123
|
+
markRetry(id, error) {
|
|
124
|
+
const now = Date.now();
|
|
125
|
+
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
126
|
+
const current = this.get(id);
|
|
127
|
+
const attempts = current.attempts + 1;
|
|
128
|
+
const newStatus = attempts >= STATUS_PLAN_MAX_ATTEMPTS ? "failed" : "pending";
|
|
129
|
+
this.#sqlite
|
|
130
|
+
.prepare("update status_event_plans set attempts = ?, status = ?, last_error = ?, updated_at = ? where id = ?")
|
|
131
|
+
.run(attempts, newStatus, errorMessage, now, id);
|
|
132
|
+
}
|
|
133
|
+
/**
|
|
134
|
+
* Purges settled plans (completed/cancelled/failed) whose updated_at is
|
|
135
|
+
* older than ageMs. Pending and running rows are never touched: they are
|
|
136
|
+
* still owned by the drain/retry cycle.
|
|
137
|
+
*/
|
|
138
|
+
deleteSettledOlderThan(ageMs) {
|
|
139
|
+
const cutoff = Date.now() - ageMs;
|
|
140
|
+
const result = this.#sqlite
|
|
141
|
+
.prepare(`delete from status_event_plans
|
|
142
|
+
where status in ('completed', 'cancelled', 'failed') and updated_at < ?`)
|
|
143
|
+
.run(cutoff);
|
|
144
|
+
return Number(result.changes);
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
//# sourceMappingURL=status-event-plans.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"status-event-plans.js","sourceRoot":"","sources":["../../../src/db/status-event-plans.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,10 @@ export type HerdrPaneIdentity = {
|
|
|
3
3
|
paneId: string;
|
|
4
4
|
terminalId: string;
|
|
5
5
|
workspaceId: string;
|
|
6
|
+
agent?: string;
|
|
7
|
+
cwd?: string;
|
|
8
|
+
foregroundCwd?: string;
|
|
9
|
+
tabId?: string;
|
|
6
10
|
};
|
|
7
11
|
type PaneClient = Pick<HerdrSocketClient, "close" | "getPane">;
|
|
8
12
|
export declare function resolveHerdrPaneIdentity(input: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pane-identity-resolver.d.ts","sourceRoot":"","sources":["../../../src/herdr/pane-identity-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"pane-identity-resolver.d.ts","sourceRoot":"","sources":["../../../src/herdr/pane-identity-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,KAAK,UAAU,GAAG,IAAI,CAAC,iBAAiB,EAAE,OAAO,GAAG,SAAS,CAAC,CAAC;AAE/D,wBAAsB,wBAAwB,CAAC,KAAK,EAAE;IACpD,aAAa,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,UAAU,CAAC;IACnD,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CA6B7B"}
|
|
@@ -12,7 +12,19 @@ export async function resolveHerdrPaneIdentity(input) {
|
|
|
12
12
|
if (!paneId || !terminalId || !workspaceId) {
|
|
13
13
|
throw new Error("Herdr pane response has no terminal identity");
|
|
14
14
|
}
|
|
15
|
-
|
|
15
|
+
const agent = stringField(pane, "agent", "agent");
|
|
16
|
+
const cwd = stringField(pane, "cwd", "cwd");
|
|
17
|
+
const foregroundCwd = stringField(pane, "foreground_cwd", "foregroundCwd");
|
|
18
|
+
const tabId = stringField(pane, "tab_id", "tabId");
|
|
19
|
+
return {
|
|
20
|
+
paneId,
|
|
21
|
+
terminalId,
|
|
22
|
+
workspaceId,
|
|
23
|
+
...(agent ? { agent } : {}),
|
|
24
|
+
...(cwd ? { cwd } : {}),
|
|
25
|
+
...(foregroundCwd ? { foregroundCwd } : {}),
|
|
26
|
+
...(tabId ? { tabId } : {}),
|
|
27
|
+
};
|
|
16
28
|
}
|
|
17
29
|
finally {
|
|
18
30
|
client.close();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pane-identity-resolver.js","sourceRoot":"","sources":["../../../src/herdr/pane-identity-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"pane-identity-resolver.js","sourceRoot":"","sources":["../../../src/herdr/pane-identity-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAc7D,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAAC,KAI9C;IACC,MAAM,MAAM,GAAG,KAAK,CAAC,aAAa;QAChC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,UAAU,CAAC;QACvC,CAAC,CAAC,IAAI,iBAAiB,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC;IAC5D,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;QAC/D,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;QAChC,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;QACtD,MAAM,UAAU,GAAG,WAAW,CAAC,IAAI,EAAE,aAAa,EAAE,YAAY,CAAC,CAAC;QAClE,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;QACrE,IAAI,CAAC,MAAM,IAAI,CAAC,UAAU,IAAI,CAAC,WAAW,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;QAClE,CAAC;QACD,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAClD,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAC5C,MAAM,aAAa,GAAG,WAAW,CAAC,IAAI,EAAE,gBAAgB,EAAE,eAAe,CAAC,CAAC;QAC3E,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QACnD,OAAO;YACL,MAAM;YACN,UAAU;YACV,WAAW;YACX,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3B,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACvB,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3C,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC5B,CAAC;IACJ,CAAC;YAAS,CAAC;QACT,MAAM,CAAC,KAAK,EAAE,CAAC;IACjB,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,KAAc;IAChC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACrE,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;IACxB,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;AACvC,CAAC;AAED,SAAS,WAAW,CAClB,KAA8B,EAC9B,SAAiB,EACjB,SAAiB;IAEjB,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC;IACnD,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AAC3E,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,CAAC;AACrD,CAAC"}
|
|
@@ -2,6 +2,8 @@ export type HerdrRequestId = string;
|
|
|
2
2
|
export type HerdrSocketClientOptions = {
|
|
3
3
|
socketPath: string;
|
|
4
4
|
};
|
|
5
|
+
/** Session-wide topology events that must be subscribed even when no pane ids are known yet. */
|
|
6
|
+
export declare const HERDR_TOPOLOGY_EVENT_TYPES: readonly ["pane.created", "pane.closed", "pane.moved", "pane.agent_detected", "workspace.closed"];
|
|
5
7
|
export declare class HerdrSocketClient {
|
|
6
8
|
#private;
|
|
7
9
|
constructor(options: HerdrSocketClientOptions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket-client.d.ts","sourceRoot":"","sources":["../../../src/herdr/socket-client.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC;AAEpC,MAAM,MAAM,wBAAwB,GAAG;IACrC,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAsBF,qBAAa,iBAAiB;;
|
|
1
|
+
{"version":3,"file":"socket-client.d.ts","sourceRoot":"","sources":["../../../src/herdr/socket-client.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC;AAEpC,MAAM,MAAM,wBAAwB,GAAG;IACrC,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAsBF,gGAAgG;AAChG,eAAO,MAAM,0BAA0B,mGAM7B,CAAC;AAEX,qBAAa,iBAAiB;;gBAShB,OAAO,EAAE,wBAAwB;IAQ7C,KAAK,IAAI,IAAI;IAgCb,OAAO,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAIhD,eAAe,IAAI,OAAO,CAAC,OAAO,CAAC;IAgClC,eAAe,CACpB,MAAM,GAAE;QAAE,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;KAAO,EACnC,OAAO,GAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAO,GACrC,aAAa,CAAC,OAAO,CAAC;CA8I1B"}
|
|
@@ -1,11 +1,20 @@
|
|
|
1
1
|
import { createConnection } from "node:net";
|
|
2
2
|
import { encodeJsonLine, JsonLineDecoder } from "../shared/json-lines.js";
|
|
3
|
+
/** Session-wide topology events that must be subscribed even when no pane ids are known yet. */
|
|
4
|
+
export const HERDR_TOPOLOGY_EVENT_TYPES = [
|
|
5
|
+
"pane.created",
|
|
6
|
+
"pane.closed",
|
|
7
|
+
"pane.moved",
|
|
8
|
+
"pane.agent_detected",
|
|
9
|
+
"workspace.closed",
|
|
10
|
+
];
|
|
3
11
|
export class HerdrSocketClient {
|
|
4
12
|
#decoder = new JsonLineDecoder();
|
|
5
13
|
#pending = new Map();
|
|
6
14
|
#subscribers = new Set();
|
|
7
15
|
#socket;
|
|
8
16
|
#socketPath;
|
|
17
|
+
#eventsSubscribed = false;
|
|
9
18
|
#nextId = 1;
|
|
10
19
|
constructor(options) {
|
|
11
20
|
this.#socketPath = options.socketPath;
|
|
@@ -17,11 +26,30 @@ export class HerdrSocketClient {
|
|
|
17
26
|
close() {
|
|
18
27
|
this.#socket.destroy();
|
|
19
28
|
}
|
|
20
|
-
#request(method, params = {}) {
|
|
29
|
+
#request(method, params = {}, signal) {
|
|
30
|
+
if (signal?.aborted) {
|
|
31
|
+
return Promise.reject(new Error("Herdr request aborted"));
|
|
32
|
+
}
|
|
21
33
|
const id = `herdsman-${this.#nextId}`;
|
|
22
34
|
this.#nextId += 1;
|
|
23
35
|
return new Promise((resolve, reject) => {
|
|
24
|
-
|
|
36
|
+
const onAbort = () => {
|
|
37
|
+
if (!this.#pending.has(id))
|
|
38
|
+
return;
|
|
39
|
+
this.#pending.delete(id);
|
|
40
|
+
reject(new Error("Herdr request aborted"));
|
|
41
|
+
};
|
|
42
|
+
this.#pending.set(id, {
|
|
43
|
+
reject: (error) => {
|
|
44
|
+
signal?.removeEventListener("abort", onAbort);
|
|
45
|
+
reject(error);
|
|
46
|
+
},
|
|
47
|
+
resolve: (value) => {
|
|
48
|
+
signal?.removeEventListener("abort", onAbort);
|
|
49
|
+
resolve(value);
|
|
50
|
+
},
|
|
51
|
+
});
|
|
52
|
+
signal?.addEventListener("abort", onAbort, { once: true });
|
|
25
53
|
this.#socket.write(encodeJsonLine({ id, method, params }));
|
|
26
54
|
});
|
|
27
55
|
}
|
|
@@ -59,6 +87,11 @@ export class HerdrSocketClient {
|
|
|
59
87
|
};
|
|
60
88
|
}
|
|
61
89
|
async *subscribeEvents(params = {}, options = {}) {
|
|
90
|
+
// Herdr 0.9 / protocol 22 ACKs the first events.subscribe, then resets the
|
|
91
|
+
// socket if the same connection sends it again. Never re-subscribe here.
|
|
92
|
+
if (this.#eventsSubscribed) {
|
|
93
|
+
throw new Error("Herdr connection already has an events.subscribe");
|
|
94
|
+
}
|
|
62
95
|
const queue = [];
|
|
63
96
|
let failure;
|
|
64
97
|
let wake;
|
|
@@ -76,30 +109,41 @@ export class HerdrSocketClient {
|
|
|
76
109
|
};
|
|
77
110
|
if (options.signal?.aborted)
|
|
78
111
|
return;
|
|
112
|
+
this.#eventsSubscribed = true;
|
|
79
113
|
this.#subscribers.add(subscriber);
|
|
80
114
|
try {
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
115
|
+
try {
|
|
116
|
+
await this.#request("events.subscribe", {
|
|
117
|
+
subscriptions: [
|
|
118
|
+
...HERDR_TOPOLOGY_EVENT_TYPES.map((type) => ({ type })),
|
|
119
|
+
...(params.paneIds ?? []).map((pane_id) => ({
|
|
120
|
+
pane_id,
|
|
121
|
+
type: "pane.agent_status_changed",
|
|
122
|
+
})),
|
|
123
|
+
],
|
|
124
|
+
}, options.signal);
|
|
125
|
+
}
|
|
126
|
+
catch (error) {
|
|
127
|
+
if (!options.signal?.aborted)
|
|
128
|
+
throw error;
|
|
129
|
+
}
|
|
130
|
+
// Drain events already queued before honoring abort so a restart does
|
|
131
|
+
// not drop status already received for panes this connection subscribed
|
|
132
|
+
// to. New panes are not visible here: herdr only emits
|
|
133
|
+
// pane.agent_status_changed for pane-specific subscriptions.
|
|
134
|
+
while (true) {
|
|
98
135
|
if (failure)
|
|
99
136
|
throw failure;
|
|
100
|
-
|
|
137
|
+
if (queue.length > 0) {
|
|
101
138
|
yield queue.shift();
|
|
139
|
+
continue;
|
|
102
140
|
}
|
|
141
|
+
if (options.signal?.aborted)
|
|
142
|
+
return;
|
|
143
|
+
await new Promise((resolve) => {
|
|
144
|
+
wake = resolve;
|
|
145
|
+
options.signal?.addEventListener("abort", () => resolve(), { once: true });
|
|
146
|
+
});
|
|
103
147
|
}
|
|
104
148
|
}
|
|
105
149
|
finally {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket-client.js","sourceRoot":"","sources":["../../../src/herdr/socket-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAe,MAAM,UAAU,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AA4BzE,MAAM,OAAO,iBAAiB;IACnB,QAAQ,GAAG,IAAI,eAAe,EAAE,CAAC;IACjC,QAAQ,GAAG,IAAI,GAAG,EAAkC,CAAC;IACrD,YAAY,GAAG,IAAI,GAAG,EAAmB,CAAC;IAC1C,OAAO,CAAS;IAChB,WAAW,CAAS;IAC7B,OAAO,GAAG,CAAC,CAAC;IAEZ,YAAY,OAAiC;QAC3C,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;QACtC,IAAI,CAAC,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACpD,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;QAC5D,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;QAC5D,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IACpF,CAAC;IAED,KAAK;QACH,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IACzB,CAAC;IAED,QAAQ,CAAC,MAAc,EAAE,SAAkB,EAAE;
|
|
1
|
+
{"version":3,"file":"socket-client.js","sourceRoot":"","sources":["../../../src/herdr/socket-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-context-service.d.ts","sourceRoot":"","sources":["../../../src/observability/agent-context-service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"agent-context-service.d.ts","sourceRoot":"","sources":["../../../src/observability/agent-context-service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAGtE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AACjF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,KAAK,EACV,0BAA0B,EAG1B,gBAAgB,EAChB,aAAa,EACb,eAAe,EACf,UAAU,EACV,6BAA6B,EAE9B,MAAM,gBAAgB,CAAC;AAExB,MAAM,MAAM,wBAAwB,GAAG;IACrC,KAAK,EAAE,gBAAgB,CAAC;IACxB,eAAe,EAAE,OAAO,CAAC;IACzB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,oBAAoB,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAC5C,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,0BAA0B,CAAC;CACtC,CAAC;AAEF,qBAAa,mBAAmB;;gBAQlB,OAAO,EAAE;QACnB,OAAO,EAAE,mBAAmB,CAAC;QAC7B,MAAM,EAAE;YACN,qBAAqB,EAAE,yBAAyB,CAAC;YACjD,MAAM,EAAE,UAAU,CAAC;SACpB,CAAC;KACH;IAKK,YAAY,CAAC,KAAK,EAAE,wBAAwB,GAAG,OAAO,CAAC,yBAAyB,CAAC;IA+CvF,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,0BAA0B,GAAG,SAAS;IAIzE,UAAU,CAAC,KAAK,EAAE,eAAe,GAAG,aAAa,EAAE;IAUnD,iBAAiB,CACf,KAAK,EAAE,UAAU,GAAG;QAAE,iBAAiB,EAAE,MAAM,CAAA;KAAE,GAChD,6BAA6B,GAAG,IAAI;CAsBxC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { stat } from "node:fs/promises";
|
|
2
1
|
import { historySourceFromSessionRef } from "../agent-history/discovery.js";
|
|
3
2
|
import { emptyCompactHistory } from "../agent-history/service.js";
|
|
3
|
+
import { statSourceFingerprint } from "../agent-history/source-fingerprint.js";
|
|
4
4
|
export class AgentContextService {
|
|
5
5
|
#history;
|
|
6
6
|
#stores;
|
|
@@ -89,7 +89,7 @@ async function shouldForceDiscovery(input) {
|
|
|
89
89
|
const fingerprint = input.previous.sourceFingerprint;
|
|
90
90
|
if (!fingerprint)
|
|
91
91
|
return true;
|
|
92
|
-
const current = await
|
|
92
|
+
const current = await statSourceFingerprint(fingerprint.path);
|
|
93
93
|
return !current || sameFingerprint(fingerprint, current);
|
|
94
94
|
}
|
|
95
95
|
function pathHistoryRefFromAgent(agent) {
|
|
@@ -145,16 +145,13 @@ function historyLookup(agent, agents, occupiedSessionPaths) {
|
|
|
145
145
|
cwd: agent.cwd,
|
|
146
146
|
firstSeenAtMs: agent.firstSeenAt.getTime(),
|
|
147
147
|
foregroundCwd: agent.foregroundCwd,
|
|
148
|
+
herdrSessionName: agent.herdrSessionName,
|
|
148
149
|
...(agent.agent?.toLowerCase() === "grok" && agent.grokHome
|
|
149
150
|
? { grokHome: agent.grokHome }
|
|
150
151
|
: {}),
|
|
151
152
|
occupiedSessionPaths: occupiedSessionPaths ?? occupiedForAgent(agent, agents),
|
|
152
153
|
};
|
|
153
154
|
}
|
|
154
|
-
async function sourceFingerprint(path) {
|
|
155
|
-
const source = await stat(path).catch(() => null);
|
|
156
|
-
return source ? { mtimeMs: Math.trunc(source.mtimeMs), path, size: source.size } : null;
|
|
157
|
-
}
|
|
158
155
|
function paneRevisionIncreased(current, previous) {
|
|
159
156
|
return current !== null && previous !== null && current > previous;
|
|
160
157
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-context-service.js","sourceRoot":"","sources":["../../../src/observability/agent-context-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"agent-context-service.js","sourceRoot":"","sources":["../../../src/observability/agent-context-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,19 @@
|
|
|
1
|
+
import type { DatabaseSync } from "node:sqlite";
|
|
1
2
|
import { type AgentHistoryService } from "../agent-history/service.js";
|
|
2
|
-
import type
|
|
3
|
+
import { type AgentEventStore } from "../db/agent-events.js";
|
|
3
4
|
import type { AgentHistoryCacheStore } from "../db/agent-history-cache.js";
|
|
4
5
|
import type { AgentOrchestratorScopeStore } from "../db/agent-orchestrator-scopes.js";
|
|
5
6
|
import type { AgentStore } from "../db/agents.js";
|
|
6
7
|
import type { HerdrSessionStore } from "../db/herdr-sessions.js";
|
|
7
8
|
import type { HerdrWorkspaceStore } from "../db/herdr-workspaces.js";
|
|
9
|
+
import type { StatusEventPlanStore } from "../db/status-event-plans.js";
|
|
8
10
|
import { HerdrSocketClient } from "../herdr/socket-client.js";
|
|
9
11
|
import { AgentContextService } from "../observability/agent-context-service.js";
|
|
10
|
-
import { type AgentEventRecord, type AgentIndexRecord, type AgentScope, type AgentSessionRef } from "../observability/contracts.js";
|
|
12
|
+
import { type AgentEventRecord, type AgentIndexRecord, type AgentScope, type AgentSessionRef, type AgentStatus, type CompactAgentHistory } from "../observability/contracts.js";
|
|
11
13
|
import type { TurnCompletionRegistry } from "../observability/turn-completion.js";
|
|
14
|
+
export declare function historyHasAdvanced(current: CompactAgentHistory, baseline: CompactAgentHistory | null | undefined, options?: {
|
|
15
|
+
requireAssistantChange?: boolean | undefined;
|
|
16
|
+
}): boolean;
|
|
12
17
|
export type AgentIndexRefreshResult = {
|
|
13
18
|
agents: AgentIndexRecord[];
|
|
14
19
|
contextChangedScopes: AgentScope[];
|
|
@@ -30,30 +35,70 @@ export type AgentIndexServiceStores = {
|
|
|
30
35
|
agents: AgentStore;
|
|
31
36
|
herdrSessions: HerdrSessionStore;
|
|
32
37
|
herdrWorkspaces: HerdrWorkspaceStore;
|
|
38
|
+
sqlite: DatabaseSync;
|
|
39
|
+
statusEventPlans: StatusEventPlanStore;
|
|
33
40
|
};
|
|
34
41
|
type RefreshInput = {
|
|
35
42
|
herdrSessionName: string;
|
|
36
43
|
sessionDir: string;
|
|
37
44
|
socketPath: string;
|
|
38
45
|
};
|
|
46
|
+
export type StatusEventPlan = {
|
|
47
|
+
agent: AgentIndexRecord;
|
|
48
|
+
attempts?: number;
|
|
49
|
+
compactHistory: CompactAgentHistory | undefined;
|
|
50
|
+
from: AgentStatus;
|
|
51
|
+
herdrEventKey?: string;
|
|
52
|
+
planId?: number;
|
|
53
|
+
to: AgentStatus;
|
|
54
|
+
};
|
|
55
|
+
export declare const PLAN_WAITING_HISTORY = "PLAN_WAITING_HISTORY";
|
|
56
|
+
export declare class PlanWaitingHistoryError extends Error {
|
|
57
|
+
constructor();
|
|
58
|
+
}
|
|
59
|
+
export type AgentIndexRefreshFastResult = {
|
|
60
|
+
agents: AgentIndexRecord[];
|
|
61
|
+
contextChangedScopes: AgentScope[];
|
|
62
|
+
events: AgentEventRecord[];
|
|
63
|
+
statusEventPlans: StatusEventPlan[];
|
|
64
|
+
};
|
|
65
|
+
export type AgentEventHandlingFastResult = {
|
|
66
|
+
contextChangedScopes: AgentScope[];
|
|
67
|
+
events: AgentEventRecord[];
|
|
68
|
+
statusEventPlans: StatusEventPlan[];
|
|
69
|
+
};
|
|
39
70
|
export declare class AgentIndexService {
|
|
40
71
|
#private;
|
|
41
72
|
constructor(options: {
|
|
73
|
+
clearRetry?: (timer: unknown) => void;
|
|
42
74
|
clientFactory?: (input: {
|
|
43
75
|
socketPath: string;
|
|
44
76
|
}) => Pick<HerdrSocketClient, "close" | "sessionSnapshot">;
|
|
45
77
|
context?: AgentContextService;
|
|
46
78
|
history?: AgentHistoryService;
|
|
79
|
+
scheduleRetry?: (callback: () => void, delayMs: number) => unknown;
|
|
80
|
+
sleep?: (ms: number, signal?: AbortSignal) => Promise<void>;
|
|
47
81
|
stores: AgentIndexServiceStores;
|
|
48
82
|
turnCompletions?: TurnCompletionRegistry;
|
|
49
83
|
});
|
|
84
|
+
refreshHerdrSessionFast(input: RefreshInput): Promise<AgentIndexRefreshFastResult>;
|
|
50
85
|
refreshHerdrSession(input: RefreshInput): Promise<AgentIndexRefreshResult>;
|
|
86
|
+
handleHerdrEventFast(input: {
|
|
87
|
+
event: unknown;
|
|
88
|
+
herdrSessionName: string;
|
|
89
|
+
sessionDir: string;
|
|
90
|
+
socketPath: string;
|
|
91
|
+
}): Promise<AgentEventHandlingFastResult>;
|
|
51
92
|
handleHerdrEvent(input: {
|
|
52
93
|
event: unknown;
|
|
53
94
|
herdrSessionName: string;
|
|
54
95
|
sessionDir: string;
|
|
55
96
|
socketPath: string;
|
|
56
97
|
}): Promise<AgentEventHandlingResult>;
|
|
98
|
+
stopWaitingHistoryRetries(): void;
|
|
99
|
+
drainInFlightPlans(): Promise<void>;
|
|
100
|
+
executeStatusEventPlan(plan: StatusEventPlan): Promise<AgentEventRecord | undefined>;
|
|
101
|
+
drainPendingPlans(): Promise<void>;
|
|
57
102
|
registerPiSessionRef(input: {
|
|
58
103
|
herdrSessionName: string;
|
|
59
104
|
sessionRef: AgentSessionRef;
|