Skip to content

Commit 4c3cf95

Browse files
fix: count the local connections the engine shadows
The precedence row summed served capabilities; it now reports the registry connections whose type the engine serves, the count the inventory line uses, and re-reports when that count moves. Co-Authored-By: Claude Fable 5.1 <[email protected]> Claude-Session: https://claude.ai/code/session_011AhtJPr3nmT1Po92ZQk4VE
1 parent f2bb0a0 commit 4c3cf95

4 files changed

Lines changed: 22 additions & 19 deletions

File tree

‎packages/opencode/src/altimate/workspace/engine-telemetry.ts‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -140,22 +140,19 @@ export function precedenceSignature(
140140

141141
export function precedenceEvent(
142142
p: Pick<Precedence, "enabled" | "disabledReason" | "shadowed" | "extensions" | "workspaceId">,
143-
escapeHatch: boolean,
144-
sessionID?: string,
143+
opts: { escapeHatch: boolean; connections: number; sessionID?: string },
145144
): Telemetry.Event {
146145
const id = Number(p.workspaceId)
147-
let connections = 0
148-
for (const caps of p.shadowed.values()) connections += caps.size
149146
return {
150147
type: "workspace_engine_precedence",
151148
timestamp: Date.now(),
152-
session_id: sessionID ?? sessionId(),
149+
session_id: opts.sessionID ?? sessionId(),
153150
enabled: p.enabled,
154151
...(p.disabledReason ? { reason: p.disabledReason } : {}),
155152
shadowed_types: p.shadowed.size,
156-
shadowed_connections: connections,
153+
shadowed_connections: opts.connections,
157154
extensions: p.extensions?.length ?? 0,
158-
escape_hatch: escapeHatch,
155+
escape_hatch: opts.escapeHatch,
159156
...(Number.isInteger(id) && id > 0 ? { workspace_id: id } : {}),
160157
}
161158
}
@@ -168,14 +165,16 @@ const MAX_SEEN_SESSIONS = 256
168165
export function trackPrecedence(
169166
sessionID: string,
170167
p: Pick<Precedence, "enabled" | "disabledReason" | "shadowed" | "extensions" | "workspaceId">,
171-
escapeHatch: boolean,
168+
opts: { escapeHatch: boolean; connections: number },
172169
): boolean {
173170
try {
174-
const signature = precedenceSignature(p)
171+
// The local connections shadowed are part of what is reported, so a registry change that
172+
// moves the count re-reports the same snapshot.
173+
const signature = `${precedenceSignature(p)}|c=${opts.connections}`
175174
if (precedenceSeen.get(sessionID) === signature) return false
176175
precedenceSeen.set(sessionID, signature)
177176
if (precedenceSeen.size > MAX_SEEN_SESSIONS) precedenceSeen.delete(precedenceSeen.keys().next().value!)
178-
Telemetry.track(precedenceEvent(p, escapeHatch, sessionID))
177+
Telemetry.track(precedenceEvent(p, { ...opts, sessionID }))
179178
return true
180179
} catch {
181180
return false

‎packages/opencode/src/altimate/workspace/precedence.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,8 @@ export async function refresh(
538538
}
539539
if (ruleset) result.ruleset = ruleset
540540
remember(sessionID, result)
541-
trackPrecedence(sessionID, result, escapeHatchOn()) // telemetry: only when the snapshot changed
541+
// telemetry: only when the snapshot (or the local connections it shadows) changed
542+
trackPrecedence(sessionID, result, { escapeHatch: escapeHatchOn(), connections: countShadowedConnections(result) })
542543
// Mechanism 6 — say once, per session, what is now served where. Silence is the one
543544
// thing this design does not allow, but repeating it every turn would be noise.
544545
// A session that never had routing is told nothing — there is nothing to say. But a
@@ -1145,7 +1146,7 @@ export function inventoryLine(precedence: Precedence): string {
11451146
return `Workspace integrations — ${parts.join("; ")}. ${shadowedCount} local connection${shadowedCount === 1 ? "" : "s"} shadowed.`
11461147
}
11471148

1148-
function countShadowedConnections(precedence: Precedence): number {
1149+
export function countShadowedConnections(precedence: Precedence): number {
11491150
try {
11501151
return Registry.list().warehouses.filter((w) => {
11511152
const type = canonicalType(w.type)

‎packages/opencode/test/altimate/workspace/engine-telemetry.test.ts‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,22 +108,23 @@ describe("workspace engine telemetry builders", () => {
108108
["dbt", new Map([["dbt_run", {} as any]])],
109109
])
110110
const on: any = { enabled: true, shadowed, extensions: [{ integration: "x", tools: [] }], workspaceId: "7" }
111-
expect(precedenceEvent(on, false)).toEqual(
111+
expect(precedenceEvent(on, { escapeHatch: false, connections: 1 })).toEqual(
112112
expect.objectContaining({
113113
type: "workspace_engine_precedence",
114114
enabled: true,
115115
shadowed_types: 2,
116-
shadowed_connections: 3,
116+
shadowed_connections: 1,
117117
extensions: 1,
118118
escape_hatch: false,
119119
workspace_id: 7,
120120
}),
121121
)
122-
expect(trackPrecedence("s1", on, false)).toBe(true)
123-
expect(trackPrecedence("s1", on, false)).toBe(false) // unchanged
124-
expect(trackPrecedence("s2", on, false)).toBe(true) // another session
122+
expect(trackPrecedence("s1", on, { escapeHatch: false, connections: 1 })).toBe(true)
123+
expect(trackPrecedence("s1", on, { escapeHatch: false, connections: 1 })).toBe(false) // unchanged
124+
expect(trackPrecedence("s1", on, { escapeHatch: false, connections: 2 })).toBe(true) // a connection was added locally
125+
expect(trackPrecedence("s2", on, { escapeHatch: false, connections: 2 })).toBe(true) // another session
125126
const off: any = { enabled: false, disabledReason: "escape-hatch" as const, shadowed: new Map(), workspaceId: "7" }
126-
expect(trackPrecedence("s1", off, true)).toBe(true)
127+
expect(trackPrecedence("s1", off, { escapeHatch: true, connections: 0 })).toBe(true)
127128
expect(events.at(-1)).toEqual(
128129
expect.objectContaining({ enabled: false, reason: "escape-hatch", shadowed_types: 0, escape_hatch: true }),
129130
)

‎packages/opencode/test/altimate/workspace/precedence.test.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1418,7 +1418,9 @@ describe("telemetry — the precedence snapshot", () => {
14181418
expect(snapshots()).toEqual([
14191419
expect.objectContaining({ enabled: true, shadowed_types: 1, escape_hatch: false, workspace_id: 42 }),
14201420
])
1421-
expect(snapshots()[0].shadowed_connections).toBeGreaterThan(0)
1421+
// One local snowflake connection in the fixture registry is shadowed; the four served
1422+
// capabilities are not what is counted.
1423+
expect(snapshots()[0].shadowed_connections).toBe(1)
14221424
await refresh(SESSION, {})
14231425
expect(snapshots().at(-1)).toEqual(
14241426
expect.objectContaining({ enabled: false, reason: "nothing-materialised", shadowed_types: 0 }),

0 commit comments

Comments
 (0)