glimmervoid 0.48.4-next.353 → 0.48.4-next.354
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/chunks/{main-hW4zxxU8.js → main-MOKPGavF.js} +266 -32
- package/dist/client/assets/{benchmark-panel-DalevIl_.js → benchmark-panel-BE4qC6f7.js} +1 -1
- package/dist/client/assets/benchmark-panel-BE4qC6f7.js.br +0 -0
- package/dist/client/assets/{boards-view-B6BAeHwf.js → boards-view-D57L6U0h.js} +1 -1
- package/dist/client/assets/boards-view-D57L6U0h.js.br +0 -0
- package/dist/client/assets/{community-panel-ClD7iXbD.js → community-panel-CskJ8AP8.js} +1 -1
- package/dist/client/assets/community-panel-CskJ8AP8.js.br +0 -0
- package/dist/client/assets/{dialogs-DNzo3EOt.js → dialogs-DfVIXl6X.js} +1 -1
- package/dist/client/assets/dialogs-DfVIXl6X.js.br +0 -0
- package/dist/client/assets/{doc-editor-ui-BZXCUsF4.js → doc-editor-ui-BFtUHES4.js} +1 -1
- package/dist/client/assets/doc-editor-ui-BFtUHES4.js.br +0 -0
- package/dist/client/assets/{feature-hint-B9Qgi2dT.js → feature-hint-DyAk6e1q.js} +1 -1
- package/dist/client/assets/feature-hint-DyAk6e1q.js.br +0 -0
- package/dist/client/assets/{first-run-checklist-BwPSTf3E.js → first-run-checklist-CkkQMeVP.js} +1 -1
- package/dist/client/assets/first-run-checklist-CkkQMeVP.js.br +0 -0
- package/dist/client/assets/{hooks-panel-DgwEHaJz.js → hooks-panel-D7VDfDhJ.js} +1 -1
- package/dist/client/assets/hooks-panel-D7VDfDhJ.js.br +0 -0
- package/dist/client/assets/{index-RwvUeZN-.js → index-DlcYI9Mg.js} +5 -5
- package/dist/client/assets/index-DlcYI9Mg.js.br +0 -0
- package/dist/client/assets/{issues-panel-BEQgkHgu.js → issues-panel-4iTdSU0H.js} +1 -1
- package/dist/client/assets/issues-panel-4iTdSU0H.js.br +0 -0
- package/dist/client/assets/{my-prs-panel-Dcsbuaxp.js → my-prs-panel-DWcYzbAJ.js} +1 -1
- package/dist/client/assets/my-prs-panel-DWcYzbAJ.js.br +0 -0
- package/dist/client/assets/{nyan-cat-9FAhy9-u.js → nyan-cat-DDspnz8S.js} +1 -1
- package/dist/client/assets/nyan-cat-DDspnz8S.js.br +0 -0
- package/dist/client/assets/{phone-shell-D_EkUovc.js → phone-shell-DD2tkq1J.js} +1 -1
- package/dist/client/assets/phone-shell-DD2tkq1J.js.br +0 -0
- package/dist/client/assets/{plan-face-BO-p0Zom.js → plan-face-CuHG-XHp.js} +1 -1
- package/dist/client/assets/plan-face-CuHG-XHp.js.br +0 -0
- package/dist/client/assets/{pr-queue-columns-h2lm6cDe.js → pr-queue-columns-Wpvt5lpP.js} +1 -1
- package/dist/client/assets/pr-queue-columns-Wpvt5lpP.js.br +0 -0
- package/dist/client/assets/{radar-panel-Cp82fbdc.js → radar-panel-D0xCJ-qW.js} +1 -1
- package/dist/client/assets/radar-panel-D0xCJ-qW.js.br +0 -0
- package/dist/client/assets/{repo-roots-adder-B70eIro0.js → repo-roots-adder-C70cwNtz.js} +1 -1
- package/dist/client/assets/repo-roots-adder-C70cwNtz.js.br +0 -0
- package/dist/client/assets/{resume-dialog-lpAVGQLP.js → resume-dialog-CbOszZOP.js} +1 -1
- package/dist/client/assets/resume-dialog-CbOszZOP.js.br +0 -0
- package/dist/client/assets/{review-queue-panel-_aVtOCZN.js → review-queue-panel-B2CbcndW.js} +1 -1
- package/dist/client/assets/review-queue-panel-B2CbcndW.js.br +0 -0
- package/dist/client/assets/{settings-panel-C6GqlQVm.js → settings-panel-B3IBo-4e.js} +2 -2
- package/dist/client/assets/settings-panel-B3IBo-4e.js.br +0 -0
- package/dist/client/assets/{shown-lightbox-DYbT-GrW.js → shown-lightbox-od2gVvDh.js} +1 -1
- package/dist/client/assets/shown-lightbox-od2gVvDh.js.br +0 -0
- package/dist/client/assets/{team-review-panel-DK2jMtdK.js → team-review-panel-BZkszJji.js} +1 -1
- package/dist/client/assets/team-review-panel-BZkszJji.js.br +0 -0
- package/dist/client/assets/{trace-panel-B_W2QH5x.js → trace-panel-BM-GUU8G.js} +1 -1
- package/dist/client/assets/trace-panel-BM-GUU8G.js.br +0 -0
- package/dist/client/assets/{usage-panel-DtCAeoCN.js → usage-panel-Plw6c3LF.js} +1 -1
- package/dist/client/assets/usage-panel-Plw6c3LF.js.br +0 -0
- package/dist/client/assets/{your-day-tip-D6ZQiyId.js → your-day-tip-D0Kgb05j.js} +1 -1
- package/dist/client/assets/your-day-tip-D0Kgb05j.js.br +0 -0
- package/dist/client/index.html +1 -1
- package/dist/client/index.html.br +0 -0
- package/dist/server/index.js +1 -1
- package/package.json +1 -1
- package/dist/client/assets/benchmark-panel-DalevIl_.js.br +0 -0
- package/dist/client/assets/boards-view-B6BAeHwf.js.br +0 -0
- package/dist/client/assets/community-panel-ClD7iXbD.js.br +0 -0
- package/dist/client/assets/dialogs-DNzo3EOt.js.br +0 -0
- package/dist/client/assets/doc-editor-ui-BZXCUsF4.js.br +0 -0
- package/dist/client/assets/feature-hint-B9Qgi2dT.js.br +0 -0
- package/dist/client/assets/first-run-checklist-BwPSTf3E.js.br +0 -0
- package/dist/client/assets/hooks-panel-DgwEHaJz.js.br +0 -0
- package/dist/client/assets/index-RwvUeZN-.js.br +0 -0
- package/dist/client/assets/issues-panel-BEQgkHgu.js.br +0 -0
- package/dist/client/assets/my-prs-panel-Dcsbuaxp.js.br +0 -0
- package/dist/client/assets/nyan-cat-9FAhy9-u.js.br +0 -0
- package/dist/client/assets/phone-shell-D_EkUovc.js.br +0 -0
- package/dist/client/assets/plan-face-BO-p0Zom.js.br +0 -0
- package/dist/client/assets/pr-queue-columns-h2lm6cDe.js.br +0 -0
- package/dist/client/assets/radar-panel-Cp82fbdc.js.br +0 -0
- package/dist/client/assets/repo-roots-adder-B70eIro0.js.br +0 -0
- package/dist/client/assets/resume-dialog-lpAVGQLP.js.br +0 -0
- package/dist/client/assets/review-queue-panel-_aVtOCZN.js.br +0 -0
- package/dist/client/assets/settings-panel-C6GqlQVm.js.br +0 -0
- package/dist/client/assets/shown-lightbox-DYbT-GrW.js.br +0 -0
- package/dist/client/assets/team-review-panel-DK2jMtdK.js.br +0 -0
- package/dist/client/assets/trace-panel-B_W2QH5x.js.br +0 -0
- package/dist/client/assets/usage-panel-DtCAeoCN.js.br +0 -0
- package/dist/client/assets/your-day-tip-D6ZQiyId.js.br +0 -0
|
@@ -2,7 +2,7 @@ import { a as showHomeAsTilde, i as sanitizeOneLine, n as requireExecutableSpawn
|
|
|
2
2
|
import { a as isMissingFileError, r as errorMessage, t as errorCode } from "./text-DoirglWV.js";
|
|
3
3
|
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
4
|
import { n as glimmervoidHomeDir, r as isOperatorHomeUnderTest, t as decideConfigPath } from "./config-path-core-DUWk0Lui.js";
|
|
5
|
-
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";
|
|
5
|
+
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$1, 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
6
|
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
7
|
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
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";
|
|
@@ -7709,12 +7709,34 @@ function createSessionEventWiring(dependencies) {
|
|
|
7709
7709
|
linkedPrs: prLinks.links
|
|
7710
7710
|
});
|
|
7711
7711
|
});
|
|
7712
|
-
session.on("worktree-changed", ({ sig }) => {
|
|
7712
|
+
session.on("worktree-changed", ({ sig, headSha, baseRef }) => {
|
|
7713
7713
|
dependencies.broadcastControl({
|
|
7714
7714
|
type: "session-changed",
|
|
7715
7715
|
id: session.id,
|
|
7716
7716
|
sig
|
|
7717
7717
|
});
|
|
7718
|
+
const worktreeDir = session.worktreeDir;
|
|
7719
|
+
if (!headSha || !worktreeDir || !session.hasOwnWorktree) return;
|
|
7720
|
+
dependencies.commitSessions?.noteHeadChange({
|
|
7721
|
+
sessionId: session.id,
|
|
7722
|
+
sessionName: session.name,
|
|
7723
|
+
agent: session.agentId,
|
|
7724
|
+
taskTitle: session.taskTitle,
|
|
7725
|
+
worktreeDir,
|
|
7726
|
+
headSha,
|
|
7727
|
+
baseRef: baseRef ?? null
|
|
7728
|
+
});
|
|
7729
|
+
});
|
|
7730
|
+
session.on("commits-landed", ({ repoDir, fromSha, toSha }) => {
|
|
7731
|
+
dependencies.commitSessions?.noteHeadChange({
|
|
7732
|
+
sessionId: session.id,
|
|
7733
|
+
sessionName: session.name,
|
|
7734
|
+
agent: session.agentId,
|
|
7735
|
+
taskTitle: session.taskTitle,
|
|
7736
|
+
worktreeDir: repoDir,
|
|
7737
|
+
headSha: toSha,
|
|
7738
|
+
baseRef: fromSha
|
|
7739
|
+
});
|
|
7718
7740
|
});
|
|
7719
7741
|
session.on("worktree-blocked", ({ branch, notice }) => {
|
|
7720
7742
|
dependencies.broadcastControl({
|
|
@@ -11180,7 +11202,7 @@ function normalizeGithubPr(node, behindBy = null, threadNodes = []) {
|
|
|
11180
11202
|
reviewer: review.author?.login ?? null,
|
|
11181
11203
|
state: review.state,
|
|
11182
11204
|
submittedAt: review.submittedAt,
|
|
11183
|
-
commit: CommitSha.safeParse(review.commit?.oid).data ?? null
|
|
11205
|
+
commit: CommitSha$1.safeParse(review.commit?.oid).data ?? null
|
|
11184
11206
|
})),
|
|
11185
11207
|
opinionatedWriterReviewStates: (node.writerOpinionatedReviews?.nodes ?? []).map((review) => review.state)
|
|
11186
11208
|
};
|
|
@@ -18077,10 +18099,11 @@ function createSessionWorktreeLifecycle({ id, projectPath, integrationBranch = n
|
|
|
18077
18099
|
let behind = "0";
|
|
18078
18100
|
let rebaseInProgress = false;
|
|
18079
18101
|
let targetSha = null;
|
|
18102
|
+
let baseRef = null;
|
|
18080
18103
|
try {
|
|
18081
18104
|
status = await run(["status", "--porcelain"]);
|
|
18082
18105
|
head = (await run(["rev-parse", "HEAD"])).trim();
|
|
18083
|
-
|
|
18106
|
+
baseRef = (await resolveVerifiedBaseRef(opts)).ref;
|
|
18084
18107
|
if (baseRef) ahead = (await run([
|
|
18085
18108
|
"rev-list",
|
|
18086
18109
|
"--count",
|
|
@@ -18125,7 +18148,8 @@ function createSessionWorktreeLifecycle({ id, projectPath, integrationBranch = n
|
|
|
18125
18148
|
behind,
|
|
18126
18149
|
rebaseInProgress,
|
|
18127
18150
|
headSha: head,
|
|
18128
|
-
targetSha
|
|
18151
|
+
targetSha,
|
|
18152
|
+
baseRef
|
|
18129
18153
|
};
|
|
18130
18154
|
}
|
|
18131
18155
|
async function runAutoRebase(trigger, signature) {
|
|
@@ -18256,7 +18280,9 @@ function createSessionWorktreeLifecycle({ id, projectPath, integrationBranch = n
|
|
|
18256
18280
|
lifecycleState.lastSignature = signature.sig;
|
|
18257
18281
|
port.emit("worktree-changed", {
|
|
18258
18282
|
id,
|
|
18259
|
-
sig: signature.sig
|
|
18283
|
+
sig: signature.sig,
|
|
18284
|
+
headSha: signature.headSha,
|
|
18285
|
+
baseRef: signature.rebaseInProgress ? null : signature.baseRef
|
|
18260
18286
|
});
|
|
18261
18287
|
}
|
|
18262
18288
|
async function runMergeEngine(workspaceApi, workspace, method, isolation) {
|
|
@@ -18274,6 +18300,11 @@ function createSessionWorktreeLifecycle({ id, projectPath, integrationBranch = n
|
|
|
18274
18300
|
branch: effectiveIntegrationBranch(),
|
|
18275
18301
|
notice: mergeResult.warning
|
|
18276
18302
|
});
|
|
18303
|
+
if (mergeResult.merged && mergeResult.landedRange) port.emit("commits-landed", {
|
|
18304
|
+
id,
|
|
18305
|
+
repoDir: currentProjectPath(),
|
|
18306
|
+
...mergeResult.landedRange
|
|
18307
|
+
});
|
|
18277
18308
|
return { result: mergeResult };
|
|
18278
18309
|
} catch (error) {
|
|
18279
18310
|
setMergeStatus("pending-review", { reason: errorMessage(error) });
|
|
@@ -21646,7 +21677,7 @@ var MERGED_PRS_RESPONSE = z.object({ data: z.object({ search: z.object({
|
|
|
21646
21677
|
var BENCHMARK_REVIEW_BATCH_SIZE = 10;
|
|
21647
21678
|
var COMPARE_FILE_LIST_CAP = 300;
|
|
21648
21679
|
var COMPARE_RESPONSE = z.object({
|
|
21649
|
-
mergeBaseSha: CommitSha,
|
|
21680
|
+
mergeBaseSha: CommitSha$1,
|
|
21650
21681
|
changedFiles: z.array(z.string().min(1)),
|
|
21651
21682
|
fileCount: z.number().int().nonnegative()
|
|
21652
21683
|
});
|
|
@@ -22296,7 +22327,7 @@ function createPrGh(cwd, commandRunner = run) {
|
|
|
22296
22327
|
};
|
|
22297
22328
|
},
|
|
22298
22329
|
async teamReviewCompare(repo, base, head) {
|
|
22299
|
-
if (!repoParts(repo) || !CommitSha.safeParse(base).success || !CommitSha.safeParse(head).success) return {
|
|
22330
|
+
if (!repoParts(repo) || !CommitSha$1.safeParse(base).success || !CommitSha$1.safeParse(head).success) return {
|
|
22300
22331
|
ok: true,
|
|
22301
22332
|
comparison: null
|
|
22302
22333
|
};
|
|
@@ -22398,7 +22429,7 @@ function createPrGh(cwd, commandRunner = run) {
|
|
|
22398
22429
|
},
|
|
22399
22430
|
async compareCommits(repo, base, head) {
|
|
22400
22431
|
const parts = repoParts(repo);
|
|
22401
|
-
if (!parts || !CommitSha.safeParse(base).success || !CommitSha.safeParse(head).success) return null;
|
|
22432
|
+
if (!parts || !CommitSha$1.safeParse(base).success || !CommitSha$1.safeParse(head).success) return null;
|
|
22402
22433
|
const response = await runGh([
|
|
22403
22434
|
"api",
|
|
22404
22435
|
`repos/${parts[0]}/${parts[1]}/compare/${base}...${head}`,
|
|
@@ -22416,7 +22447,7 @@ function createPrGh(cwd, commandRunner = run) {
|
|
|
22416
22447
|
},
|
|
22417
22448
|
async behindCounts(prs) {
|
|
22418
22449
|
const counts = /* @__PURE__ */ new Map();
|
|
22419
|
-
await forEachAliasedPr(prs.filter((pr) => repoParts(pr.repo) && isPrNumber(pr.number) && CommitSha.safeParse(pr.headSha).success), behindCountsQuery, (pr, repository) => {
|
|
22450
|
+
await forEachAliasedPr(prs.filter((pr) => repoParts(pr.repo) && isPrNumber(pr.number) && CommitSha$1.safeParse(pr.headSha).success), behindCountsQuery, (pr, repository) => {
|
|
22420
22451
|
const comparison = GRAPHQL_BEHIND_REPOSITORY.safeParse(repository);
|
|
22421
22452
|
const behindBy = comparison.success ? comparison.data.pullRequest?.baseRef?.compare?.behindBy : void 0;
|
|
22422
22453
|
if (behindBy !== void 0) counts.set(reviewSnapshotKey(pr.repo, pr.number), behindBy);
|
|
@@ -22435,7 +22466,7 @@ function createPrGh(cwd, commandRunner = run) {
|
|
|
22435
22466
|
return parsed.success ? githubRateLimitWaitMs(parsed.data, nowMs, resourceNames) : null;
|
|
22436
22467
|
},
|
|
22437
22468
|
async rebasePr(pullRequestId, expectedHeadSha) {
|
|
22438
|
-
if (!NODE_ID_RE.test(pullRequestId) || !CommitSha.safeParse(expectedHeadSha).success) return {
|
|
22469
|
+
if (!NODE_ID_RE.test(pullRequestId) || !CommitSha$1.safeParse(expectedHeadSha).success) return {
|
|
22439
22470
|
ok: false,
|
|
22440
22471
|
err: "invalid pull request id or head"
|
|
22441
22472
|
};
|
|
@@ -22469,7 +22500,7 @@ function createPrGh(cwd, commandRunner = run) {
|
|
|
22469
22500
|
ok: false,
|
|
22470
22501
|
err: "invalid repository or pull request number"
|
|
22471
22502
|
};
|
|
22472
|
-
if (!CommitSha.safeParse(headSha).success) return {
|
|
22503
|
+
if (!CommitSha$1.safeParse(headSha).success) return {
|
|
22473
22504
|
ok: false,
|
|
22474
22505
|
err: "invalid head commit"
|
|
22475
22506
|
};
|
|
@@ -22692,7 +22723,7 @@ function createPrGh(cwd, commandRunner = run) {
|
|
|
22692
22723
|
".headRefOid"
|
|
22693
22724
|
]);
|
|
22694
22725
|
if (!response.ok) return null;
|
|
22695
|
-
const parsed = CommitSha.safeParse(response.out);
|
|
22726
|
+
const parsed = CommitSha$1.safeParse(response.out);
|
|
22696
22727
|
return parsed.success ? parsed.data : null;
|
|
22697
22728
|
},
|
|
22698
22729
|
async postReview({ repo, number, commitId, event, body, comments }) {
|
|
@@ -22702,7 +22733,7 @@ function createPrGh(cwd, commandRunner = run) {
|
|
|
22702
22733
|
err: "invalid repository or pull request number",
|
|
22703
22734
|
reviewId: null
|
|
22704
22735
|
};
|
|
22705
|
-
if (!CommitSha.safeParse(commitId).success) return {
|
|
22736
|
+
if (!CommitSha$1.safeParse(commitId).success) return {
|
|
22706
22737
|
ok: false,
|
|
22707
22738
|
err: "invalid commit id",
|
|
22708
22739
|
reviewId: null
|
|
@@ -22910,7 +22941,7 @@ function createRepoCache({ rootDir, commandRunner = defaultCommandRunner, remote
|
|
|
22910
22941
|
err: fetched.err
|
|
22911
22942
|
};
|
|
22912
22943
|
const head = await run(["rev-parse", prHeadRef(number)], repoDir);
|
|
22913
|
-
const parsed = CommitSha.safeParse(head.out);
|
|
22944
|
+
const parsed = CommitSha$1.safeParse(head.out);
|
|
22914
22945
|
if (!head.ok || !parsed.success) return {
|
|
22915
22946
|
ok: false,
|
|
22916
22947
|
headSha: null,
|
|
@@ -22925,7 +22956,7 @@ function createRepoCache({ rootDir, commandRunner = defaultCommandRunner, remote
|
|
|
22925
22956
|
},
|
|
22926
22957
|
async hydrateTree(repo, headSha) {
|
|
22927
22958
|
const parts = repoParts(repo);
|
|
22928
|
-
if (!parts || !CommitSha.safeParse(headSha).success) return {
|
|
22959
|
+
if (!parts || !CommitSha$1.safeParse(headSha).success) return {
|
|
22929
22960
|
ok: false,
|
|
22930
22961
|
err: ""
|
|
22931
22962
|
};
|
|
@@ -22959,7 +22990,7 @@ function createRepoCache({ rootDir, commandRunner = defaultCommandRunner, remote
|
|
|
22959
22990
|
},
|
|
22960
22991
|
async hydrateRange(repo, number, headSha) {
|
|
22961
22992
|
const parts = repoParts(repo);
|
|
22962
|
-
if (!parts || !Number.isSafeInteger(number) || number <= 0 || !CommitSha.safeParse(headSha).success) return {
|
|
22993
|
+
if (!parts || !Number.isSafeInteger(number) || number <= 0 || !CommitSha$1.safeParse(headSha).success) return {
|
|
22963
22994
|
ok: false,
|
|
22964
22995
|
err: ""
|
|
22965
22996
|
};
|
|
@@ -22982,7 +23013,7 @@ function createRepoCache({ rootDir, commandRunner = defaultCommandRunner, remote
|
|
|
22982
23013
|
},
|
|
22983
23014
|
async hydrateSince(repo, sinceSha, headSha) {
|
|
22984
23015
|
const parts = repoParts(repo);
|
|
22985
|
-
if (!parts || !CommitSha.safeParse(sinceSha).success || !CommitSha.safeParse(headSha).success) return false;
|
|
23016
|
+
if (!parts || !CommitSha$1.safeParse(sinceSha).success || !CommitSha$1.safeParse(headSha).success) return false;
|
|
22986
23017
|
return queueFor(repo).run(async () => {
|
|
22987
23018
|
const repoDir = await ensureRepoUnlocked(repo, parts);
|
|
22988
23019
|
if (!repoDir) return false;
|
|
@@ -23007,7 +23038,7 @@ function createRepoCache({ rootDir, commandRunner = defaultCommandRunner, remote
|
|
|
23007
23038
|
priorHead,
|
|
23008
23039
|
priorBase,
|
|
23009
23040
|
head
|
|
23010
|
-
].every((sha) => CommitSha.safeParse(sha).success)) return isolationFailure("invalid commit sha");
|
|
23041
|
+
].every((sha) => CommitSha$1.safeParse(sha).success)) return isolationFailure("invalid commit sha");
|
|
23011
23042
|
return queueFor(repo).run(async () => {
|
|
23012
23043
|
const repoDir = await ensureRepoUnlocked(repo, parts);
|
|
23013
23044
|
if (!repoDir) return isolationFailure("no cache clone");
|
|
@@ -23016,14 +23047,14 @@ function createRepoCache({ rootDir, commandRunner = defaultCommandRunner, remote
|
|
|
23016
23047
|
priorBase,
|
|
23017
23048
|
priorHead
|
|
23018
23049
|
], repoDir);
|
|
23019
|
-
const priorMergeBase = CommitSha.safeParse(priorMergeBaseRun.out.trim());
|
|
23050
|
+
const priorMergeBase = CommitSha$1.safeParse(priorMergeBaseRun.out.trim());
|
|
23020
23051
|
if (!priorMergeBase.success) return isolationFailure("merge-base of the earlier review failed", priorMergeBaseRun.err);
|
|
23021
23052
|
const currentMergeBaseRun = await run([
|
|
23022
23053
|
"merge-base",
|
|
23023
23054
|
prBaseRef(number),
|
|
23024
23055
|
head
|
|
23025
23056
|
], repoDir);
|
|
23026
|
-
const currentMergeBase = CommitSha.safeParse(currentMergeBaseRun.out.trim());
|
|
23057
|
+
const currentMergeBase = CommitSha$1.safeParse(currentMergeBaseRun.out.trim());
|
|
23027
23058
|
if (!currentMergeBase.success) return isolationFailure("merge-base of the current head failed", currentMergeBaseRun.err);
|
|
23028
23059
|
const rangeDiff = await run([
|
|
23029
23060
|
"range-diff",
|
|
@@ -25638,6 +25669,12 @@ function createGitWorkspace(opts = {}) {
|
|
|
25638
25669
|
"--abbrev-ref",
|
|
25639
25670
|
"HEAD"
|
|
25640
25671
|
], projectPath)).out;
|
|
25672
|
+
const targetShaBeforeLanding = (await run([
|
|
25673
|
+
"rev-parse",
|
|
25674
|
+
"--verify",
|
|
25675
|
+
"--quiet",
|
|
25676
|
+
`refs/heads/${target}`
|
|
25677
|
+
], projectPath)).out;
|
|
25641
25678
|
if (!(await fastForwardTarget(projectPath, `refs/heads/${branch}`, target, head === target)).ok) {
|
|
25642
25679
|
await restoreSavedWork(wt, savedWork);
|
|
25643
25680
|
return {
|
|
@@ -25648,12 +25685,23 @@ function createGitWorkspace(opts = {}) {
|
|
|
25648
25685
|
rerereReplayed
|
|
25649
25686
|
};
|
|
25650
25687
|
}
|
|
25688
|
+
const landedTipSha = (await run([
|
|
25689
|
+
"rev-parse",
|
|
25690
|
+
"--verify",
|
|
25691
|
+
"--quiet",
|
|
25692
|
+
`refs/heads/${target}`
|
|
25693
|
+
], projectPath)).out;
|
|
25694
|
+
const landedRange = targetShaBeforeLanding && landedTipSha ? {
|
|
25695
|
+
fromSha: targetShaBeforeLanding,
|
|
25696
|
+
toSha: landedTipSha
|
|
25697
|
+
} : null;
|
|
25651
25698
|
return {
|
|
25652
25699
|
committed: true,
|
|
25653
25700
|
merged: true,
|
|
25654
25701
|
reason: null,
|
|
25655
25702
|
restoreConflict: !await restoreSavedWork(wt, savedWork),
|
|
25656
|
-
rerereReplayed
|
|
25703
|
+
rerereReplayed,
|
|
25704
|
+
landedRange
|
|
25657
25705
|
};
|
|
25658
25706
|
}
|
|
25659
25707
|
async function resolveMergeBack({ projectPath, workspace, targetBranch }) {
|
|
@@ -25818,7 +25866,8 @@ function createGitWorkspace(opts = {}) {
|
|
|
25818
25866
|
base: target,
|
|
25819
25867
|
reason: null,
|
|
25820
25868
|
pushed: await pushBaseToOrigin(projectPath, target),
|
|
25821
|
-
rerereReplayed: r.rerereReplayed === true
|
|
25869
|
+
rerereReplayed: r.rerereReplayed === true,
|
|
25870
|
+
landedRange: r.landedRange ?? null
|
|
25822
25871
|
}, warning);
|
|
25823
25872
|
}
|
|
25824
25873
|
async function mergeKeepBody({ projectPath, workspace, targetBranch }) {
|
|
@@ -25872,7 +25921,8 @@ function createGitWorkspace(opts = {}) {
|
|
|
25872
25921
|
reason: null,
|
|
25873
25922
|
pushed: await pushBaseToOrigin(projectPath, target),
|
|
25874
25923
|
restoreConflict: r.restoreConflict || false,
|
|
25875
|
-
rerereReplayed: r.rerereReplayed === true
|
|
25924
|
+
rerereReplayed: r.rerereReplayed === true,
|
|
25925
|
+
landedRange: r.landedRange ?? null
|
|
25876
25926
|
}, warning);
|
|
25877
25927
|
}
|
|
25878
25928
|
async function rebaseOnlyBody({ projectPath, workspace, targetBranch }) {
|
|
@@ -36595,7 +36645,7 @@ function createGuardedPrStaging({ spawnSession, repoCache, runGit = runTrustedGi
|
|
|
36595
36645
|
`${prBaseRef(pr.number)}^{commit}`
|
|
36596
36646
|
], projectPath, signal);
|
|
36597
36647
|
if (signal.aborted) return stopped;
|
|
36598
|
-
const baseSha = CommitSha.safeParse(base.out);
|
|
36648
|
+
const baseSha = CommitSha$1.safeParse(base.out);
|
|
36599
36649
|
if (!base.ok || !baseSha.success) return { error: `could not read the base of ${pr.key} ${base.err}` };
|
|
36600
36650
|
const hydrated = await repoCache.hydrateRange(pr.repo, pr.number, pr.headRefOid);
|
|
36601
36651
|
if (signal.aborted) return stopped;
|
|
@@ -36810,7 +36860,7 @@ function createMyPrMergeabilityFix({ spawnSession, repoCache, workRoot, makeWork
|
|
|
36810
36860
|
GIT_AUTHOR_EMAIL: authorEmail,
|
|
36811
36861
|
GIT_AUTHOR_DATE: authorDate
|
|
36812
36862
|
});
|
|
36813
|
-
const signedSha = CommitSha.safeParse(signed.out);
|
|
36863
|
+
const signedSha = CommitSha$1.safeParse(signed.out);
|
|
36814
36864
|
if (!signed.ok || !signedSha.success) return {
|
|
36815
36865
|
ok: false,
|
|
36816
36866
|
err: signed.err
|
|
@@ -36873,7 +36923,7 @@ function createMyPrMergeabilityFix({ spawnSession, repoCache, workRoot, makeWork
|
|
|
36873
36923
|
"--verify",
|
|
36874
36924
|
`${handoffRef}^{commit}`
|
|
36875
36925
|
], staged.projectPath);
|
|
36876
|
-
const resultSha = CommitSha.safeParse(result.out);
|
|
36926
|
+
const resultSha = CommitSha$1.safeParse(result.out);
|
|
36877
36927
|
if (signal.aborted) return stopped;
|
|
36878
36928
|
if (!result.ok || !resultSha.success) return reportRepairFailure(pr, `not pushed: could not read the session commit ${result.err}`);
|
|
36879
36929
|
const onTopOfHead = await runGit([
|
|
@@ -45728,7 +45778,7 @@ function computeCrossRepoLinks(repos) {
|
|
|
45728
45778
|
}
|
|
45729
45779
|
//#endregion
|
|
45730
45780
|
//#region server/change-map/change-map-wiring.ts
|
|
45731
|
-
var GIT_TIMEOUT_MS$
|
|
45781
|
+
var GIT_TIMEOUT_MS$2 = 15e3;
|
|
45732
45782
|
var GIT_MAX_BUFFER_BYTES = 67108864;
|
|
45733
45783
|
var FILE_READ_BATCH = 64;
|
|
45734
45784
|
var MAX_CACHED_FILES = 5e4;
|
|
@@ -45751,11 +45801,11 @@ function joinSessionRegistries(...registries) {
|
|
|
45751
45801
|
async function runGitAsync(args, cwd) {
|
|
45752
45802
|
const result = await runGit(args, {
|
|
45753
45803
|
cwd,
|
|
45754
|
-
timeoutMs: GIT_TIMEOUT_MS$
|
|
45804
|
+
timeoutMs: GIT_TIMEOUT_MS$2,
|
|
45755
45805
|
maxBuffer: GIT_MAX_BUFFER_BYTES,
|
|
45756
45806
|
trim: false
|
|
45757
45807
|
});
|
|
45758
|
-
if (!result.ok) throw gitCommandFailure(args, result, GIT_TIMEOUT_MS$
|
|
45808
|
+
if (!result.ok) throw gitCommandFailure(args, result, GIT_TIMEOUT_MS$2);
|
|
45759
45809
|
return result.out;
|
|
45760
45810
|
}
|
|
45761
45811
|
function yieldToEventLoop$1() {
|
|
@@ -52880,7 +52930,7 @@ function trackedReportNoticeText(repositoryCount) {
|
|
|
52880
52930
|
}
|
|
52881
52931
|
//#endregion
|
|
52882
52932
|
//#region server/post-turn-leftovers.ts
|
|
52883
|
-
var GIT_TIMEOUT_MS = 1e4;
|
|
52933
|
+
var GIT_TIMEOUT_MS$1 = 1e4;
|
|
52884
52934
|
var CONTROL_CHARACTER = /[\x00-\x1f\x7f]/;
|
|
52885
52935
|
var NOTHING_CLEANED = {
|
|
52886
52936
|
removedFileCount: 0,
|
|
@@ -52889,7 +52939,7 @@ var NOTHING_CLEANED = {
|
|
|
52889
52939
|
async function gitOutput(args, cwd) {
|
|
52890
52940
|
const result = await runGit(args, {
|
|
52891
52941
|
cwd,
|
|
52892
|
-
timeoutMs: GIT_TIMEOUT_MS,
|
|
52942
|
+
timeoutMs: GIT_TIMEOUT_MS$1,
|
|
52893
52943
|
trim: false
|
|
52894
52944
|
});
|
|
52895
52945
|
if (!result.ok) throw result.error ?? new Error(result.err);
|
|
@@ -53710,6 +53760,186 @@ function createSessionDocsWiring({ broadcastControl, now = Date.now }) {
|
|
|
53710
53760
|
};
|
|
53711
53761
|
}
|
|
53712
53762
|
//#endregion
|
|
53763
|
+
//#region shared/contracts/commit-session.ts
|
|
53764
|
+
var CommitSha = z.string().regex(/^[0-9a-f]{40}$/);
|
|
53765
|
+
var CommitSessionRecord = z.object({
|
|
53766
|
+
sha: CommitSha,
|
|
53767
|
+
patchId: CommitSha.nullable(),
|
|
53768
|
+
sessionId: z.string().min(1).max(64),
|
|
53769
|
+
sessionName: z.string().max(200),
|
|
53770
|
+
agent: z.string().max(64),
|
|
53771
|
+
taskTitle: z.string().max(300).nullable(),
|
|
53772
|
+
committedAt: z.number().int(),
|
|
53773
|
+
recordedAt: z.number().int()
|
|
53774
|
+
}).strict();
|
|
53775
|
+
//#endregion
|
|
53776
|
+
//#region server/core/commit-session-core.ts
|
|
53777
|
+
var COMMIT_LOG_FORMAT = "%H %ct";
|
|
53778
|
+
var REPO_KEY_HASH_LENGTH = 12;
|
|
53779
|
+
function repoKeyOf(gitCommonDirectory) {
|
|
53780
|
+
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)}`;
|
|
53781
|
+
}
|
|
53782
|
+
function parseCommitLog(logOutput) {
|
|
53783
|
+
return logOutput.split("\n").flatMap((line) => {
|
|
53784
|
+
const [sha, seconds] = line.trim().split(" ");
|
|
53785
|
+
if (!sha || !/^[0-9a-f]{40}$/.test(sha) || !seconds) return [];
|
|
53786
|
+
return [{
|
|
53787
|
+
sha,
|
|
53788
|
+
committedAt: Number(seconds) * 1e3
|
|
53789
|
+
}];
|
|
53790
|
+
});
|
|
53791
|
+
}
|
|
53792
|
+
function parsePatchIds(patchIdOutput) {
|
|
53793
|
+
const patchIdBySha = /* @__PURE__ */ new Map();
|
|
53794
|
+
for (const line of patchIdOutput.split("\n")) {
|
|
53795
|
+
const [patchId, sha] = line.trim().split(" ");
|
|
53796
|
+
if (patchId && sha) patchIdBySha.set(sha, patchId);
|
|
53797
|
+
}
|
|
53798
|
+
return patchIdBySha;
|
|
53799
|
+
}
|
|
53800
|
+
function recordAround(storeText, offset) {
|
|
53801
|
+
const lineStart = storeText.lastIndexOf("\n", offset) + 1;
|
|
53802
|
+
const lineEnd = storeText.indexOf("\n", offset);
|
|
53803
|
+
try {
|
|
53804
|
+
const parsed = CommitSessionRecord.safeParse(JSON.parse(storeText.slice(lineStart, lineEnd === -1 ? void 0 : lineEnd)));
|
|
53805
|
+
return parsed.success ? parsed.data : null;
|
|
53806
|
+
} catch {
|
|
53807
|
+
return null;
|
|
53808
|
+
}
|
|
53809
|
+
}
|
|
53810
|
+
function recordedShasOf(storeText, sessionId) {
|
|
53811
|
+
const recordedShas = /* @__PURE__ */ new Set();
|
|
53812
|
+
const sessionMarker = `"sessionId":${JSON.stringify(sessionId)}`;
|
|
53813
|
+
for (let at = storeText.indexOf(sessionMarker); at !== -1; at = storeText.indexOf(sessionMarker, at + sessionMarker.length)) {
|
|
53814
|
+
const record = recordAround(storeText, at);
|
|
53815
|
+
if (record?.sessionId === sessionId) recordedShas.add(record.sha);
|
|
53816
|
+
}
|
|
53817
|
+
return recordedShas;
|
|
53818
|
+
}
|
|
53819
|
+
//#endregion
|
|
53820
|
+
//#region server/commit-sessions.ts
|
|
53821
|
+
var COMMIT_SESSIONS_FOLDER_NAME = "commit-sessions";
|
|
53822
|
+
var GIT_TIMEOUT_MS = 2e4;
|
|
53823
|
+
var GIT_MAX_BUFFER = 67108864;
|
|
53824
|
+
function storePathFor(storeRoot, gitCommonDirectory) {
|
|
53825
|
+
return path.join(storeRoot, `${repoKeyOf(gitCommonDirectory)}.jsonl`);
|
|
53826
|
+
}
|
|
53827
|
+
async function gitCommonDirectoryOf(directory, runGitFn = runGit) {
|
|
53828
|
+
const result = await runGitFn([
|
|
53829
|
+
"rev-parse",
|
|
53830
|
+
"--path-format=absolute",
|
|
53831
|
+
"--git-common-dir"
|
|
53832
|
+
], {
|
|
53833
|
+
cwd: directory,
|
|
53834
|
+
timeoutMs: GIT_TIMEOUT_MS
|
|
53835
|
+
});
|
|
53836
|
+
if (!result.ok || !result.out) return null;
|
|
53837
|
+
return fs.promises.realpath(result.out).catch(() => result.out);
|
|
53838
|
+
}
|
|
53839
|
+
async function readStoreText(storePath) {
|
|
53840
|
+
return fs.promises.readFile(storePath, "utf8").catch(() => "");
|
|
53841
|
+
}
|
|
53842
|
+
function createCommitSessions({ storeRoot, runGitFn = runGit, logger, nowFn = Date.now }) {
|
|
53843
|
+
const lastCapturedHeadBySessionId = /* @__PURE__ */ new Map();
|
|
53844
|
+
const recordedShasBySessionId = /* @__PURE__ */ new Map();
|
|
53845
|
+
const storePathByWorktreeDir = /* @__PURE__ */ new Map();
|
|
53846
|
+
const captureQueue = createKeyedSerialQueue();
|
|
53847
|
+
async function storePathOf(worktreeDir) {
|
|
53848
|
+
const known = storePathByWorktreeDir.get(worktreeDir);
|
|
53849
|
+
if (known) return known;
|
|
53850
|
+
const gitCommonDirectory = await gitCommonDirectoryOf(worktreeDir, runGitFn);
|
|
53851
|
+
if (!gitCommonDirectory) return null;
|
|
53852
|
+
const storePath = storePathFor(storeRoot, gitCommonDirectory);
|
|
53853
|
+
storePathByWorktreeDir.set(worktreeDir, storePath);
|
|
53854
|
+
return storePath;
|
|
53855
|
+
}
|
|
53856
|
+
async function recordedShasFor(sessionId, storePath) {
|
|
53857
|
+
const known = recordedShasBySessionId.get(sessionId);
|
|
53858
|
+
if (known) return known;
|
|
53859
|
+
const recordedShas = recordedShasOf(await readStoreText(storePath), sessionId);
|
|
53860
|
+
recordedShasBySessionId.set(sessionId, recordedShas);
|
|
53861
|
+
return recordedShas;
|
|
53862
|
+
}
|
|
53863
|
+
async function patchIdsOfBatch(shas, gitOptions) {
|
|
53864
|
+
const patches = await runGitFn([
|
|
53865
|
+
"show",
|
|
53866
|
+
"--no-color",
|
|
53867
|
+
"--format=commit %H",
|
|
53868
|
+
"-p",
|
|
53869
|
+
...shas
|
|
53870
|
+
], {
|
|
53871
|
+
...gitOptions,
|
|
53872
|
+
trim: false
|
|
53873
|
+
});
|
|
53874
|
+
if (!patches.ok) return null;
|
|
53875
|
+
const patchIds = await runGitFn(["patch-id", "--stable"], {
|
|
53876
|
+
...gitOptions,
|
|
53877
|
+
input: patches.out
|
|
53878
|
+
});
|
|
53879
|
+
return patchIds.ok ? parsePatchIds(patchIds.out) : null;
|
|
53880
|
+
}
|
|
53881
|
+
async function patchIdsOf(commits, gitOptions) {
|
|
53882
|
+
const shas = commits.map((commit) => commit.sha);
|
|
53883
|
+
const batchPatchIds = await patchIdsOfBatch(shas, gitOptions);
|
|
53884
|
+
if (batchPatchIds || shas.length === 1) return batchPatchIds ?? /* @__PURE__ */ new Map();
|
|
53885
|
+
const patchIdBySha = /* @__PURE__ */ new Map();
|
|
53886
|
+
for (const sha of shas) {
|
|
53887
|
+
const singlePatchId = (await patchIdsOfBatch([sha], gitOptions))?.get(sha);
|
|
53888
|
+
if (singlePatchId) patchIdBySha.set(sha, singlePatchId);
|
|
53889
|
+
}
|
|
53890
|
+
return patchIdBySha;
|
|
53891
|
+
}
|
|
53892
|
+
async function capture(change) {
|
|
53893
|
+
if (lastCapturedHeadBySessionId.get(change.sessionId) === change.headSha) return;
|
|
53894
|
+
const storePath = await storePathOf(change.worktreeDir);
|
|
53895
|
+
if (!storePath) return;
|
|
53896
|
+
const gitOptions = {
|
|
53897
|
+
cwd: change.worktreeDir,
|
|
53898
|
+
timeoutMs: GIT_TIMEOUT_MS,
|
|
53899
|
+
maxBuffer: GIT_MAX_BUFFER
|
|
53900
|
+
};
|
|
53901
|
+
const listed = await runGitFn([
|
|
53902
|
+
"log",
|
|
53903
|
+
"--no-merges",
|
|
53904
|
+
`--format=${COMMIT_LOG_FORMAT}`,
|
|
53905
|
+
`${change.baseRef}..${change.headSha}`
|
|
53906
|
+
], gitOptions);
|
|
53907
|
+
if (!listed.ok) return;
|
|
53908
|
+
lastCapturedHeadBySessionId.set(change.sessionId, change.headSha);
|
|
53909
|
+
const recordedShas = await recordedShasFor(change.sessionId, storePath);
|
|
53910
|
+
const newCommits = parseCommitLog(listed.out).filter((commit) => !recordedShas.has(commit.sha));
|
|
53911
|
+
if (newCommits.length === 0) return;
|
|
53912
|
+
const patchIdBySha = await patchIdsOf(newCommits, gitOptions);
|
|
53913
|
+
const shasWithoutPatchId = newCommits.filter((commit) => !patchIdBySha.has(commit.sha)).map((commit) => commit.sha.slice(0, 12));
|
|
53914
|
+
if (shasWithoutPatchId.length > 0) logger.warn(`[commit-sessions] no patch-id for ${shasWithoutPatchId.join(", ")} in ${change.sessionId}; a rebased copy will not trace back`);
|
|
53915
|
+
const recordedAt = nowFn();
|
|
53916
|
+
const records = newCommits.map((commit) => ({
|
|
53917
|
+
sha: commit.sha,
|
|
53918
|
+
patchId: patchIdBySha.get(commit.sha) ?? null,
|
|
53919
|
+
sessionId: change.sessionId,
|
|
53920
|
+
sessionName: change.sessionName.slice(0, 200),
|
|
53921
|
+
agent: change.agent.slice(0, 64),
|
|
53922
|
+
taskTitle: change.taskTitle?.slice(0, 300) ?? null,
|
|
53923
|
+
committedAt: commit.committedAt,
|
|
53924
|
+
recordedAt
|
|
53925
|
+
}));
|
|
53926
|
+
await appendJsonLines(storePath, records, {
|
|
53927
|
+
mkdir: true,
|
|
53928
|
+
mode: 384
|
|
53929
|
+
});
|
|
53930
|
+
for (const record of records) recordedShas.add(record.sha);
|
|
53931
|
+
}
|
|
53932
|
+
function noteHeadChange(change) {
|
|
53933
|
+
const { baseRef } = change;
|
|
53934
|
+
if (!baseRef) return Promise.resolve();
|
|
53935
|
+
return captureQueue.run(change.sessionId, () => capture({
|
|
53936
|
+
...change,
|
|
53937
|
+
baseRef
|
|
53938
|
+
})).catch((error) => logger.warn(`[commit-sessions] capture failed for ${change.sessionId}: ${errorMessage(error)}`));
|
|
53939
|
+
}
|
|
53940
|
+
return { noteHeadChange };
|
|
53941
|
+
}
|
|
53942
|
+
//#endregion
|
|
53713
53943
|
//#region server/coherence/coherence-session-feed.ts
|
|
53714
53944
|
function createCoherenceSessionFeed({ broadcastControl, debounceMs = 1500, now = Date.now, log = console }) {
|
|
53715
53945
|
const states = /* @__PURE__ */ new Map();
|
|
@@ -54107,6 +54337,10 @@ function createBackend(httpServer, options = {}) {
|
|
|
54107
54337
|
notificationManager,
|
|
54108
54338
|
attachSessionPrLink,
|
|
54109
54339
|
traceWiring,
|
|
54340
|
+
commitSessions: createCommitSessions({
|
|
54341
|
+
storeRoot: configSiblingPath(configStore.configPath, COMMIT_SESSIONS_FOLDER_NAME),
|
|
54342
|
+
logger: console
|
|
54343
|
+
}),
|
|
54110
54344
|
taskTitleRefiner: laneAssembly.taskTitleRefiner,
|
|
54111
54345
|
coherenceFeed,
|
|
54112
54346
|
featureHints: laneAssembly.featureHints,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import"./updates-view-core-haJSbqvx.js";import{n as e,r as t,s as n}from"./dom-helpers-DBbFg1c_.js";import{$ as r,Q as i,et as a}from"./index-
|
|
1
|
+
import"./updates-view-core-haJSbqvx.js";import{n as e,r as t,s as n}from"./dom-helpers-DBbFg1c_.js";import{$ as r,Q as i,et as a}from"./index-DlcYI9Mg.js";var o={mine:`Mine`,run:`Run`,cancel:`Cancel`},s=null;function c(e){return e===null?`n/a`:`${Math.round(e*100)}%`}function l(e){if(e===null)return`n/a`;let t=Math.round(e*100);return t>0?`+${t}`:String(t)}function u(e,t,i){let a=n(`button`,`bench-action-button`,o[t]);return a.type=`button`,a.disabled=i,a.addEventListener(`click`,()=>r(e.id,t)),a}function d(e,t){let n=e.inFlight;if(!n||n.suiteId!==t.id)return``;let r=n.caseId?`case ${n.caseId}, `:``;return`Cell ${n.cellIndex+1} of ${n.cellCount}: ${r}arm ${n.armId}, trial ${n.trial}, ${n.phase}.`}function f(e){let t=n(`td`,`bench-score`,c(e?.recall??null));return e&&e.invalid>0&&(t.title=`${e.invalid} invalid or failed cell(s)`),e&&e.degraded>0&&(t.dataset.degraded=`true`),t}function p(e){let t=e.armIds.filter(t=>t!==e.baselineArm),r=n(`table`,`bench-table`),i=n(`tr`);i.append(n(`th`,null,`Case`),...e.armIds.map(t=>n(`th`,null,t===e.baselineArm?`${t} (baseline)`:t))),i.append(...t.map(e=>n(`th`,null,`${e} vs baseline`))),r.append(i);for(let i of e.rows){let a=n(`tr`);a.append(n(`td`,`bench-case`,i.caseId),...e.armIds.map(e=>f(i.arms[e]))),a.append(...t.map(e=>n(`td`,`bench-delta`,l(i.deltaVsBaseline[e]??null)))),r.append(a)}let a=[...new Set(e.armIds.flatMap(t=>Object.keys(e.totals[t]?.recallByTag??{})))].sort(),o=n(`tr`,`bench-total`);o.append(n(`td`,`bench-case`,`Paired recall`),...e.armIds.map(t=>f(e.totals[t]))),r.append(o);for(let t of a){let i=n(`tr`,`bench-total`);i.append(n(`td`,`bench-case`,`Recall, ${t}`),...e.armIds.map(r=>n(`td`,`bench-score`,c(e.totals[r]?.recallByTag[t]??null)))),r.append(i)}return r}function m(e,r){let{isServerConnected:a,pendingActionBySuite:o,outcomeBySuite:s}=i(),c=n(`div`,`bench-suite`),l=e.inFlight?.suiteId===r.id,f=!!e.inFlight&&!l,m=o.has(r.id)||!a,h=n(`div`,`bench-summary`);h.append(n(`span`,`bench-suite-title`,r.title),t(`bench`,r.caseCount===1?`case`:`cases`,String(r.caseCount)),t(`bench`,r.candidateCount===1?`candidate`:`candidates`,String(r.candidateCount)),t(`bench`,`arms`,String(r.armIds.length))),c.append(h);let g=n(`div`,`bench-controls`),_=e.configured===!0&&r.error===null;g.append(u(r,`mine`,!_||m||l),u(r,`run`,!_||m||l||f||r.caseCount===0),u(r,`cancel`,m||!l));let v=n(`span`,`bench-status`,(a?``:`Not connected to the server. Reconnecting.`)||d(e,r)||s.get(r.id)||``);if(v.setAttribute(`role`,`status`),g.append(v),c.append(g),r.error)return c.append(n(`p`,`bench-error`,r.error)),c;let y=r.latestReport;return y?(c.append(n(`p`,`bench-run-line`,`Latest run ${y.runId}: ${y.status}. Only cases every arm scored count toward paired recall.`)),y.rows.length>0&&c.append(p(y)),c):(c.append(n(`p`,`bench-empty`,r.caseCount===0?`Move approved candidates into the cases folder, then choose Run.`:`No run yet.`)),c)}function h(){if(!s)return;s.textContent=``;let{status:t}=i(),r=e(`bench`,`Benchmarks`,`Suites from the benchmarks folder of the Glimmervoid home, one run at a time.`);if(s.append(r),!t)s.append(n(`p`,`bench-empty`,`Waiting for the server.`));else if(!t.configured)s.append(n(`p`,`bench-empty`,t.reason||`Benchmarks are off.`));else if(t.suites.length===0)s.append(n(`p`,`bench-empty`,`No suites yet. Create a folder holding suite.json under benchmarks in the Glimmervoid home.`));else for(let e of t.suites)s.append(m(t,e))}function g(e){s||(s=n(`div`,`bench-content`),e.append(s),a(h),h())}var _={mount:g};export{_ as view};
|
|
Binary file
|