glimmervoid 0.48.4-next.353 → 0.48.4-next.355

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 (93) hide show
  1. package/dist/bin/glimmervoid.js +13 -7
  2. package/dist/chunks/{agent-api-cli-BkmHQXK6.js → agent-api-cli-NPWGP-aG.js} +1 -1
  3. package/dist/chunks/{agent-api-cli-dXQTG2GO.js → agent-api-cli-wDSMdFsQ.js} +1 -1
  4. package/dist/chunks/{agent-api-core-D_f8pw2Q.js → agent-api-core-p7mq8Qw9.js} +10 -0
  5. package/dist/chunks/commit-sessions-AA7MD1S2.js +313 -0
  6. package/dist/chunks/{main-hW4zxxU8.js → main-D-IE1ZY3.js} +67 -80
  7. package/dist/chunks/{node-pty-preflight-DbfWP9Rc.js → node-pty-preflight-CQNBCDVM.js} +2 -28
  8. package/dist/chunks/{pair-cli-CkRuFX6c.js → pair-cli-pkc8mHbi.js} +2 -1
  9. package/dist/chunks/{remote-config-BTgp5KoH.js → pairings-store-CaQ2CQTr.js} +1 -89
  10. package/dist/chunks/remote-config-Dcejfz01.js +90 -0
  11. package/dist/chunks/{settings-cli-nrO-53SB.js → settings-cli-BRC0xzME.js} +1 -1
  12. package/dist/chunks/{ssh-sign-cli-BYQ8vj-c.js → ssh-sign-cli-KwmWJqa-.js} +1 -1
  13. package/dist/chunks/text-core-rXHoQWP9.js +28 -0
  14. package/dist/chunks/why-cli-kyEzt7n_.js +105 -0
  15. package/dist/client/assets/{benchmark-panel-DalevIl_.js → benchmark-panel-s7d6HqeB.js} +1 -1
  16. package/dist/client/assets/benchmark-panel-s7d6HqeB.js.br +0 -0
  17. package/dist/client/assets/{boards-view-B6BAeHwf.js → boards-view-ByNDNoGN.js} +1 -1
  18. package/dist/client/assets/boards-view-ByNDNoGN.js.br +0 -0
  19. package/dist/client/assets/{community-panel-ClD7iXbD.js → community-panel-CSIOmd1L.js} +1 -1
  20. package/dist/client/assets/community-panel-CSIOmd1L.js.br +0 -0
  21. package/dist/client/assets/{dialogs-DNzo3EOt.js → dialogs-CRk2Qqg6.js} +1 -1
  22. package/dist/client/assets/dialogs-CRk2Qqg6.js.br +0 -0
  23. package/dist/client/assets/{doc-editor-ui-BZXCUsF4.js → doc-editor-ui-DIAjLZzJ.js} +1 -1
  24. package/dist/client/assets/doc-editor-ui-DIAjLZzJ.js.br +0 -0
  25. package/dist/client/assets/{feature-hint-B9Qgi2dT.js → feature-hint-DQgnE3LH.js} +1 -1
  26. package/dist/client/assets/feature-hint-DQgnE3LH.js.br +0 -0
  27. package/dist/client/assets/{first-run-checklist-BwPSTf3E.js → first-run-checklist-DSAuRGWA.js} +1 -1
  28. package/dist/client/assets/first-run-checklist-DSAuRGWA.js.br +0 -0
  29. package/dist/client/assets/{hooks-panel-DgwEHaJz.js → hooks-panel-DNkR_1GF.js} +1 -1
  30. package/dist/client/assets/hooks-panel-DNkR_1GF.js.br +0 -0
  31. package/dist/client/assets/{index-RwvUeZN-.js → index-CaFYwZ27.js} +5 -5
  32. package/dist/client/assets/index-CaFYwZ27.js.br +0 -0
  33. package/dist/client/assets/{issues-panel-BEQgkHgu.js → issues-panel-BUfl0AFp.js} +1 -1
  34. package/dist/client/assets/issues-panel-BUfl0AFp.js.br +0 -0
  35. package/dist/client/assets/{my-prs-panel-Dcsbuaxp.js → my-prs-panel-toPDhOhe.js} +1 -1
  36. package/dist/client/assets/my-prs-panel-toPDhOhe.js.br +0 -0
  37. package/dist/client/assets/{nyan-cat-9FAhy9-u.js → nyan-cat-C-CsZyx5.js} +1 -1
  38. package/dist/client/assets/nyan-cat-C-CsZyx5.js.br +0 -0
  39. package/dist/client/assets/{phone-shell-D_EkUovc.js → phone-shell-CuMRUH2p.js} +1 -1
  40. package/dist/client/assets/phone-shell-CuMRUH2p.js.br +0 -0
  41. package/dist/client/assets/{plan-face-BO-p0Zom.js → plan-face-DTmKn0aa.js} +1 -1
  42. package/dist/client/assets/plan-face-DTmKn0aa.js.br +0 -0
  43. package/dist/client/assets/{pr-queue-columns-h2lm6cDe.js → pr-queue-columns-BpQhKtqz.js} +1 -1
  44. package/dist/client/assets/pr-queue-columns-BpQhKtqz.js.br +5 -0
  45. package/dist/client/assets/{radar-panel-Cp82fbdc.js → radar-panel-DlIKsv61.js} +1 -1
  46. package/dist/client/assets/radar-panel-DlIKsv61.js.br +0 -0
  47. package/dist/client/assets/{repo-roots-adder-B70eIro0.js → repo-roots-adder-BEWQkChL.js} +1 -1
  48. package/dist/client/assets/repo-roots-adder-BEWQkChL.js.br +0 -0
  49. package/dist/client/assets/{resume-dialog-lpAVGQLP.js → resume-dialog-ClenenuA.js} +1 -1
  50. package/dist/client/assets/resume-dialog-ClenenuA.js.br +0 -0
  51. package/dist/client/assets/{review-queue-panel-_aVtOCZN.js → review-queue-panel-CjfHg7Qj.js} +1 -1
  52. package/dist/client/assets/review-queue-panel-CjfHg7Qj.js.br +0 -0
  53. package/dist/client/assets/{settings-panel-C6GqlQVm.js → settings-panel-B8xLM_d-.js} +2 -2
  54. package/dist/client/assets/settings-panel-B8xLM_d-.js.br +0 -0
  55. package/dist/client/assets/{shown-lightbox-DYbT-GrW.js → shown-lightbox-DNoE_6Z8.js} +1 -1
  56. package/dist/client/assets/shown-lightbox-DNoE_6Z8.js.br +0 -0
  57. package/dist/client/assets/{team-review-panel-DK2jMtdK.js → team-review-panel-DSqnwc4U.js} +1 -1
  58. package/dist/client/assets/team-review-panel-DSqnwc4U.js.br +0 -0
  59. package/dist/client/assets/{trace-panel-B_W2QH5x.js → trace-panel-cIbQLOnq.js} +1 -1
  60. package/dist/client/assets/trace-panel-cIbQLOnq.js.br +0 -0
  61. package/dist/client/assets/{usage-panel-DtCAeoCN.js → usage-panel-BLg-f5KZ.js} +1 -1
  62. package/dist/client/assets/usage-panel-BLg-f5KZ.js.br +0 -0
  63. package/dist/client/assets/{your-day-tip-D6ZQiyId.js → your-day-tip-DHFLY8AE.js} +1 -1
  64. package/dist/client/assets/your-day-tip-DHFLY8AE.js.br +0 -0
  65. package/dist/client/index.html +1 -1
  66. package/dist/client/index.html.br +0 -0
  67. package/dist/server/index.js +2 -2
  68. package/package.json +1 -1
  69. package/dist/client/assets/benchmark-panel-DalevIl_.js.br +0 -0
  70. package/dist/client/assets/boards-view-B6BAeHwf.js.br +0 -0
  71. package/dist/client/assets/community-panel-ClD7iXbD.js.br +0 -0
  72. package/dist/client/assets/dialogs-DNzo3EOt.js.br +0 -0
  73. package/dist/client/assets/doc-editor-ui-BZXCUsF4.js.br +0 -0
  74. package/dist/client/assets/feature-hint-B9Qgi2dT.js.br +0 -0
  75. package/dist/client/assets/first-run-checklist-BwPSTf3E.js.br +0 -0
  76. package/dist/client/assets/hooks-panel-DgwEHaJz.js.br +0 -0
  77. package/dist/client/assets/index-RwvUeZN-.js.br +0 -0
  78. package/dist/client/assets/issues-panel-BEQgkHgu.js.br +0 -0
  79. package/dist/client/assets/my-prs-panel-Dcsbuaxp.js.br +0 -0
  80. package/dist/client/assets/nyan-cat-9FAhy9-u.js.br +0 -0
  81. package/dist/client/assets/phone-shell-D_EkUovc.js.br +0 -0
  82. package/dist/client/assets/plan-face-BO-p0Zom.js.br +0 -0
  83. package/dist/client/assets/pr-queue-columns-h2lm6cDe.js.br +0 -0
  84. package/dist/client/assets/radar-panel-Cp82fbdc.js.br +0 -0
  85. package/dist/client/assets/repo-roots-adder-B70eIro0.js.br +0 -0
  86. package/dist/client/assets/resume-dialog-lpAVGQLP.js.br +0 -0
  87. package/dist/client/assets/review-queue-panel-_aVtOCZN.js.br +0 -0
  88. package/dist/client/assets/settings-panel-C6GqlQVm.js.br +0 -0
  89. package/dist/client/assets/shown-lightbox-DYbT-GrW.js.br +0 -0
  90. package/dist/client/assets/team-review-panel-DK2jMtdK.js.br +0 -0
  91. package/dist/client/assets/trace-panel-B_W2QH5x.js.br +0 -0
  92. package/dist/client/assets/usage-panel-DtCAeoCN.js.br +0 -0
  93. package/dist/client/assets/your-day-tip-D6ZQiyId.js.br +0 -0
