Improve Where Was I worktree context and Git history

[jamesmontemagno]

Summary

• gather fresh branch-specific context from the active worktree, including ahead/behind state and staged, unstaged, and untracked changes
• add a focused Git graph with collapsible base-branch history
• add clickable in-canvas diffs for tracked and untracked changes, plus a resume prompt that includes the full worktree context
• add integration coverage for Git context and diff collection and release the extension as 1.1.0

Validation

• node --test extensions/where-was-i/git-context.test.mjs
• npm run build
• npm run plugin:validate -- --plugin where-was-i
• exercised the canvas and diff drawer in Microsoft Edge

[github-actions]

🔴 Contributor Reputation Check: HIGH risk

Check	Risk
Profile	HIGH
Credential audit	NONE

Maintainers: please review this contributor before merging.
See the workflow run for full details.
Automated check powered by AGT.

[Copilot]

Pull request overview

Enhances the Where Was I canvas with richer Git worktree context and diff previews.

Changes:

• Adds Git history, divergence, and worktree-change collection.
• Adds interactive diff previews and expanded resume context.
• Adds integration tests and releases version 1.1.0.

Show a summary per file

File	Description
extensions/where-was-i/package.json	Updates package version.
extensions/where-was-i/git-context.test.mjs	Tests Git context and diff collection.
extensions/where-was-i/git-context.mjs	Implements Git context and file diffs.
extensions/where-was-i/extension.mjs	Adds graph, diff drawer, and resume behavior.
extensions/where-was-i/.github/plugin/plugin.json	Updates extension metadata version.
.github/plugin/marketplace.json	Publishes the updated marketplace version.

Review details

• Files reviewed: 6/6 changed files
• Comments generated: 5
• Review effort level: Medium

[github-actions]

🔒 PR Risk Scan Results

Scanned 6 changed file(s).

Severity	Count
🔴 High	0
🟠 Medium	1
ℹ️ Info	0

Severity	Rule	File	Line	Match
🟠	unpinned-version-indicator	extensions/where-was-i/package.json	16	"@​​github/copilot-sdk": "latest"

This is an automated soft-gate report. Findings indicate review targets and do not block merge by themselves.

[Copilot]

Review details

Suppressed comments (4)

Previously missed (3) — in code that hasn't changed since the last review.

extensions/where-was-i/extension.mjs:697

• Splitting at the first hash outside branchHashes can hide branch work. When no base is resolved (for example, a local-only main repository), branchHashes is empty and the entire graph is mislabeled and collapsed as base history; merge graphs can also interleave a base commit before later branch commits. Only split when a base exists, and split after the last branch-specific commit so branch work remains visible.

  const firstBaseCommit = graph.findIndex(row => row.hash && !branchHashes.has(row.hash));
  const focusedGraph = firstBaseCommit >= 0 ? graph.slice(0, firstBaseCommit) : graph;
  const baseGraph = firstBaseCommit >= 0 ? graph.slice(firstBaseCommit) : [];

extensions/where-was-i/git-context.mjs:126

• Every regular untracked file is emitted as mode 100644, so an executable script is presented with an inaccurate patch. Derive the new-file mode from the executable bits in fileStat.mode.

This issue also appears on line 135 of the same file.

    return renderNewFilePatch(relativePath, "100644", addedLines);

extensions/where-was-i/extension.mjs:844

