@indigoai-us/hq-cloud 6.3.1 → 6.3.3
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/cli/sync.js +43 -1
- package/dist/cli/sync.js.map +1 -1
- package/dist/cli/sync.test.js +98 -0
- package/dist/cli/sync.test.js.map +1 -1
- package/dist/skill-telemetry.d.ts +42 -6
- package/dist/skill-telemetry.d.ts.map +1 -1
- package/dist/skill-telemetry.js +253 -10
- package/dist/skill-telemetry.js.map +1 -1
- package/dist/skill-telemetry.test.js +287 -1
- package/dist/skill-telemetry.test.js.map +1 -1
- package/package.json +1 -1
- package/src/cli/sync.test.ts +114 -0
- package/src/cli/sync.ts +43 -1
- package/src/skill-telemetry.test.ts +433 -0
- package/src/skill-telemetry.ts +260 -10
|
@@ -2,7 +2,7 @@ import { describe, it, expect } from "vitest";
|
|
|
2
2
|
import { promises as fs } from "node:fs";
|
|
3
3
|
import * as os from "node:os";
|
|
4
4
|
import * as path from "node:path";
|
|
5
|
-
import { extractSkillEvents, extractCodexSkillEvents, parseCodexSessionMeta, collectAndSendSkillTelemetry, } from "./skill-telemetry.js";
|
|
5
|
+
import { extractSkillEvents, extractCodexSkillEvents, extractCodexSkillToolEvents, codexRowTurnId, parseCodexSessionMeta, collectAndSendSkillTelemetry, } from "./skill-telemetry.js";
|
|
6
6
|
describe("extractSkillEvents", () => {
|
|
7
7
|
it("extracts a user-typed slash command with args", () => {
|
|
8
8
|
const row = {
|
|
@@ -140,6 +140,145 @@ describe("extractCodexSkillEvents (Codex CLI rollouts)", () => {
|
|
|
140
140
|
expect(parseCodexSessionMeta(null)).toBeNull();
|
|
141
141
|
});
|
|
142
142
|
});
|
|
143
|
+
describe("extractCodexSkillToolEvents (Codex model-driven SKILL.md reads)", () => {
|
|
144
|
+
const ctx = { sessionId: "sess-x", cwd: "/home/ec2-user/hq" };
|
|
145
|
+
// Codex surfaces a completed exec as `exec_command_end` with `command` as
|
|
146
|
+
// `["/bin/zsh","-lc","<cmd>"]`, a `turn_id`, the run `cwd`, and a `parsed_cmd`
|
|
147
|
+
// it tags `type: "read"` for inspection commands.
|
|
148
|
+
function execEnd(cmd, over = {}) {
|
|
149
|
+
return {
|
|
150
|
+
timestamp: "2026-04-27T07:51:30.395Z",
|
|
151
|
+
type: "event_msg",
|
|
152
|
+
payload: {
|
|
153
|
+
type: "exec_command_end",
|
|
154
|
+
call_id: "call_1",
|
|
155
|
+
turn_id: "turn-A",
|
|
156
|
+
command: ["/bin/zsh", "-lc", cmd],
|
|
157
|
+
cwd: "/home/ec2-user/hq",
|
|
158
|
+
parsed_cmd: [{ type: "read", cmd }],
|
|
159
|
+
...over,
|
|
160
|
+
},
|
|
161
|
+
};
|
|
162
|
+
}
|
|
163
|
+
it("extracts a skill load from a sed read of SKILL.md, tagged source:model", () => {
|
|
164
|
+
const ev = extractCodexSkillToolEvents(execEnd("sed -n '1,240p' .agents/skills/learn/SKILL.md"), ctx);
|
|
165
|
+
expect(ev).toEqual([
|
|
166
|
+
{
|
|
167
|
+
skill: "learn",
|
|
168
|
+
source: "model",
|
|
169
|
+
sessionId: "sess-x",
|
|
170
|
+
timestamp: "2026-04-27T07:51:30.395Z",
|
|
171
|
+
cwd: "/home/ec2-user/hq",
|
|
172
|
+
uuid: "codex:skill:sess-x:turn-A:learn",
|
|
173
|
+
hasArgs: false,
|
|
174
|
+
},
|
|
175
|
+
]);
|
|
176
|
+
});
|
|
177
|
+
it("captures the directory above SKILL.md as the skill name, even when nested (bridge layout)", () => {
|
|
178
|
+
const ev = extractCodexSkillToolEvents(execEnd("rg -n description /Users/me/.codex/skills/hq/indigo:hello-world/SKILL.md"), ctx)[0];
|
|
179
|
+
// skills/hq/<name>/SKILL.md → <name>, not "hq".
|
|
180
|
+
expect(ev.skill).toBe("indigo:hello-world");
|
|
181
|
+
expect(ev.source).toBe("model");
|
|
182
|
+
});
|
|
183
|
+
it("absolute and relative SKILL.md paths both resolve", () => {
|
|
184
|
+
expect(extractCodexSkillToolEvents(execEnd("cat /abs/path/.agents/skills/quiz/SKILL.md"), ctx)[0].skill).toBe("quiz");
|
|
185
|
+
expect(extractCodexSkillToolEvents(execEnd("nl -ba .agents/skills/summary/SKILL.md"), ctx)[0].skill).toBe("summary");
|
|
186
|
+
});
|
|
187
|
+
it("dedups a turn's repeated reads of the same skill via the shared seen set", () => {
|
|
188
|
+
const seen = new Set();
|
|
189
|
+
const first = extractCodexSkillToolEvents(execEnd("sed -n '1,240p' .agents/skills/learn/SKILL.md"), ctx, seen);
|
|
190
|
+
const second = extractCodexSkillToolEvents(execEnd("rg -n 'frequency' .agents/skills/learn/SKILL.md"), ctx, seen);
|
|
191
|
+
expect(first).toHaveLength(1);
|
|
192
|
+
expect(second).toEqual([]); // same (session, turn, skill) → collapsed
|
|
193
|
+
});
|
|
194
|
+
it("does NOT dedup the same skill across different turns", () => {
|
|
195
|
+
const seen = new Set();
|
|
196
|
+
const a = extractCodexSkillToolEvents(execEnd("sed -n '1,240p' .agents/skills/learn/SKILL.md", { turn_id: "turn-A" }), ctx, seen);
|
|
197
|
+
const b = extractCodexSkillToolEvents(execEnd("sed -n '1,240p' .agents/skills/learn/SKILL.md", { turn_id: "turn-B" }), ctx, seen);
|
|
198
|
+
expect(a).toHaveLength(1);
|
|
199
|
+
expect(b).toHaveLength(1);
|
|
200
|
+
expect(b[0].uuid).toBe("codex:skill:sess-x:turn-B:learn");
|
|
201
|
+
});
|
|
202
|
+
it("excludes edits: parsed_cmd not a read, or a write redirect into SKILL.md", () => {
|
|
203
|
+
// Codex classifies the exec as something other than a read.
|
|
204
|
+
expect(extractCodexSkillToolEvents(execEnd("apply_patch .agents/skills/learn/SKILL.md", { parsed_cmd: [{ type: "write" }] }), ctx)).toEqual([]);
|
|
205
|
+
// A shell write into the skill file, even with a read verb elsewhere.
|
|
206
|
+
expect(extractCodexSkillToolEvents(execEnd("cat tmp > .agents/skills/learn/SKILL.md", { parsed_cmd: undefined }), ctx)).toEqual([]);
|
|
207
|
+
});
|
|
208
|
+
it("prefers the row cwd, falling back to session ctx cwd", () => {
|
|
209
|
+
expect(extractCodexSkillToolEvents(execEnd("sed -n '1,5p' .agents/skills/learn/SKILL.md", { cwd: "/home/ec2-user/hq/sub" }), ctx)[0].cwd).toBe("/home/ec2-user/hq/sub");
|
|
210
|
+
expect(extractCodexSkillToolEvents(execEnd("sed -n '1,5p' .agents/skills/learn/SKILL.md", { cwd: undefined }), ctx)[0].cwd).toBe(ctx.cwd);
|
|
211
|
+
});
|
|
212
|
+
it("uuid falls back to timestamp without a turn_id, and is omitted without a session", () => {
|
|
213
|
+
const noTurn = extractCodexSkillToolEvents(execEnd("sed -n '1,5p' .agents/skills/learn/SKILL.md", { turn_id: undefined }), ctx)[0];
|
|
214
|
+
expect(noTurn.uuid).toBe("codex:skill:sess-x:2026-04-27T07:51:30.395Z:learn");
|
|
215
|
+
const noSession = extractCodexSkillToolEvents(execEnd("sed -n '1,5p' .agents/skills/learn/SKILL.md"), {})[0];
|
|
216
|
+
expect(noSession.uuid).toBeUndefined();
|
|
217
|
+
});
|
|
218
|
+
it("ignores non-exec rows and execs that touch no SKILL.md", () => {
|
|
219
|
+
expect(extractCodexSkillToolEvents(execEnd("sed -n '1,5p' src/index.ts"), ctx)).toEqual([]);
|
|
220
|
+
expect(extractCodexSkillToolEvents({ type: "event_msg", payload: { type: "task_started" } }, ctx)).toEqual([]);
|
|
221
|
+
expect(extractCodexSkillToolEvents({ type: "event_msg", payload: { type: "user_message", message: "/deploy" } }, ctx)).toEqual([]);
|
|
222
|
+
expect(extractCodexSkillToolEvents(null, ctx)).toEqual([]);
|
|
223
|
+
});
|
|
224
|
+
// The OTHER exec shape some Codex CLI versions emit (observed on 0.128): a
|
|
225
|
+
// `response_item` `function_call` named `exec_command`, with the command +
|
|
226
|
+
// workdir in `arguments` (a JSON string) and NO turn_id/parsed_cmd on the row.
|
|
227
|
+
function fnCall(cmd, args = {}, over = {}) {
|
|
228
|
+
return {
|
|
229
|
+
timestamp: "2026-06-10T16:39:41.260Z",
|
|
230
|
+
type: "response_item",
|
|
231
|
+
payload: {
|
|
232
|
+
type: "function_call",
|
|
233
|
+
name: "exec_command",
|
|
234
|
+
call_id: "call_abc",
|
|
235
|
+
arguments: JSON.stringify({ cmd, workdir: "/home/ec2-user/hq", ...args }),
|
|
236
|
+
...over,
|
|
237
|
+
},
|
|
238
|
+
};
|
|
239
|
+
}
|
|
240
|
+
it("extracts a skill load from the function_call exec shape, turn from ctx", () => {
|
|
241
|
+
const ev = extractCodexSkillToolEvents(fnCall("sed -n '1,80p' .claude/skills/indigo:hello-world/SKILL.md"), { ...ctx, turnId: "turn-Z" });
|
|
242
|
+
expect(ev).toEqual([
|
|
243
|
+
{
|
|
244
|
+
skill: "indigo:hello-world",
|
|
245
|
+
source: "model",
|
|
246
|
+
sessionId: "sess-x",
|
|
247
|
+
timestamp: "2026-06-10T16:39:41.260Z",
|
|
248
|
+
cwd: "/home/ec2-user/hq", // from arguments.workdir
|
|
249
|
+
uuid: "codex:skill:sess-x:turn-Z:indigo:hello-world",
|
|
250
|
+
hasArgs: false,
|
|
251
|
+
},
|
|
252
|
+
]);
|
|
253
|
+
});
|
|
254
|
+
it("function_call: read-intent decided by command text (no parsed_cmd present)", () => {
|
|
255
|
+
// A read verb → counted.
|
|
256
|
+
expect(extractCodexSkillToolEvents(fnCall("wc -l .claude/skills/quiz/SKILL.md"), ctx)[0].skill).toBe("quiz");
|
|
257
|
+
// A write redirect into the skill file → excluded.
|
|
258
|
+
expect(extractCodexSkillToolEvents(fnCall("printf x > .claude/skills/quiz/SKILL.md"), ctx)).toEqual([]);
|
|
259
|
+
});
|
|
260
|
+
it("function_call: ignores non-exec tool names (e.g. apply_patch edits)", () => {
|
|
261
|
+
expect(extractCodexSkillToolEvents(fnCall("anything", {}, { name: "apply_patch" }), ctx)).toEqual([]);
|
|
262
|
+
});
|
|
263
|
+
it("function_call: falls back to ctx.cwd when arguments has no workdir", () => {
|
|
264
|
+
expect(extractCodexSkillToolEvents(fnCall("sed -n '1,5p' .agents/skills/learn/SKILL.md", { workdir: undefined }), ctx)[0].cwd).toBe(ctx.cwd);
|
|
265
|
+
});
|
|
266
|
+
it("dedups across the two exec shapes within one turn (no double count)", () => {
|
|
267
|
+
const seen = new Set();
|
|
268
|
+
// exec_command_end form for skill `learn` in turn-A …
|
|
269
|
+
const a = extractCodexSkillToolEvents(execEnd("sed -n '1,240p' .agents/skills/learn/SKILL.md", { turn_id: "turn-A" }), ctx, seen);
|
|
270
|
+
// … then the function_call form for the same skill in the same turn.
|
|
271
|
+
const b = extractCodexSkillToolEvents(fnCall("rg -n x .agents/skills/learn/SKILL.md"), { ...ctx, turnId: "turn-A" }, seen);
|
|
272
|
+
expect(a).toHaveLength(1);
|
|
273
|
+
expect(b).toEqual([]); // same (session, turn, skill) → collapsed
|
|
274
|
+
});
|
|
275
|
+
it("codexRowTurnId reads turn_id from a row's payload, else undefined", () => {
|
|
276
|
+
expect(codexRowTurnId({ type: "turn_context", payload: { turn_id: "turn-9" } })).toBe("turn-9");
|
|
277
|
+
expect(codexRowTurnId({ type: "event_msg", payload: { type: "exec_command_end", turn_id: "turn-7" } })).toBe("turn-7");
|
|
278
|
+
expect(codexRowTurnId({ type: "response_item", payload: { type: "function_call" } })).toBeUndefined();
|
|
279
|
+
expect(codexRowTurnId(null)).toBeUndefined();
|
|
280
|
+
});
|
|
281
|
+
});
|
|
143
282
|
describe("collectAndSendSkillTelemetry — hqRoot scoping", () => {
|
|
144
283
|
function stubClient(captured) {
|
|
145
284
|
return {
|
|
@@ -367,5 +506,152 @@ describe("collectAndSendSkillTelemetry — hqRoot scoping", () => {
|
|
|
367
506
|
expect(last.sessionId).toBe("sess-incr");
|
|
368
507
|
await fs.rm(tmp, { recursive: true, force: true });
|
|
369
508
|
});
|
|
509
|
+
// A Codex rollout that drives a skill the way the model actually does: by
|
|
510
|
+
// reading its SKILL.md via exec_command. `reads` is a list of
|
|
511
|
+
// [skill, turnId, cmdTail] tuples turned into exec_command_end rows.
|
|
512
|
+
function codexModelRollout(sessionId, cwd, reads) {
|
|
513
|
+
const lines = [
|
|
514
|
+
row({ timestamp: "2026-06-08T10:00:00.000Z", type: "session_meta", payload: { id: sessionId, cwd, originator: "codex_exec" } }),
|
|
515
|
+
...reads.map(([skill, turnId, extra], i) => row({
|
|
516
|
+
timestamp: `2026-06-08T10:0${i}:00.000Z`,
|
|
517
|
+
type: "event_msg",
|
|
518
|
+
payload: {
|
|
519
|
+
type: "exec_command_end",
|
|
520
|
+
call_id: `call_${i}`,
|
|
521
|
+
turn_id: turnId,
|
|
522
|
+
command: ["/bin/zsh", "-lc", `sed -n '1,240p' ${cwd}/.agents/skills/${skill}/SKILL.md`],
|
|
523
|
+
cwd,
|
|
524
|
+
parsed_cmd: [{ type: "read" }],
|
|
525
|
+
...(extra ?? {}),
|
|
526
|
+
},
|
|
527
|
+
})),
|
|
528
|
+
];
|
|
529
|
+
return lines.join("\n") + "\n";
|
|
530
|
+
}
|
|
531
|
+
it("captures Codex model-driven skill loads, deduped per turn", async () => {
|
|
532
|
+
const tmp = await fs.mkdtemp(path.join(os.tmpdir(), "skill-tel-codexmodel-"));
|
|
533
|
+
const codex = path.join(tmp, "sessions", "2026", "06", "08");
|
|
534
|
+
await fs.mkdir(codex, { recursive: true });
|
|
535
|
+
const hqRoot = "/home/ec2-user/hq";
|
|
536
|
+
await fs.writeFile(path.join(codex, "rollout-model.jsonl"), codexModelRollout("sess-model", hqRoot, [
|
|
537
|
+
["learn", "turn-A"], // turn-A read #1
|
|
538
|
+
["learn", "turn-A"], // turn-A read #2 — same turn+skill, must collapse
|
|
539
|
+
["learn", "turn-B"], // turn-B — distinct turn, counts again
|
|
540
|
+
["quiz", "turn-B"], // different skill, same turn — counts
|
|
541
|
+
]), "utf-8");
|
|
542
|
+
const captured = [];
|
|
543
|
+
const result = await collectAndSendSkillTelemetry({
|
|
544
|
+
client: stubClient(captured),
|
|
545
|
+
machineId: "m",
|
|
546
|
+
installerVersion: "t",
|
|
547
|
+
hqRoot,
|
|
548
|
+
claudeProjectsRoot: path.join(tmp, "no-claude"),
|
|
549
|
+
codexSessionsRoot: path.join(tmp, "sessions"),
|
|
550
|
+
cursorPath: path.join(tmp, "cursor.json"),
|
|
551
|
+
});
|
|
552
|
+
const events = captured.flatMap((b) => b.events);
|
|
553
|
+
// 4 reads → 3 events: the two turn-A `learn` reads collapse to one.
|
|
554
|
+
expect(result.eventsSent).toBe(3);
|
|
555
|
+
expect(events.every((e) => e.source === "model")).toBe(true);
|
|
556
|
+
expect(events.map((e) => `${e.skill}@${e.uuid}`).sort()).toEqual([
|
|
557
|
+
"learn@codex:skill:sess-model:turn-A:learn",
|
|
558
|
+
"learn@codex:skill:sess-model:turn-B:learn",
|
|
559
|
+
"quiz@codex:skill:sess-model:turn-B:quiz",
|
|
560
|
+
]);
|
|
561
|
+
await fs.rm(tmp, { recursive: true, force: true });
|
|
562
|
+
});
|
|
563
|
+
it("captures the function_call exec shape, attributing the turn from turn_context", async () => {
|
|
564
|
+
// Mirrors a real Codex 0.128 session: SKILL.md reads arrive as
|
|
565
|
+
// `response_item` `function_call` execs (no per-row turn_id), preceded by a
|
|
566
|
+
// `turn_context` that names the turn. The collector must thread that turn id.
|
|
567
|
+
const tmp = await fs.mkdtemp(path.join(os.tmpdir(), "skill-tel-fncall-"));
|
|
568
|
+
const codex = path.join(tmp, "sessions", "2026", "06", "10");
|
|
569
|
+
await fs.mkdir(codex, { recursive: true });
|
|
570
|
+
const hqRoot = "/home/ec2-user/hq";
|
|
571
|
+
const lines = [
|
|
572
|
+
row({ timestamp: "2026-06-10T16:38:32.000Z", type: "session_meta", payload: { id: "sess-fn", cwd: hqRoot, originator: "codex_exec" } }),
|
|
573
|
+
row({ timestamp: "2026-06-10T16:38:44.000Z", type: "turn_context", payload: { turn_id: "turn-1", cwd: hqRoot } }),
|
|
574
|
+
// Two reads of the same skill in turn-1 — the wc then the sed, as Codex does.
|
|
575
|
+
row({ timestamp: "2026-06-10T16:39:26.000Z", type: "response_item", payload: { type: "function_call", name: "exec_command", call_id: "c1", arguments: JSON.stringify({ cmd: "wc -l .claude/skills/indigo:hello-world/SKILL.md", workdir: hqRoot }) } }),
|
|
576
|
+
row({ timestamp: "2026-06-10T16:39:41.000Z", type: "response_item", payload: { type: "function_call", name: "exec_command", call_id: "c2", arguments: JSON.stringify({ cmd: "sed -n '1,80p' .claude/skills/indigo:hello-world/SKILL.md", workdir: hqRoot }) } }),
|
|
577
|
+
].join("\n") + "\n";
|
|
578
|
+
await fs.writeFile(path.join(codex, "rollout-fn.jsonl"), lines, "utf-8");
|
|
579
|
+
const captured = [];
|
|
580
|
+
const result = await collectAndSendSkillTelemetry({
|
|
581
|
+
client: stubClient(captured),
|
|
582
|
+
machineId: "m",
|
|
583
|
+
installerVersion: "t",
|
|
584
|
+
hqRoot,
|
|
585
|
+
claudeProjectsRoot: path.join(tmp, "no-claude"),
|
|
586
|
+
codexSessionsRoot: path.join(tmp, "sessions"),
|
|
587
|
+
cursorPath: path.join(tmp, "cursor.json"),
|
|
588
|
+
});
|
|
589
|
+
const events = captured.flatMap((b) => b.events);
|
|
590
|
+
// Two reads, one turn, one skill → exactly one event, attributed to turn-1.
|
|
591
|
+
expect(result.eventsSent).toBe(1);
|
|
592
|
+
expect(events[0]).toMatchObject({
|
|
593
|
+
skill: "indigo:hello-world",
|
|
594
|
+
source: "model",
|
|
595
|
+
cwd: hqRoot,
|
|
596
|
+
uuid: "codex:skill:sess-fn:turn-1:indigo:hello-world",
|
|
597
|
+
});
|
|
598
|
+
await fs.rm(tmp, { recursive: true, force: true });
|
|
599
|
+
});
|
|
600
|
+
it("does not count SKILL.md edits (apply_patch / write) as skill usage", async () => {
|
|
601
|
+
const tmp = await fs.mkdtemp(path.join(os.tmpdir(), "skill-tel-edit-"));
|
|
602
|
+
const codex = path.join(tmp, "sessions", "2026", "06", "08");
|
|
603
|
+
await fs.mkdir(codex, { recursive: true });
|
|
604
|
+
const hqRoot = "/home/ec2-user/hq";
|
|
605
|
+
await fs.writeFile(path.join(codex, "rollout-edit.jsonl"), codexModelRollout("sess-edit", hqRoot, [
|
|
606
|
+
["learn", "turn-A", { parsed_cmd: [{ type: "write" }] }], // an edit — excluded
|
|
607
|
+
]), "utf-8");
|
|
608
|
+
const captured = [];
|
|
609
|
+
const result = await collectAndSendSkillTelemetry({
|
|
610
|
+
client: stubClient(captured),
|
|
611
|
+
machineId: "m",
|
|
612
|
+
installerVersion: "t",
|
|
613
|
+
hqRoot,
|
|
614
|
+
claudeProjectsRoot: path.join(tmp, "no-claude"),
|
|
615
|
+
codexSessionsRoot: path.join(tmp, "sessions"),
|
|
616
|
+
cursorPath: path.join(tmp, "cursor.json"),
|
|
617
|
+
});
|
|
618
|
+
expect(result.eventsSent).toBe(0);
|
|
619
|
+
await fs.rm(tmp, { recursive: true, force: true });
|
|
620
|
+
});
|
|
621
|
+
it("scope now counts skills run from HQ subfolders (worktrees), still excludes siblings", async () => {
|
|
622
|
+
const tmp = await fs.mkdtemp(path.join(os.tmpdir(), "skill-tel-scope-"));
|
|
623
|
+
const projects = path.join(tmp, "projects");
|
|
624
|
+
const codex = path.join(tmp, "sessions", "2026", "06", "08");
|
|
625
|
+
await fs.mkdir(projects, { recursive: true });
|
|
626
|
+
await fs.mkdir(codex, { recursive: true });
|
|
627
|
+
const hqRoot = "/home/ec2-user/hq";
|
|
628
|
+
const worktree = `${hqRoot}/.claude/worktrees/wt1`;
|
|
629
|
+
const sibling = `${hqRoot}-other`; // shares the prefix but is a different repo
|
|
630
|
+
// Claude skill run from a worktree under the HQ root — newly counted.
|
|
631
|
+
const dirWt = path.join(projects, "wt");
|
|
632
|
+
await fs.mkdir(dirWt, { recursive: true });
|
|
633
|
+
await fs.writeFile(path.join(dirWt, "wt.jsonl"), row({ type: "assistant", sessionId: "s-wt", timestamp: "2026-06-08T10:00:00Z", cwd: worktree, message: { role: "assistant", content: [{ type: "tool_use", id: "t1", name: "Skill", input: { skill: "handoff" } }] } }) + "\n", "utf-8");
|
|
634
|
+
// Claude skill run from a sibling repo sharing the prefix — must stay excluded.
|
|
635
|
+
const dirSib = path.join(projects, "sib");
|
|
636
|
+
await fs.mkdir(dirSib, { recursive: true });
|
|
637
|
+
await fs.writeFile(path.join(dirSib, "sib.jsonl"), row({ type: "assistant", sessionId: "s-sib", timestamp: "2026-06-08T10:01:00Z", cwd: sibling, message: { role: "assistant", content: [{ type: "tool_use", id: "t2", name: "Skill", input: { skill: "sibling-skill" } }] } }) + "\n", "utf-8");
|
|
638
|
+
// Codex model load from a worktree under the HQ root — newly counted.
|
|
639
|
+
await fs.writeFile(path.join(codex, "rollout-wt.jsonl"), codexModelRollout("sess-wt", worktree, [["quiz", "turn-A"]]), "utf-8");
|
|
640
|
+
const captured = [];
|
|
641
|
+
const result = await collectAndSendSkillTelemetry({
|
|
642
|
+
client: stubClient(captured),
|
|
643
|
+
machineId: "m",
|
|
644
|
+
installerVersion: "t",
|
|
645
|
+
hqRoot,
|
|
646
|
+
claudeProjectsRoot: projects,
|
|
647
|
+
codexSessionsRoot: path.join(tmp, "sessions"),
|
|
648
|
+
cursorPath: path.join(tmp, "cursor.json"),
|
|
649
|
+
});
|
|
650
|
+
const skills = captured.flatMap((b) => b.events.map((e) => e.skill)).sort();
|
|
651
|
+
expect(result.eventsSent).toBe(2);
|
|
652
|
+
expect(skills).toEqual(["handoff", "quiz"]);
|
|
653
|
+
expect(skills).not.toContain("sibling-skill");
|
|
654
|
+
await fs.rm(tmp, { recursive: true, force: true });
|
|
655
|
+
});
|
|
370
656
|
});
|
|
371
657
|
//# sourceMappingURL=skill-telemetry.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skill-telemetry.test.js","sourceRoot":"","sources":["../src/skill-telemetry.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"skill-telemetry.test.js","sourceRoot":"","sources":["../src/skill-telemetry.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/cli/sync.test.ts
CHANGED
|
@@ -392,6 +392,120 @@ describe("sync", () => {
|
|
|
392
392
|
expect(litter).toHaveLength(1);
|
|
393
393
|
});
|
|
394
394
|
|
|
395
|
+
it("anti-rollback: a SMALLER remote does NOT silently clobber a clean local — routes through conflict and preserves local", async () => {
|
|
396
|
+
// Regression for the 2026-06-10 incident: append-only chat logs were
|
|
397
|
+
// rolled back when a regressed (older, smaller) S3 object overwrote newer
|
|
398
|
+
// local bytes. The local file is CLEAN vs the journal baseline, so the
|
|
399
|
+
// classic 3-way merge classified it as a clean `download` and silently
|
|
400
|
+
// truncated it. The anti-rollback guard must instead route a shrinking
|
|
401
|
+
// overwrite through the conflict path so local is preserved.
|
|
402
|
+
const companyDocs = path.join(tmpDir, "companies", "acme", "docs");
|
|
403
|
+
fs.mkdirSync(companyDocs, { recursive: true });
|
|
404
|
+
const localPath = path.join(companyDocs, "handoff.md");
|
|
405
|
+
// A larger, append-only-style local file (the freshly-appended state).
|
|
406
|
+
const localContent = Array.from({ length: 20 }, (_, i) => `line ${i + 1}`).join("\n") + "\n";
|
|
407
|
+
fs.writeFileSync(localPath, localContent);
|
|
408
|
+
const st = fs.statSync(localPath);
|
|
409
|
+
|
|
410
|
+
// Remote object is SMALLER (an older, truncated copy) with a CHANGED etag.
|
|
411
|
+
vi.mocked(s3Module.listRemoteFiles).mockResolvedValueOnce([
|
|
412
|
+
{ key: "docs/handoff.md", size: 12, lastModified: new Date(), etag: '"regressed-etag"' },
|
|
413
|
+
]);
|
|
414
|
+
// The convergence probe fetches remote bytes; default mock writes
|
|
415
|
+
// "mock file content" — genuinely different from local, so this is a real
|
|
416
|
+
// (not byte-identical) divergence.
|
|
417
|
+
|
|
418
|
+
// Journal baseline marks local as CLEAN: the fast-path keys off
|
|
419
|
+
// size + mtimeMs matching the on-disk file, so localChanged is false
|
|
420
|
+
// without needing the real content hash. remoteEtag differs from the
|
|
421
|
+
// listed etag, so remoteChanged is true → the would-be clean `download`.
|
|
422
|
+
fs.writeFileSync(
|
|
423
|
+
journalPath,
|
|
424
|
+
JSON.stringify({
|
|
425
|
+
version: "1",
|
|
426
|
+
lastSync: new Date().toISOString(),
|
|
427
|
+
files: {
|
|
428
|
+
"docs/handoff.md": {
|
|
429
|
+
hash: "clean-local-baseline-hash",
|
|
430
|
+
size: st.size,
|
|
431
|
+
mtimeMs: st.mtimeMs,
|
|
432
|
+
remoteEtag: "old-etag",
|
|
433
|
+
syncedAt: new Date(Date.now() - 3600000).toISOString(),
|
|
434
|
+
direction: "up",
|
|
435
|
+
},
|
|
436
|
+
},
|
|
437
|
+
}),
|
|
438
|
+
);
|
|
439
|
+
|
|
440
|
+
const result = await sync({
|
|
441
|
+
company: "acme",
|
|
442
|
+
onConflict: "keep",
|
|
443
|
+
vaultConfig: mockConfig,
|
|
444
|
+
hqRoot: tmpDir,
|
|
445
|
+
});
|
|
446
|
+
|
|
447
|
+
// Surfaced as a conflict, NOT a silent download.
|
|
448
|
+
expect(result.conflicts).toBe(1);
|
|
449
|
+
expect(result.conflictPaths).toEqual(["docs/handoff.md"]);
|
|
450
|
+
expect(result.filesDownloaded).toBe(0);
|
|
451
|
+
// The newer local bytes are intact — nothing was rolled back.
|
|
452
|
+
expect(fs.readFileSync(localPath, "utf-8")).toBe(localContent);
|
|
453
|
+
// Remote preserved as an inspection mirror rather than overwriting local.
|
|
454
|
+
const litter = fs
|
|
455
|
+
.readdirSync(companyDocs)
|
|
456
|
+
.filter((f) => f.includes(".conflict-"));
|
|
457
|
+
expect(litter).toHaveLength(1);
|
|
458
|
+
});
|
|
459
|
+
|
|
460
|
+
it("anti-rollback guard is narrow: a LARGER remote on a clean local still downloads (legit catch-up)", async () => {
|
|
461
|
+
// The guard must only intercept SHRINKING overwrites. A remote that
|
|
462
|
+
// genuinely advanced (same-or-larger) on a clean local is a normal
|
|
463
|
+
// cross-device catch-up and must still download — otherwise the guard
|
|
464
|
+
// would wedge every legitimate pull behind a conflict.
|
|
465
|
+
const companyDocs = path.join(tmpDir, "companies", "acme", "docs");
|
|
466
|
+
fs.mkdirSync(companyDocs, { recursive: true });
|
|
467
|
+
const localPath = path.join(companyDocs, "handoff.md");
|
|
468
|
+
const localContent = "short local\n";
|
|
469
|
+
fs.writeFileSync(localPath, localContent);
|
|
470
|
+
const st = fs.statSync(localPath);
|
|
471
|
+
|
|
472
|
+
// Remote is LARGER with a changed etag → legitimate advance.
|
|
473
|
+
vi.mocked(s3Module.listRemoteFiles).mockResolvedValueOnce([
|
|
474
|
+
{ key: "docs/handoff.md", size: 9999, lastModified: new Date(), etag: '"advanced-etag"' },
|
|
475
|
+
]);
|
|
476
|
+
|
|
477
|
+
fs.writeFileSync(
|
|
478
|
+
journalPath,
|
|
479
|
+
JSON.stringify({
|
|
480
|
+
version: "1",
|
|
481
|
+
lastSync: new Date().toISOString(),
|
|
482
|
+
files: {
|
|
483
|
+
"docs/handoff.md": {
|
|
484
|
+
hash: "clean-local-baseline-hash",
|
|
485
|
+
size: st.size,
|
|
486
|
+
mtimeMs: st.mtimeMs,
|
|
487
|
+
remoteEtag: "old-etag",
|
|
488
|
+
syncedAt: new Date(Date.now() - 3600000).toISOString(),
|
|
489
|
+
direction: "down",
|
|
490
|
+
},
|
|
491
|
+
},
|
|
492
|
+
}),
|
|
493
|
+
);
|
|
494
|
+
|
|
495
|
+
const result = await sync({
|
|
496
|
+
company: "acme",
|
|
497
|
+
onConflict: "keep",
|
|
498
|
+
vaultConfig: mockConfig,
|
|
499
|
+
hqRoot: tmpDir,
|
|
500
|
+
});
|
|
501
|
+
|
|
502
|
+
// No conflict — it downloaded the advanced remote.
|
|
503
|
+
expect(result.conflicts).toBe(0);
|
|
504
|
+
expect(result.filesDownloaded).toBe(1);
|
|
505
|
+
// Local replaced with the (mock) remote content.
|
|
506
|
+
expect(fs.readFileSync(localPath, "utf-8")).toBe("mock file content");
|
|
507
|
+
});
|
|
508
|
+
|
|
395
509
|
it("aborts on --on-conflict abort", async () => {
|
|
396
510
|
const companyDocs = path.join(tmpDir, "companies", "acme", "docs");
|
|
397
511
|
fs.mkdirSync(companyDocs, { recursive: true });
|
package/src/cli/sync.ts
CHANGED
|
@@ -1697,7 +1697,49 @@ function computePullPlan(
|
|
|
1697
1697
|
items.push({ action: "skip-unchanged", remoteFile, localPath });
|
|
1698
1698
|
continue;
|
|
1699
1699
|
}
|
|
1700
|
-
|
|
1700
|
+
if (journalEntry && !localChanged && remoteChanged) {
|
|
1701
|
+
// ── Anti-rollback guard (silent newer→older overwrite) ───────────
|
|
1702
|
+
// Remote etag moved but local still matches the journal baseline, so
|
|
1703
|
+
// the classic 3-way merge calls this a clean `download` and overwrites
|
|
1704
|
+
// local with remote. That assumes the remote *advanced*. It can also
|
|
1705
|
+
// REGRESS: a second device (or a stale re-push) can replace the S3
|
|
1706
|
+
// object with an OLDER, SMALLER copy. `hasRemoteChanged` is pure-ETag
|
|
1707
|
+
// and cannot tell an advance from a rollback — ListObjectsV2 carries no
|
|
1708
|
+
// content hash, and `lastModified` is the upload time (newer even for
|
|
1709
|
+
// stale content), so neither distinguishes the two. A silent download
|
|
1710
|
+
// then DESTROYS newer local bytes with no conflict surfaced.
|
|
1711
|
+
//
|
|
1712
|
+
// This bit append-only bot chat logs on 2026-06-10, the day
|
|
1713
|
+
// event-driven bidirectional sync (which lets a peer device push to
|
|
1714
|
+
// S3 between this device's pulls) first rolled out: a regressed S3
|
|
1715
|
+
// object truncated freshly-appended lines, undetected by the planner.
|
|
1716
|
+
//
|
|
1717
|
+
// Guard: if the incoming remote object is strictly SMALLER than the
|
|
1718
|
+
// local file we already hold (a size regression on a tracked regular
|
|
1719
|
+
// file), do NOT silently clobber. Route through the conflict path —
|
|
1720
|
+
// the executor's convergence probe fetches the remote once and, on
|
|
1721
|
+
// genuine divergence, PRESERVES local as a `.conflict-*` mirror instead
|
|
1722
|
+
// of overwriting it (and under `--on-conflict abort` halts loudly
|
|
1723
|
+
// rather than losing data). A byte-identical remote can never be
|
|
1724
|
+
// smaller, so this never manufactures a false conflict on a no-op
|
|
1725
|
+
// re-upload. Symlinks are exempt: their on-disk size is not the target
|
|
1726
|
+
// length, so the comparison is meaningless.
|
|
1727
|
+
if (!isLocalSymlink && remoteFile.size < localLstat!.size) {
|
|
1728
|
+
items.push({
|
|
1729
|
+
action: "conflict",
|
|
1730
|
+
remoteFile,
|
|
1731
|
+
localPath,
|
|
1732
|
+
localHash,
|
|
1733
|
+
localMtime: localLstat!.mtime,
|
|
1734
|
+
localSize: localLstat!.size,
|
|
1735
|
+
});
|
|
1736
|
+
continue;
|
|
1737
|
+
}
|
|
1738
|
+
// Remote genuinely advanced (same-or-larger) → normal catch-up
|
|
1739
|
+
// download below.
|
|
1740
|
+
}
|
|
1741
|
+
// No journal entry, or remote-only changed (non-shrinking) → fall
|
|
1742
|
+
// through to download.
|
|
1701
1743
|
}
|
|
1702
1744
|
|
|
1703
1745
|
items.push({ action: "download", remoteFile, localPath, isNew: !localExists });
|