@@ -1,11 +1,12 @@
1
1
  #!/usr/bin/env node
2
- import { r as firstLine, s as nodePtyRebuildHint, t as probeNodePty } from "../chunks/node-pty-preflight-DbfWP9Rc.js";
2
+ import { i as nodePtyRebuildHint, t as probeNodePty } from "../chunks/node-pty-preflight-CQNBCDVM.js";
3
+ import { t as firstLine } from "../chunks/text-core-rXHoQWP9.js";
3
4
  import { i as errorText } from "../chunks/text-DoirglWV.js";
4
5
  import { a as packageRoot } from "../chunks/runtime-paths-D_ZjJLE0.js";
5
6
  import { n as glimmervoidHomeDir, t as decideConfigPath } from "../chunks/config-path-core-DUWk0Lui.js";
6
7
  import { t as AGENT_API_VERBS } from "../chunks/session-CmkfJxzB.js";
7
8
  import { a as execSync } from "../chunks/child-process-safe-BCOoKfxG.js";
8
- import { J as isOwnedCommandName, Y as parseCommand, q as OWNED_COMMAND_SPECS, r as agentCommandHelpLines } from "../chunks/agent-api-core-D_f8pw2Q.js";
9
+ import { J as isOwnedCommandName, Y as parseCommand, q as OWNED_COMMAND_SPECS, r as agentCommandHelpLines } from "../chunks/agent-api-core-p7mq8Qw9.js";
9
10
  import { t as renderTable } from "../chunks/ascii-figure-core-pDAwtlKO.js";
10
11
  import { i as parseCommandLine, r as gitDoctorRows, t as probeGitVersion } from "../chunks/git-version-xS1GFU8P.js";
11
12
  import { i as pnpmGlobalBinDir, n as npmGlobalBinDir, r as onPath, t as formatPathNotice } from "../chunks/path-doctor-C23VAqeu.js";
@@ -26,6 +27,7 @@ Commands:
26
27
  pair --list List paired devices
27
28
  pair --revoke <id> Revoke a paired device
28
29
  agent setup grok Install the Grok hook relay, which does nothing outside Glimmervoid
30
+ why <file>:<line> Name the session that made the commit owning a line (or pass a commit sha)
29
31
 
30
32
  Inside a Glimmervoid session:
31
33
  ${agentCommandHelpLines().join("\n")}
@@ -61,7 +63,7 @@ var OWNED_COMMAND_RUNNERS = {
61
63
  return await runDoctor() ? 0 : 1;
62
64
  },