• Concurrent diff requests can complete out of order. If a user opens file A and then file B before A finishes, A's later response overwrites B's badge and content while the title still says B. Abort the previous request or assign each request a sequence ID and ignore stale responses before updating the dialog.

  try {
    const res = await fetch("/file-diff?path=" + encodeURIComponent(path));
    const data = await res.json();
    if (!res.ok) throw new Error(data.error || "Unable to load this diff.");
    const status = describeStatus(data.code);

extensions/where-was-i/git-context.mjs:135

• A porcelain status can contain two records for the same path—for example, git rm --cached file leaves both a staged deletion and an untracked file. This path-only find always returns the first record, so the untracked row's diff button shows the staged deletion and the new file contents cannot be previewed. Preserve the selected record's status/identity through the UI and endpoint, or combine same-path records before lookup.

    const entry = parseStatusOutput(status).find((item) => item.path === relativePath);

• Files reviewed: 6/6 changed files
• Comments generated: 1
• Review effort level: Balanced

[Copilot]

Review details

• Files reviewed: 6/6 changed files
• Comments generated: 7
• Review effort level: Balanced

[Copilot]

Review details

Suppressed comments (1)

Previously missed (1) — in code that hasn't changed since the last review.

extensions/where-was-i/extension.mjs:713

• --topo-order does not guarantee that every HEAD-only commit appears before commits reachable only from baseRef; a newer base commit can occur first. Splitting at the first non-branch hash can therefore put later worktree commits inside the collapsed “base” section. Collapse only a suffix that starts after the final branch hash (and add a behind/diverged graph case to the test).

  const firstBaseCommit = canSplitGraph
    ? graph.findIndex(row => row.hash && !branchHashes.has(row.hash))
    : -1;
  const focusedGraph = firstBaseCommit >= 0 ? graph.slice(0, firstBaseCommit) : graph;
  const baseGraph = firstBaseCommit >= 0 ? graph.slice(firstBaseCommit) : [];

• Files reviewed: 6/6 changed files
• Comments generated: 1
• Review effort level: Balanced

[Copilot]

Review details

Suppressed comments (5)

Previously missed (2) — in code that hasn't changed since the last review.

extensions/where-was-i/extension.mjs:283

• --azure has only about 2.8:1 contrast against the white/azure-tinted row background. These graph characters communicate topology and need at least 3:1 even when treated as non-text graphics (and 4.5:1 if treated as text); use a darker blue.

This issue also appears in the following locations of the same file:

• line 312
• line 380

  color: var(--azure);

extensions/where-was-i/extension.mjs:290

• --meta is approximately 2.6:1 against the card background, so these small commit hashes do not meet the 4.5:1 text contrast requirement. Use a darker metadata color here.

This issue also appears on line 665 of the same file.

  color: var(--meta);

extensions/where-was-i/extension.mjs:312

• The azure text on --azure-tint is only about 2.5:1 contrast, below the 4.5:1 requirement for this 0.65rem ref label. Please use a darker foreground.

  color: var(--azure);

extensions/where-was-i/extension.mjs:380

• This newly added rename badge repeats the same low-contrast azure-on-tint combination (about 2.5:1), making the small status text difficult to read. Use a darker blue foreground.

.status-badge.renamed { background: var(--azure-tint); color: var(--azure); }

extensions/where-was-i/extension.mjs:667

• Checking R and A before a worktree deletion mislabels valid RD and AD states as “Renamed + edited” or “Added + edited.” Handle a D worktree column first so the canvas does not hide that the file was deleted after staging.

  if (index === "R") return { label: worktree === " " ? "Renamed" : "Renamed + edited", kind: "renamed" };
  if (index === "A") return { label: worktree === " " ? "Staged add" : "Added + edited", kind: "added" };
  if (index === "D" || worktree === "D") return { label: index !== " " && worktree !== " " ? "Staged + deleted" : "Deleted", kind: "deleted" };

• Files reviewed: 6/6 changed files
• Comments generated: 0 new
• Review effort level: Balanced

[jamesmontemagno]

Addressed the two additional findings listed only in the reviewer’s suppressed-comments summary (so they did not have replyable inline threads) in 21524f11:

• Duplicate status records for one path: the selected porcelain code is now carried from the change button through /file-diff (and optionally through get_file_diff) into getFileDiff, which selects the matching (path, code) record. This correctly distinguishes cases such as a staged deletion plus an untracked re-creation of the same file. Added a regression test covering both previews.
• Interleaved diverged graph history: splitCommitGraph now collapses only the suffix after the final current-branch commit, rather than splitting at the first base-only row. This keeps all current-branch commits visible even when --topo-order interleaves a newer base commit. Added deterministic layout coverage plus an integration test using a diverged repository.

The title-injection/CSP finding was also fixed in 21524f11 and replied to on its inline thread. All 10 Where Was I Git-context tests pass, all 17 PR checks are green, and all review threads are resolved.