BenStullsBets 1df3d2c154 Merge remote-tracking branch 'origin/main' into s58-inline-editor-diff ...

# Conflicts:
#	src/extension.ts

2026-06-26 08:28:02 -07:00

..

anchorer.ts

…

attributionController.ts

feat(attribution): landBaseline opt + signalLanded for F12 optimistic apply (#64)

2026-06-26 06:20:10 -07:00

attributionTracker.ts

fix #38: don't mis-attribute undo/redo as fresh human authorship in the preview

2026-06-12 03:37:22 -07:00

baselineStore.ts

…

cline.ts

…

diffViewController.ts

F6 #34: delete the dead two-pane diff-view UI, keep the baseline data layer

2026-06-12 02:10:14 -07:00

editInstructionInput.ts

feat(ux): unify Ask-Claude-to-Edit on a split-below multi-line webview (#65)

2026-06-26 13:50:31 +00:00

editorProposalController.ts

feat(editor): EditorProposalController — optimistic apply + decorations + CodeLens (#64)

2026-06-26 07:39:14 -07:00

extension.ts

Merge remote-tracking branch 'origin/main' into s58-inline-editor-diff

2026-06-26 08:28:02 -07:00

globalSidecarStore.ts

…

identity.ts

…

liveProgressUi.ts

#60: live turn progress (activity line + token count + OutputChannel stream + cancel) (#61)

2026-06-26 11:53:10 +00:00

liveTurn.ts

#60: live turn progress (activity line + token count + OutputChannel stream + cancel) (#61)

2026-06-26 11:53:10 +00:00

mergeArtifacts.ts

…

mermaidDiff.ts

feat(f7.1): mermaid diff dispatcher + type detection (#22)

2026-06-11 16:29:36 -07:00

mermaidFlowchartDiff.ts

feat(f7.1): flowchart node/edge diff + styling emission (#22)

2026-06-11 16:31:09 -07:00

mermaidSequenceDiff.ts

feat(f7.1): sequence participant/message diff + rect emission (#22)

2026-06-11 16:32:08 -07:00

model.ts

feat(model): add Proposal.original for F12 optimistic-apply revert (#64)

2026-06-26 06:15:36 -07:00

pendingEdits.ts

…

proposalController.ts

fix(proposals): reload-safe optimisticApply + reconciled toolbar summary (#64)

2026-06-26 08:21:53 -07:00

proposalModel.ts

feat(proposalModel): setProposalApplied re-anchors + stores original (#64)

2026-06-26 06:17:38 -07:00

sidecarRouter.ts

…

sidecarStore.ts

…

store.ts

…

threadController.ts

…

threadModel.ts

…

trackChangesModel.ts

fix(proposals): reload-safe optimisticApply + reconciled toolbar summary (#64)

2026-06-26 08:21:53 -07:00

trackChangesPreview.ts

Merge remote-tracking branch 'origin/main' into s58-inline-editor-diff

2026-06-26 08:28:02 -07:00

turnProgress.ts

#60: live turn progress (activity line + token count + OutputChannel stream + cancel) (#61)

2026-06-26 11:53:10 +00:00

versionGuard.ts

…

workspacePath.ts

feat(ux): unify "Ask Claude to Edit" + inline prompt at selection; fix keybindings (#62)

2026-06-26 12:11:43 +00:00