63
65
  pair: async ({ values }) => {
64
- const { runPairCli } = await import("../chunks/pair-cli-CkRuFX6c.js");
66
+ const { runPairCli } = await import("../chunks/pair-cli-pkc8mHbi.js");
65
67
  return runPairCli({
66
68
  isListing: values.list === true,
67
69
  revokeDeviceId: typeof values.revoke === "string" ? values.revoke : null,
@@ -73,11 +75,15 @@ var OWNED_COMMAND_RUNNERS = {
73
75
  return runAgentSetupCli();
74
76
  },
75
77
  settings: async (parsed) => {
76
- const { runParsedSettingsCli } = await import("../chunks/settings-cli-nrO-53SB.js");
78
+ const { runParsedSettingsCli } = await import("../chunks/settings-cli-BRC0xzME.js");
77
79
  return runParsedSettingsCli(parsed);
78
80
  },
81
+ why: async ({ positionals }) => {
82
+ const { runWhyCli } = await import("../chunks/why-cli-kyEzt7n_.js");
83
+ return runWhyCli({ targetArgument: positionals[0] ?? "" });
84
+ },
79
85
  "ssh-sign": async ({ rawArgs }) => {
80
- const { runSshSignCli } = await import("../chunks/ssh-sign-cli-BYQ8vj-c.js");
86
+ const { runSshSignCli } = await import("../chunks/ssh-sign-cli-KwmWJqa-.js");
81
87
  return runSshSignCli(rawArgs);
82
88
  }
83
89
  };
@@ -99,7 +105,7 @@ async function runOwnedCommand(name, subcommandArgs) {
99
105
  return OWNED_COMMAND_RUNNERS[name](parsed);
100
106
  }
101
107
  var SUBCOMMAND_RUNNERS = new Map([...Object.keys(OWNED_COMMAND_SPECS).filter(isOwnedCommandName).map((name) => [name, (subcommandArgs) => runOwnedCommand(name, subcommandArgs)]), ...AGENT_API_VERBS.filter((verb) => !isOwnedCommandName(verb)).map((verb) => [verb, async (subcommandArgs, subcommandName) => {
102
- const { runAgentApiCli } = await import("../chunks/agent-api-cli-dXQTG2GO.js");
108
+ const { runAgentApiCli } = await import("../chunks/agent-api-cli-wDSMdFsQ.js");
103
109
  return runAgentApiCli([subcommandName, ...subcommandArgs]);
104
110
  }])]);
105
111
  var AGENT_INSTALL_COMMAND_BY_ID = {
@@ -113,7 +119,7 @@ function missingAgentText(agentId) {
113
119
  }
114
120
  async function printSessionLimits() {
115
121
  if (!process.env["GLIMMERVOID_AGENT_URL"]) return;
116
- const { sessionLimitsHelpLines } = await import("../chunks/agent-api-cli-dXQTG2GO.js");
122
+ const { sessionLimitsHelpLines } = await import("../chunks/agent-api-cli-wDSMdFsQ.js");
117
123
  const limitsLines = await sessionLimitsHelpLines();
118
124
  console.log(`\n${limitsLines.join("\n")}`);
119
125
  }
@@ -1,5 +1,5 @@
1
1
  import { X as WhiteboardAgentReply, l as AgentLimitsReply, r as AGENT_URL_ENV } from "./session-CmkfJxzB.js";
2
- import { Y as parseCommand, i as agentCommandSpec, m as isAgentApiVerb, t as AGENT_COMMAND_HELP } from "./agent-api-core-D_f8pw2Q.js";
2
+ import { Y as parseCommand, i as agentCommandSpec, m as isAgentApiVerb, t as AGENT_COMMAND_HELP } from "./agent-api-core-p7mq8Qw9.js";
3
3
  import { i as formatSessionLimits } from "./session-routes-CgqWd0bR.js";
4
4
  import { i as resolveHookTarget } from "./hook-relay-core-DA_bz2KA.js";
5
5
  import { t as parseJsonOrNull } from "./json-core-If8h-Qgy.js";
@@ -1 +1 @@
1
- export { t as askAgentApi, r as runAgentApiCli, i as sessionLimitsHelpLines } from "./agent-api-cli-BkmHQXK6.js";
1
+ export { t as askAgentApi, r as runAgentApiCli, i as sessionLimitsHelpLines } from "./agent-api-cli-NPWGP-aG.js";
@@ -268,6 +268,16 @@ change it in the dashboard settings or through its environment variable.`,
268
268
  }
269
269
  ]
270
270
  },
271
+ why: {
272
+ name: "why",
273
+ summary: "Name the session that made the commit owning a file line, or a commit, and what it was asked",
274
+ positionals: {
275
+ usage: "<file>:<line> | <sha>",
276
+ min: 1,
277
+ max: 1
278
+ },
279
+ options: [CONFIG_OPTION]
280
+ },
271
281
  "ssh-sign": {
272
282
  name: "ssh-sign",
273
283
  summary: "Sign a commit with the operator's forwarded ssh agent (git runs this)",
@@ -0,0 +1,313 @@
1
+ import { r as errorMessage } from "./text-DoirglWV.js";
2
+ import { r as execFileAsync } from "./child-process-safe-BCOoKfxG.js";
3
+ import { Pt as TraceRecord } from "./config-BWa_HecL.js";
4
+ import { m as createKeyedSerialQueue, n as appendJsonLines } from "./json-file-AKRVPqG1.js";
5
+ import fs from "node:fs";
6
+ import path from "node:path";
7
+ import { z } from "zod";
8
+ import crypto from "node:crypto";
9
+ //#region server/git/git-exec.ts
10
+ var DEFAULT_COMMAND_TIMEOUT_MS = 2e4;
11
+ function outputText(value) {
12
+ if (typeof value === "string") return value;
13
+ if (Buffer.isBuffer(value)) return value.toString("utf8");
14
+ return value == null ? "" : String(value);
15
+ }
16
+ function childEnv(env, replaceEnv) {
17
+ if (replaceEnv) return { env: replaceEnv };
18
+ if (env) return { env: {
19
+ ...process.env,
20
+ ...env
21
+ } };
22
+ return {};
23
+ }
24
+ async function runCommand(file, args, { cwd, timeoutMs = DEFAULT_COMMAND_TIMEOUT_MS, maxBuffer, env, replaceEnv, signal, input, trim = true, keepStdoutOnFailure = false, preferStderr = false, execFileFn = execFileAsync } = {}) {
25
+ const execOptions = {
26
+ encoding: "utf8",
27
+ timeout: timeoutMs,
28
+ ...cwd === void 0 ? {} : { cwd },
29
+ ...maxBuffer === void 0 ? {} : { maxBuffer },
30
+ ...signal ? { signal } : {},
31
+ ...input === void 0 ? {} : { input },
32
+ ...childEnv(env, replaceEnv)
33
+ };
34
+ try {
35
+ const { stdout, stderr } = await execFileFn(file, args, execOptions);
36
+ const out = outputText(stdout);
37
+ return {
38
+ ok: true,
39
+ out: trim ? out.trim() : out,
40
+ err: "",
41
+ stderr: outputText(stderr)
42
+ };
43
+ } catch (error) {
44
+ const failure = error ?? {};
45
+ const stdout = outputText(failure.stdout);
46
+ const stderr = outputText(failure.stderr);
47
+ const message = errorMessage(error);
48
+ return {
49
+ ok: false,
50
+ out: keepStdoutOnFailure ? trim ? stdout.trim() : stdout : "",
51
+ err: preferStderr ? stderr || message : message,
52
+ stderr,
53
+ error,
54
+ timedOut: failure.killed === true && Boolean(failure.signal)
55
+ };
56
+ }
57
+ }
58
+ function runGit(args, { gitPath = "git", env, replaceEnv, ...rest } = {}) {
59
+ const baseEnv = replaceEnv ?? (env ? {
60
+ ...process.env,
61
+ ...env
62
+ } : process.env);
63
+ return runCommand(gitPath, args, {
64
+ ...rest,
65
+ replaceEnv: {
66
+ ...baseEnv,
67
+ GIT_TERMINAL_PROMPT: "0"
68
+ }
69
+ });
70
+ }
71
+ function gitCommandFailure(args, command, timeoutMs = DEFAULT_COMMAND_TIMEOUT_MS) {
72
+ if (!command.timedOut) return command.error;
73
+ return new Error(`git ${args.join(" ")} timed out after ${timeoutMs}ms`, { cause: command.error });
74
+ }
75
+ function runGh(args, options = {}) {
76
+ return runCommand("gh", args, options);
77
+ }
78
+ //#endregion
79
+ //#region shared/contracts/commit-session.ts
80
+ var CommitSha = z.string().regex(/^[0-9a-f]{40}$/);
81
+ var CommitSessionRecord = z.object({
82
+ sha: CommitSha,
83
+ patchId: CommitSha.nullable(),
84
+ sessionId: z.string().min(1).max(64),
85
+ sessionName: z.string().max(200),
86
+ agent: z.string().max(64),
87
+ taskTitle: z.string().max(300).nullable(),
88
+ committedAt: z.number().int(),
89
+ recordedAt: z.number().int()
90
+ }).strict();
91
+ //#endregion
92
+ //#region server/core/commit-session-core.ts
93
+ var COMMIT_LOG_FORMAT = "%H %ct";
94
+ var REPO_KEY_HASH_LENGTH = 12;
95
+ var SHORT_SHA_LENGTH = 7;
96
+ var MAX_PROMPT_CHARS = 200;
97
+ var PROMPT_MARKER = "\"kind\":\"prompt\"";
98
+ function repoKeyOf(gitCommonDirectory) {
99
+ return `${path.basename(path.dirname(gitCommonDirectory)).replace(/[^A-Za-z0-9._-]/g, "_") || "repo"}-${crypto.createHash("sha1").update(gitCommonDirectory).digest("hex").slice(0, REPO_KEY_HASH_LENGTH)}`;
100
+ }
101
+ function parseCommitLog(logOutput) {
102
+ return logOutput.split("\n").flatMap((line) => {
103
+ const [sha, seconds] = line.trim().split(" ");
104
+ if (!sha || !/^[0-9a-f]{40}$/.test(sha) || !seconds) return [];
105
+ return [{
106
+ sha,
107
+ committedAt: Number(seconds) * 1e3
108
+ }];
109
+ });
110
+ }
111
+ function parsePatchIds(patchIdOutput) {
112
+ const patchIdBySha = /* @__PURE__ */ new Map();
113
+ for (const line of patchIdOutput.split("\n")) {
114
+ const [patchId, sha] = line.trim().split(" ");
115
+ if (patchId && sha) patchIdBySha.set(sha, patchId);
116
+ }
117
+ return patchIdBySha;
118
+ }
119
+ function parsedLineAround(text, offset, schema) {
120
+ const lineStart = text.lastIndexOf("\n", offset) + 1;
121
+ const lineEnd = text.indexOf("\n", offset);
122
+ try {
123
+ const parsed = schema.safeParse(JSON.parse(text.slice(lineStart, lineEnd === -1 ? void 0 : lineEnd)));
124
+ return parsed.success ? parsed.data : null;
125
+ } catch {
126
+ return null;
127
+ }
128
+ }
129
+ function findRecord(storeText, key) {
130
+ const marker = "sha" in key ? `"sha":"${key.sha}"` : `"patchId":"${key.patchId}"`;
131
+ for (let at = storeText.indexOf(marker); at !== -1; at = storeText.indexOf(marker, at + marker.length)) {
132
+ const record = parsedLineAround(storeText, at, CommitSessionRecord);
133
+ if (record && ("sha" in key ? record.sha === key.sha : record.patchId === key.patchId)) return record;
134
+ }
135
+ return null;
136
+ }
137
+ function parseWhyTarget(argument) {
138
+ if (/^[0-9a-f]{4,40}$/i.test(argument)) return { sha: argument.toLowerCase() };
139
+ const separatorAt = argument.lastIndexOf(":");
140
+ const lineText = argument.slice(separatorAt + 1);
141
+ if (separatorAt <= 0 || !/^[1-9][0-9]*$/.test(lineText)) return { error: `expected <file>:<line> or a commit sha, got ${argument}` };
142
+ return {
143
+ file: argument.slice(0, separatorAt),
144
+ line: Number(lineText)
145
+ };
146
+ }
147
+ function lastPromptBefore(traceText, committedAtMs) {
148
+ let latest = null;
149
+ for (let at = traceText.indexOf(PROMPT_MARKER); at !== -1; at = traceText.indexOf(PROMPT_MARKER, at + 15)) {
150
+ const record = parsedLineAround(traceText, at, TraceRecord);
151
+ if (record?.kind !== "prompt" || record.ts > committedAtMs || latest && latest.ts > record.ts) continue;
152
+ const firstPromptLine = record.text.trim().split("\n")[0] ?? "";
153
+ if (firstPromptLine) latest = {
154
+ text: firstPromptLine.slice(0, MAX_PROMPT_CHARS),
155
+ ts: record.ts
156
+ };
157
+ }
158
+ return latest;
159
+ }
160
+ function twoDigits(value) {
161
+ return String(value).padStart(2, "0");
162
+ }
163
+ function localDay(ms) {
164
+ const date = new Date(ms);
165
+ return `${date.getFullYear()}-${twoDigits(date.getMonth() + 1)}-${twoDigits(date.getDate())}`;
166
+ }
167
+ function localTime(ms) {
168
+ const date = new Date(ms);
169
+ return `${twoDigits(date.getHours())}:${twoDigits(date.getMinutes())}`;
170
+ }
171
+ function formatWhy(answer) {
172
+ const heading = `${answer.location} ${answer.sha.slice(0, SHORT_SHA_LENGTH)} ${localDay(answer.committedAt)} ${localTime(answer.committedAt)}`;
173
+ const { record } = answer;
174
+ if (!record) return `${heading}\nno Glimmervoid session made this commit`;
175
+ const lines = [heading, `session ${record.sessionName} (${record.agent}) ${record.sessionId.slice(0, 8)}`];
176
+ if (record.taskTitle) lines.push(`task ${record.taskTitle}`);
177
+ if (answer.prompt) lines.push(`asked ${JSON.stringify(answer.prompt.text)} (${localTime(answer.prompt.ts)})`);
178
+ return lines.join("\n");
179
+ }
180
+ function recordedShasOf(storeText, sessionId) {
181
+ const recordedShas = /* @__PURE__ */ new Set();
182
+ const sessionMarker = `"sessionId":${JSON.stringify(sessionId)}`;
183
+ for (let at = storeText.indexOf(sessionMarker); at !== -1; at = storeText.indexOf(sessionMarker, at + sessionMarker.length)) {
184
+ const record = parsedLineAround(storeText, at, CommitSessionRecord);
185
+ if (record?.sessionId === sessionId) recordedShas.add(record.sha);
186
+ }
187
+ return recordedShas;
188
+ }
189
+ //#endregion
190
+ //#region server/commit-sessions.ts
191
+ var COMMIT_SESSIONS_FOLDER_NAME = "commit-sessions";
192
+ var GIT_TIMEOUT_MS = 2e4;
193
+ var GIT_MAX_BUFFER = 67108864;
194
+ function storePathFor(storeRoot, gitCommonDirectory) {
195
+ return path.join(storeRoot, `${repoKeyOf(gitCommonDirectory)}.jsonl`);
196
+ }
197
+ async function gitCommonDirectoryOf(directory, runGitFn = runGit) {
198
+ const result = await runGitFn([
199
+ "rev-parse",
200
+ "--path-format=absolute",
201
+ "--git-common-dir"
202
+ ], {
203
+ cwd: directory,
204
+ timeoutMs: GIT_TIMEOUT_MS
205
+ });
206
+ if (!result.ok || !result.out) return null;
207
+ return fs.promises.realpath(result.out).catch(() => result.out);
208
+ }
209
+ async function patchIdsOfBatch(shas, gitOptions, runGitFn = runGit) {
210
+ const patches = await runGitFn([
211
+ "show",
212
+ "--no-color",
213
+ "--format=commit %H",
214
+ "-p",
215
+ ...shas
216
+ ], {
217
+ ...gitOptions,
218
+ trim: false
219
+ });
220
+ if (!patches.ok) return null;
221
+ const patchIds = await runGitFn(["patch-id", "--stable"], {
222
+ ...gitOptions,
223
+ input: patches.out
224
+ });
225
+ return patchIds.ok ? parsePatchIds(patchIds.out) : null;
226
+ }
227
+ async function readStoreText(storePath) {
228
+ return fs.promises.readFile(storePath, "utf8").catch(() => "");
229
+ }
230
+ function createCommitSessions({ storeRoot, runGitFn = runGit, logger, nowFn = Date.now }) {
231
+ const lastCapturedHeadBySessionId = /* @__PURE__ */ new Map();
232
+ const recordedShasBySessionId = /* @__PURE__ */ new Map();
233
+ const storePathByWorktreeDir = /* @__PURE__ */ new Map();
234
+ const captureQueue = createKeyedSerialQueue();
235
+ async function storePathOf(worktreeDir) {
236
+ const known = storePathByWorktreeDir.get(worktreeDir);
237
+ if (known) return known;
238
+ const gitCommonDirectory = await gitCommonDirectoryOf(worktreeDir, runGitFn);
239
+ if (!gitCommonDirectory) return null;
240
+ const storePath = storePathFor(storeRoot, gitCommonDirectory);
241
+ storePathByWorktreeDir.set(worktreeDir, storePath);
242
+ return storePath;
243
+ }
244
+ async function recordedShasFor(sessionId, storePath) {
245
+ const known = recordedShasBySessionId.get(sessionId);
246
+ if (known) return known;
247
+ const recordedShas = recordedShasOf(await readStoreText(storePath), sessionId);
248
+ recordedShasBySessionId.set(sessionId, recordedShas);
249
+ return recordedShas;
250
+ }
251
+ async function patchIdsOf(commits, gitOptions) {
252
+ const shas = commits.map((commit) => commit.sha);
253
+ const batchPatchIds = await patchIdsOfBatch(shas, gitOptions, runGitFn);
254
+ if (batchPatchIds || shas.length === 1) return batchPatchIds ?? /* @__PURE__ */ new Map();
255
+ const patchIdBySha = /* @__PURE__ */ new Map();
256
+ for (const sha of shas) {
257
+ const singlePatchId = (await patchIdsOfBatch([sha], gitOptions, runGitFn))?.get(sha);
258
+ if (singlePatchId) patchIdBySha.set(sha, singlePatchId);
259
+ }
260
+ return patchIdBySha;
261
+ }
262
+ async function capture(change) {
263
+ if (lastCapturedHeadBySessionId.get(change.sessionId) === change.headSha) return;
264
+ const storePath = await storePathOf(change.worktreeDir);
265
+ if (!storePath) return;
266
+ const gitOptions = {
267
+ cwd: change.worktreeDir,
268
+ timeoutMs: GIT_TIMEOUT_MS,
269
+ maxBuffer: GIT_MAX_BUFFER
270
+ };
271
+ const listed = await runGitFn([
272
+ "log",
273
+ "--no-merges",
274
+ `--format=${COMMIT_LOG_FORMAT}`,
275
+ `${change.baseRef}..${change.headSha}`
276
+ ], gitOptions);
277
+ if (!listed.ok) return;
278
+ lastCapturedHeadBySessionId.set(change.sessionId, change.headSha);
279
+ const recordedShas = await recordedShasFor(change.sessionId, storePath);
280
+ const newCommits = parseCommitLog(listed.out).filter((commit) => !recordedShas.has(commit.sha));
281
+ if (newCommits.length === 0) return;
282
+ const patchIdBySha = await patchIdsOf(newCommits, gitOptions);
283
+ const shasWithoutPatchId = newCommits.filter((commit) => !patchIdBySha.has(commit.sha)).map((commit) => commit.sha.slice(0, 12));
284
+ if (shasWithoutPatchId.length > 0) logger.warn(`[commit-sessions] no patch-id for ${shasWithoutPatchId.join(", ")} in ${change.sessionId}; a rebased copy will not trace back`);
285
+ const recordedAt = nowFn();
286
+ const records = newCommits.map((commit) => ({
287
+ sha: commit.sha,
288
+ patchId: patchIdBySha.get(commit.sha) ?? null,
289
+ sessionId: change.sessionId,
290
+ sessionName: change.sessionName.slice(0, 200),
291
+ agent: change.agent.slice(0, 64),
292
+ taskTitle: change.taskTitle?.slice(0, 300) ?? null,
293
+ committedAt: commit.committedAt,
294
+ recordedAt
295
+ }));
296
+ await appendJsonLines(storePath, records, {
297
+ mkdir: true,
298
+ mode: 384
299
+ });
300
+ for (const record of records) recordedShas.add(record.sha);
301
+ }
302
+ function noteHeadChange(change) {
303
+ const { baseRef } = change;
304
+ if (!baseRef) return Promise.resolve();
305
+ return captureQueue.run(change.sessionId, () => capture({
306
+ ...change,
307
+ baseRef
308
+ })).catch((error) => logger.warn(`[commit-sessions] capture failed for ${change.sessionId}: ${errorMessage(error)}`));
309
+ }
310
+ return { noteHeadChange };
311
+ }
312
+ //#endregion
313
+ export { runGit as _, gitCommonDirectoryOf as a, storePathFor as c, lastPromptBefore as d, parseCommitLog as f, runGh as g, runCommand as h, createCommitSessions as i, findRecord as l, gitCommandFailure as m, GIT_MAX_BUFFER as n, patchIdsOfBatch as o, parseWhyTarget as p, GIT_TIMEOUT_MS as r, readStoreText as s, COMMIT_SESSIONS_FOLDER_NAME as t, formatWhy as u };
@@ -1,11 +1,12 @@
1
- import { a as showHomeAsTilde, i as sanitizeOneLine, n as requireExecutableSpawnHelper, r as firstLine$1 } from "./node-pty-preflight-DbfWP9Rc.js";
1
+ import { n as requireExecutableSpawnHelper } from "./node-pty-preflight-CQNBCDVM.js";
2
+ import { n as sanitizeOneLine, r as showHomeAsTilde, t as firstLine$1 } from "./text-core-rXHoQWP9.js";
2
3
  import { a as isMissingFileError, r as errorMessage, t as errorCode } from "./text-DoirglWV.js";
3
4
  import { a as packageRoot, c as caseFoldedPathKey, d as safePathSegment, f as sanitizeWorktreeName, i as clientDir, l as equalsIgnoringCaseOnWindows, n as bundled, o as relayPath, r as cliPath, s as resolvePackageBin, t as assetRoot, u as isPathInside } from "./runtime-paths-D_ZjJLE0.js";
4
5
  import { n as glimmervoidHomeDir, r as isOperatorHomeUnderTest, t as decideConfigPath } from "./config-path-core-DUWk0Lui.js";
5
6
  import { $ as LinkedPr, $t as shortSha, A as SIGN_URL_ENV, At as PrDetail, Bt as TeamReviewCompareFiles, Ct as DECIDING_REVIEW_STATES, D as SESSION_NAME_PATTERN, Dt as GithubReviewState, F as ShownFile, Ft as ReviewResult, G as Frame, Gt as TeamReviewThreadResult, H as BoardRecord, Ht as TeamReviewStateEntry, It as ReviewThreadId, J as Unit, Jt as decisionAsIfApprovalRequired, K as Note, Kt as TeamReviewThreadsRepository, L as SshSignRequest, Lt as ReviewVerdict, Mt as ReviewComment, Nt as ReviewDraft, O as SESSION_NAME_RULE_TEXT, Ot as PostedReviewEvent, Pt as ReviewFinding, Q as Wire, Qt as HEX_SHA_RE, Rt as TeamReviewActionRequest, S as ConversationQuestion, St as CommitSha, T as SESSION_DOC_BODY_CAP_BYTES, Tt as FindingSeverity, Ut as TeamReviewStatus, Vt as TeamReviewResolveResponse, W as Box, Wt as TeamReviewThreadCommentsResponse, Xt as hasStandingViewerApproval, Y as WHITEBOARD_LIMITS, _ as COHERENCE_HOOKS_INACTIVE, _t as MyPrsState, b as CONVERSATION_TOOL_RESULT_HOOK_EVENT, cn as BADGE_LABELS, ct as MyPrMergeRequest, dn as RESTARTABLE_STATES, dt as MyPrMergeWhenReadyRequest, en as GH_SEGMENT, et as MyPr, fn as STATES, gt as MyPrsSnapshot, ht as MyPrThreadsResponse, i as ASK_USER_QUESTION_TOOL_NAME, it as MyPrKeepMergeableRequest, j as SSH_SIGN_BODY_CAP_BYTES, k as SHOWN_FILE_CAP_BYTES, kt as PostingPlan, ln as KILLABLE_STATES, mt as MyPrThreadNode, nn as REPO_SLUG_RE, nt as MyPrCheckContext, ot as MyPrLaneEntry, qt as canApproveAfterComment, r as AGENT_URL_ENV, rn as repoParts, rt as MyPrCheckContextsResponse, st as MyPrMergeMethod, tn as NODE_ID_RE, tt as MyPrAutoRebase, un as MERGEABLE_LIVE_STATES, ut as MyPrMergeStateResponse, v as CONVERSATION_APPROVAL_SUMMARY_MAX_CHARS, wt as EarlierReview, y as CONVERSATION_PERMISSION_HOOK_EVENT, z as TaskTitle } from "./session-CmkfJxzB.js";
6
7
  import { c as spawn, i as execFileSync, n as execFile, r as execFileAsync, s as refuseLaunchesOf, t as assertLaunchable } from "./child-process-safe-BCOoKfxG.js";
7
8
  import { $t as IssuesStatus, A as HINT_VIEW_BY_FEATURE, At as UpdateJournal, B as MergedPrListing, Bt as PLAN_HOOK_OUTPUT_MAX_CHARS, Ct as CommunityItem, D as pullRequestKeyFromReference, Dt as SKILL_NAME_RE, Et as DISCORD_CHANNEL_NAME_RE, F as BenchmarkJudgement, Ft as CoherenceJournalOutput, G as GithubPrLightSearchNode, Gt as parseExitPlanModeHookPayload, H as PrCheckoutCaseInput, Ht as PLAN_TOOL_NAME, I as BenchmarkRun, It as ChangeMap, J as WorkflowCommentBody, Jt as GithubIssueResponse, K as GithubPrsFrame, Kt as planTitle, L as BenchmarkStatus, Lt as changeMapFactId, M as BenchmarkActionRequest, Mt as MAX_RAW_LINE_CHARS, N as BenchmarkCase, Nt as TraceCheckpoint, O as FeatureHintState, P as BenchmarkId, Pt as TraceRecord, Qt as IssuesState, R as BenchmarkSuite, Rt as PLAN_BODY_CAP_BYTES, St as CommunityDraft, Tt as CommunityVerdict, U as GithubPrDetailNode, Ut as PlanDecision, V as MinedPrReviewData, Vt as PLAN_RESULT_HOOK_EVENT, W as GithubPrKey, Wt as PlanRevision, X as WorkflowsSettings, Xt as IssueUpdate, Y as WorkflowLabelName, Yt as IssueKey, Z as WorkflowsState, Zt as IssuesSearchResponse, _ as CLIENT_LOG_TEXT_MAX_CHARS, a as ConfigUpdate, c as SHELL_AGENT_ID, en as issuePullRequestStateFromGithub, f as USAGE_COST_MODES, gt as USAGE_INTEGER_RANGES, h as CHANGES_POLL_INTERVAL_MS, jt as SessionSetup, k as HINT_FEATURES, p as USAGE_VENDOR_KEYS, q as comparablePrKey, qt as GithubIssuePullRequestsRepository, r as BrowserConfig, rt as KEEP_MERGEABLE_TIMEOUT_MINUTES_RANGE, s as RUNTIME_CONFIG_SCALAR_KEYS, u as configIssueMessage, v as CONTROL_FRAME_MAX_BYTES, wt as CommunityState, x as GithubTeam, xt as CommunityActionRequest, y as ClientMessage, z as CommitComparison, zt as PLAN_HOOK_EVENT } from "./config-BWa_HecL.js";
8
- import { A as parseRefinedSessionName, B as resumePromptFor, C as decideTaskTitleRefinement, D as extractPromptTaskTitle, E as extractOscTaskTitle, F as AUTO_CONTINUE_PROMPT, G as isAutoNameOf, H as claudeProjectsDir, I as RESUME_ID_RE, K as nextSuggestedName, L as isConversationReplacedAtStartup, M as resolveRefocusTaskTitle, N as resolveTaskTitle, O as isSelfWakePrompt, P as seedTaskTitleSources, R as pickAutoResume, S as cleanTaskPrompt, T as extractHookTaskTitle, U as listRepoConversations, V as shouldAdoptReportedResumeId, W as listRepoWorktreePaths, _ as projectReviewDetail, a as checkAgentReply, b as buildTaskTitleRefinementPrompt, c as deriveChildSessionName, d as describePushLanding, f as describeRoleRefusal, g as projectMyPrs, h as parseAgentVerb, j as parseRefinedTaskTitle, k as isSubstantivePrompt, l as describeChildEndNote, n as REFUSAL_REASON, o as decideAgentRequest, p as describeUnpushedCloseRefusal, s as decideSpawnAllowance, u as describeKeptChildAttention, v as projectReviews, w as extractAiTitle, x as chooseRefinedSessionName, y as buildPersistedTaskTitle, z as resolveResumeTarget } from "./agent-api-core-D_f8pw2Q.js";
9
+ import { A as parseRefinedSessionName, B as resumePromptFor, C as decideTaskTitleRefinement, D as extractPromptTaskTitle, E as extractOscTaskTitle, F as AUTO_CONTINUE_PROMPT, G as isAutoNameOf, H as claudeProjectsDir, I as RESUME_ID_RE, K as nextSuggestedName, L as isConversationReplacedAtStartup, M as resolveRefocusTaskTitle, N as resolveTaskTitle, O as isSelfWakePrompt, P as seedTaskTitleSources, R as pickAutoResume, S as cleanTaskPrompt, T as extractHookTaskTitle, U as listRepoConversations, V as shouldAdoptReportedResumeId, W as listRepoWorktreePaths, _ as projectReviewDetail, a as checkAgentReply, b as buildTaskTitleRefinementPrompt, c as deriveChildSessionName, d as describePushLanding, f as describeRoleRefusal, g as projectMyPrs, h as parseAgentVerb, j as parseRefinedTaskTitle, k as isSubstantivePrompt, l as describeChildEndNote, n as REFUSAL_REASON, o as decideAgentRequest, p as describeUnpushedCloseRefusal, s as decideSpawnAllowance, u as describeKeptChildAttention, v as projectReviews, w as extractAiTitle, x as chooseRefinedSessionName, y as buildPersistedTaskTitle, z as resolveResumeTarget } from "./agent-api-core-p7mq8Qw9.js";
9
10
  import { a as permitsHelpCommand, o as supervisionLine, r as describeSessionLimits } from "./session-routes-CgqWd0bR.js";
10
11
  import { a as rawTextOr, i as positiveNumberOr, n as isRecord, o as textOr, r as numberOr, t as coercedNumberOr } from "./coerce-oz_Z_6E7.js";
11
12
  import { i as parseCommandLine, n as warnWhenGitIsTooOld } from "./git-version-xS1GFU8P.js";
@@ -24,8 +25,10 @@ import { $ as grokHomes, A as decideUploadType, B as containmentRefusalReason, C
24
25
  import { c as CODEX_HOME_PROFILE, l as KIMI_HOME_PROFILE } from "./agent-home-core-DgW3orTE.js";
25
26
  import { d as releaseSessionLock, f as sessionIdOfLockFile, l as releaseUnheldAgentHomeSecrets, n as generatedAgentHomePath, p as trashSessionTempFolderOnceUnheld, s as realAgentHome, u as createHeldSessionTempFolder } from "./agent-home-BzANIIVe.js";
26
27
  import { a as formatSshPublicKey, c as orderAgentSockets, i as commitSigningShimText, l as parseSshPublicKey, n as NO_AGENT_HOLDS_KEY, o as isForwardedAgentDirName, r as agentListsKey, s as isSignableGitObject, t as COMMIT_SIGNING_SHIM_NAME } from "./ssh-signing-core-CRhVVWNW.js";
27
- import { a as configSiblingPath, c as defaultPairingsPath, d as decideDeviceAuth, f as deviceNameFromUserAgent, l as defaultSeenPath, n as normalizeRemoteConfig, o as createPairingsStore, p as hashSecret, r as validateRemoteConfig, s as createSeenStore, t as decideBindHost, u as DEFAULT_DEVICE_MAX_AGE_MS } from "./remote-config-BTgp5KoH.js";
28
+ import { a as defaultPairingsPath, c as decideDeviceAuth, i as createSeenStore, l as deviceNameFromUserAgent, n as configSiblingPath, o as defaultSeenPath, r as createPairingsStore, s as DEFAULT_DEVICE_MAX_AGE_MS, u as hashSecret } from "./pairings-store-CaQ2CQTr.js";
28
29
  import { n as configFileViewOf, u as readSettingsForAgent } from "./settings-readout-core-Bl5TqUnb.js";
30
+ import { n as normalizeRemoteConfig, r as validateRemoteConfig, t as decideBindHost } from "./remote-config-Dcejfz01.js";
31
+ import { _ as runGit, g as runGh, h as runCommand, i as createCommitSessions, m as gitCommandFailure, t as COMMIT_SESSIONS_FOLDER_NAME } from "./commit-sessions-AA7MD1S2.js";
29
32
  import { createRequire } from "node:module";
30
33
  import fs, { readFileSync } from "node:fs";
31
34
  import path, { join, resolve } from "node:path";
@@ -7709,12 +7712,34 @@ function createSessionEventWiring(dependencies) {
7709
7712
  linkedPrs: prLinks.links
7710
7713
  });
7711
7714
  });
7712
- session.on("worktree-changed", ({ sig }) => {
7715
+ session.on("worktree-changed", ({ sig, headSha, baseRef }) => {
7713
7716
  dependencies.broadcastControl({
7714
7717
  type: "session-changed",
7715
7718
  id: session.id,
7716
7719
  sig
7717
7720
  });
7721
+ const worktreeDir = session.worktreeDir;
7722
+ if (!headSha || !worktreeDir || !session.hasOwnWorktree) return;
7723
+ dependencies.commitSessions?.noteHeadChange({
7724
+ sessionId: session.id,
7725
+ sessionName: session.name,
7726
+ agent: session.agentId,
7727
+ taskTitle: session.taskTitle,
7728
+ worktreeDir,
7729
+ headSha,
7730
+ baseRef: baseRef ?? null
7731
+ });
7732
+ });
7733
+ session.on("commits-landed", ({ repoDir, fromSha, toSha }) => {
7734
+ dependencies.commitSessions?.noteHeadChange({
7735
+ sessionId: session.id,
7736
+ sessionName: session.name,
7737
+ agent: session.agentId,
7738
+ taskTitle: session.taskTitle,
7739
+ worktreeDir: repoDir,
7740
+ headSha: toSha,
7741
+ baseRef: fromSha
7742
+ });
7718
7743
  });
7719
7744
  session.on("worktree-blocked", ({ branch, notice }) => {
7720
7745
  dependencies.broadcastControl({
@@ -16333,76 +16358,6 @@ function createSessionHookLifecycle(options) {
16333
16358
  };
16334
16359
  }
16335
16360
  //#endregion
16336
- //#region server/git/git-exec.ts
16337
- var DEFAULT_COMMAND_TIMEOUT_MS = 2e4;
16338
- function outputText(value) {
16339
- if (typeof value === "string") return value;
16340
- if (Buffer.isBuffer(value)) return value.toString("utf8");
16341
- return value == null ? "" : String(value);
16342
- }
16343
- function childEnv(env, replaceEnv) {
16344
- if (replaceEnv) return { env: replaceEnv };
16345
- if (env) return { env: {
16346
- ...process.env,
16347
- ...env
16348
- } };
16349
- return {};
16350
- }
16351
- async function runCommand(file, args, { cwd, timeoutMs = DEFAULT_COMMAND_TIMEOUT_MS, maxBuffer, env, replaceEnv, signal, input, trim = true, keepStdoutOnFailure = false, preferStderr = false, execFileFn = execFileAsync } = {}) {
16352
- const execOptions = {
16353
- encoding: "utf8",
16354
- timeout: timeoutMs,
16355
- ...cwd === void 0 ? {} : { cwd },
16356
- ...maxBuffer === void 0 ? {} : { maxBuffer },
16357
- ...signal ? { signal } : {},
16358
- ...input === void 0 ? {} : { input },
16359
- ...childEnv(env, replaceEnv)
16360
- };
16361
- try {
16362
- const { stdout, stderr } = await execFileFn(file, args, execOptions);
16363
- const out = outputText(stdout);
16364
- return {
16365
- ok: true,
16366
- out: trim ? out.trim() : out,
16367
- err: "",
16368
- stderr: outputText(stderr)
16369
- };
16370
- } catch (error) {
16371
- const failure = error ?? {};
16372
- const stdout = outputText(failure.stdout);
16373
- const stderr = outputText(failure.stderr);
16374
- const message = errorMessage(error);
16375
- return {
16376
- ok: false,
16377
- out: keepStdoutOnFailure ? trim ? stdout.trim() : stdout : "",
16378
- err: preferStderr ? stderr || message : message,
16379
- stderr,
16380
- error,
16381
- timedOut: failure.killed === true && Boolean(failure.signal)
16382
- };
16383
- }
16384
- }
16385
- function runGit(args, { gitPath = "git", env, replaceEnv, ...rest } = {}) {
16386
- const baseEnv = replaceEnv ?? (env ? {
16387
- ...process.env,
16388
- ...env
16389
- } : process.env);
16390
- return runCommand(gitPath, args, {
16391
- ...rest,
16392
- replaceEnv: {
16393
- ...baseEnv,
16394
- GIT_TERMINAL_PROMPT: "0"
16395
- }
16396
- });
16397
- }
16398
- function gitCommandFailure(args, command, timeoutMs = DEFAULT_COMMAND_TIMEOUT_MS) {
16399
- if (!command.timedOut) return command.error;
16400
- return new Error(`git ${args.join(" ")} timed out after ${timeoutMs}ms`, { cause: command.error });
16401
- }
16402
- function runGh(args, options = {}) {
16403
- return runCommand("gh", args, options);
16404
- }
16405
- //#endregion
16406
16361
  //#region shared/coalesce-timer.ts
16407
16362
  function createCoalescedTimer({ mode, delayMs, run, setTimeoutFn = DEFAULT_TIMER_FNS.setTimeoutFn, clearTimeoutFn = DEFAULT_TIMER_FNS.clearTimeoutFn, unref = true }) {
16408
16363
  let timer = null;
@@ -18077,10 +18032,11 @@ function createSessionWorktreeLifecycle({ id, projectPath, integrationBranch = n
18077
18032
  let behind = "0";
18078
18033
  let rebaseInProgress = false;
18079
18034
  let targetSha = null;
18035
+ let baseRef = null;
18080
18036
  try {
18081
18037
  status = await run(["status", "--porcelain"]);
18082
18038
  head = (await run(["rev-parse", "HEAD"])).trim();
18083
- const { ref: baseRef } = await resolveVerifiedBaseRef(opts);
18039
+ baseRef = (await resolveVerifiedBaseRef(opts)).ref;
18084
18040
  if (baseRef) ahead = (await run([
18085
18041
  "rev-list",
18086
18042
  "--count",
@@ -18125,7 +18081,8 @@ function createSessionWorktreeLifecycle({ id, projectPath, integrationBranch = n
18125
18081
  behind,
18126
18082
  rebaseInProgress,
18127
18083
  headSha: head,
18128
- targetSha
18084
+ targetSha,
18085
+ baseRef
18129
18086
  };
18130
18087
  }
18131
18088
  async function runAutoRebase(trigger, signature) {
@@ -18256,7 +18213,9 @@ function createSessionWorktreeLifecycle({ id, projectPath, integrationBranch = n
18256
18213
  lifecycleState.lastSignature = signature.sig;
18257
18214
  port.emit("worktree-changed", {
18258
18215
  id,
18259
- sig: signature.sig
18216
+ sig: signature.sig,
18217
+ headSha: signature.headSha,
18218
+ baseRef: signature.rebaseInProgress ? null : signature.baseRef
18260
18219
  });
18261
18220
  }
18262
18221
  async function runMergeEngine(workspaceApi, workspace, method, isolation) {
@@ -18274,6 +18233,11 @@ function createSessionWorktreeLifecycle({ id, projectPath, integrationBranch = n
18274
18233
  branch: effectiveIntegrationBranch(),
18275
18234
  notice: mergeResult.warning
18276
18235
  });
18236
+ if (mergeResult.merged && mergeResult.landedRange) port.emit("commits-landed", {
18237
+ id,
18238
+ repoDir: currentProjectPath(),
18239
+ ...mergeResult.landedRange
18240
+ });
18277
18241
  return { result: mergeResult };
18278
18242
  } catch (error) {
18279
18243
  setMergeStatus("pending-review", { reason: errorMessage(error) });
@@ -25638,6 +25602,12 @@ function createGitWorkspace(opts = {}) {
25638
25602
  "--abbrev-ref",
25639
25603
  "HEAD"
25640
25604
  ], projectPath)).out;
25605
+ const targetShaBeforeLanding = (await run([
25606
+ "rev-parse",
25607
+ "--verify",
25608
+ "--quiet",
25609
+ `refs/heads/${target}`
25610
+ ], projectPath)).out;
25641
25611
  if (!(await fastForwardTarget(projectPath, `refs/heads/${branch}`, target, head === target)).ok) {
25642
25612
  await restoreSavedWork(wt, savedWork);
25643
25613
  return {
@@ -25648,12 +25618,23 @@ function createGitWorkspace(opts = {}) {
25648
25618
  rerereReplayed
25649
25619
  };
25650
25620
  }
25621
+ const landedTipSha = (await run([
25622
+ "rev-parse",
25623
+ "--verify",
25624
+ "--quiet",
25625
+ `refs/heads/${target}`
25626
+ ], projectPath)).out;
25627
+ const landedRange = targetShaBeforeLanding && landedTipSha ? {
25628
+ fromSha: targetShaBeforeLanding,
25629
+ toSha: landedTipSha
25630
+ } : null;
25651
25631
  return {
25652
25632
  committed: true,
25653
25633
  merged: true,
25654
25634
  reason: null,
25655
25635
  restoreConflict: !await restoreSavedWork(wt, savedWork),
25656
- rerereReplayed
25636
+ rerereReplayed,
25637
+ landedRange
25657
25638
  };
25658
25639
  }
25659
25640
  async function resolveMergeBack({ projectPath, workspace, targetBranch }) {
@@ -25818,7 +25799,8 @@ function createGitWorkspace(opts = {}) {
25818
25799
  base: target,
25819
25800
  reason: null,
25820
25801
  pushed: await pushBaseToOrigin(projectPath, target),
25821
- rerereReplayed: r.rerereReplayed === true
25802
+ rerereReplayed: r.rerereReplayed === true,
25803
+ landedRange: r.landedRange ?? null
25822
25804
  }, warning);
25823
25805
  }
25824
25806
  async function mergeKeepBody({ projectPath, workspace, targetBranch }) {
@@ -25872,7 +25854,8 @@ function createGitWorkspace(opts = {}) {
25872
25854
  reason: null,
25873
25855
  pushed: await pushBaseToOrigin(projectPath, target),
25874
25856
  restoreConflict: r.restoreConflict || false,
25875
- rerereReplayed: r.rerereReplayed === true
25857
+ rerereReplayed: r.rerereReplayed === true,
25858
+ landedRange: r.landedRange ?? null
25876
25859
  }, warning);
25877
25860
  }
25878
25861
  async function rebaseOnlyBody({ projectPath, workspace, targetBranch }) {
@@ -54107,6 +54090,10 @@ function createBackend(httpServer, options = {}) {
54107
54090
  notificationManager,
54108
54091
  attachSessionPrLink,
54109
54092
  traceWiring,
54093
+ commitSessions: createCommitSessions({
54094
+ storeRoot: configSiblingPath(configStore.configPath, COMMIT_SESSIONS_FOLDER_NAME),
54095
+ logger: console
54096
+ }),
54110
54097
  taskTitleRefiner: laneAssembly.taskTitleRefiner,
54111
54098
  coherenceFeed,
54112
54099
  featureHints: laneAssembly.featureHints,