spell 0.8.7 → 0.8.8
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/README-epics.md +96 -36
- package/app/package.json +25 -1
- package/dist/cli/publish/PublishedPackage.d.ts +2 -1
- package/dist/cli/publish/PublishedPackage.js +6 -3
- package/dist/cli/publish/ScratchInstall.d.ts +14 -3
- package/dist/cli/publish/ScratchInstall.js +69 -8
- package/dist/epic/cli/EpicProgram.js +7 -1
- package/dist/epic/cli/epicGroups.js +2 -1
- package/dist/epic/command/BaseBranch.d.ts +35 -0
- package/dist/epic/command/BaseBranch.js +58 -0
- package/dist/epic/command/EpicCheckout.d.ts +1 -1
- package/dist/epic/command/EpicCheckout.js +4 -4
- package/dist/epic/command/EpicGuide.js +3 -2
- package/dist/epic/command/EpicTools.d.ts +5 -0
- package/dist/epic/command/EpicTools.js +14 -3
- package/dist/epic/command/MainMerge.d.ts +26 -15
- package/dist/epic/command/MainMerge.js +60 -16
- package/dist/epic/command/RepoInit.d.ts +116 -8
- package/dist/epic/command/RepoInit.js +308 -13
- package/dist/epic/command/Requests.d.ts +1 -0
- package/dist/epic/command/Requests.js +6 -1
- package/dist/epic/command/SessionMoves.js +2 -1
- package/dist/epic/command/SkillsCheck.js +3 -2
- package/dist/epic/command/Stock.js +3 -1
- package/dist/epic/command/TurnEnd.d.ts +1 -1
- package/dist/epic/command/TurnEnd.js +4 -3
- package/dist/epic/command/Worktrees.d.ts +18 -3
- package/dist/epic/command/Worktrees.js +38 -7
- package/dist/epic/command/command.types.d.ts +3 -0
- package/dist/epic/components/__pack/epics.entry.js +43 -43
- package/dist/epic/components/__pack/epics.pack.js +36 -12794
- package/dist/epic/config/EngineFiles.mjs +60 -0
- package/dist/epic/config/EpicConfig.d.ts +12 -2
- package/dist/epic/config/EpicConfig.js +9 -1
- package/dist/epic/config/GitHub.d.ts +41 -1
- package/dist/epic/config/GitHub.js +75 -3
- package/dist/epic/config/LayeredSettings.js +3 -2
- package/dist/epic/server/EpicServer.d.ts +1 -1
- package/dist/epic/server/EpicServer.js +26 -12
- package/dist/epic/tool/InboxPoller.mjs +2 -1
- package/dist/epic/tool/MigrateCommands.js +6 -8
- package/dist/epic/tool/PlanDocFiles.js +3 -2
- package/dist/epic/tool/ServedFolders.d.ts +1 -1
- package/dist/epic/tool/ServedFolders.js +4 -4
- package/dist/epic/tools/PageInboxes.js +3 -3
- package/dist/epic/tools/_assets/commands.entry.js +149 -68
- package/dist/epic/tools/_assets/commands.js +20 -2073
- package/dist/epic/tools/_assets/core-reference.entry.js +244 -124
- package/dist/epic/tools/_assets/core-reference.js +20 -2142
- package/dist/epic/tools/_assets/emoji/cldr/0.js +2 -2
- package/dist/epic/tools/_assets/emoji/cldr/a.js +2 -2
- package/dist/epic/tools/_assets/emoji/cldr/b.js +2 -2
- package/dist/epic/tools/_assets/emoji/cldr/c.js +2 -2
- package/dist/epic/tools/_assets/emoji/cldr/d.js +2 -2
- package/dist/epic/tools/_assets/emoji/cldr/e.js +2 -2
- package/dist/epic/tools/_assets/emoji/cldr/f.js +2 -2
- package/dist/epic/tools/_assets/emoji/cldr/g.js +2 -2
- package/dist/epic/tools/_assets/emoji/cldr/h.js +2 -2
- package/dist/epic/tools/_assets/emoji/cldr/i.js +2 -2
- package/dist/epic/tools/_assets/emoji/cldr/j.js +2 -2
- package/dist/epic/tools/_assets/emoji/cldr/k.js +2 -2
- package/dist/epic/tools/_assets/emoji/cldr/l.js +2 -2
- package/dist/epic/tools/_assets/emoji/cldr/m.js +2 -2
- package/dist/epic/tools/_assets/emoji/cldr/n.js +2 -2
- package/dist/epic/tools/_assets/emoji/cldr/o.js +2 -2
- package/dist/epic/tools/_assets/emoji/cldr/p.js +2 -2
- package/dist/epic/tools/_assets/emoji/cldr/r.js +2 -2
- package/dist/epic/tools/_assets/emoji/cldr/s.js +2 -2
- package/dist/epic/tools/_assets/emoji/cldr/t.js +2 -2
- package/dist/epic/tools/_assets/emoji/cldr/u.js +2 -2
- package/dist/epic/tools/_assets/emoji/cldr/v.js +2 -2
- package/dist/epic/tools/_assets/emoji/cldr/w.js +2 -2
- package/dist/epic/tools/_assets/emoji/cldr/x.js +2 -2
- package/dist/epic/tools/_assets/emoji/cldr/y.js +2 -2
- package/dist/epic/tools/_assets/emoji/cldr/z.js +2 -2
- package/dist/epic/tools/_assets/emoji/fomantic/0.js +2 -2
- package/dist/epic/tools/_assets/emoji/fomantic/a.js +2 -2
- package/dist/epic/tools/_assets/emoji/fomantic/b.js +2 -2
- package/dist/epic/tools/_assets/emoji/fomantic/c.js +2 -2
- package/dist/epic/tools/_assets/emoji/fomantic/d.js +2 -2
- package/dist/epic/tools/_assets/emoji/fomantic/e.js +2 -2
- package/dist/epic/tools/_assets/emoji/fomantic/f.js +2 -2
- package/dist/epic/tools/_assets/emoji/fomantic/g.js +2 -2
- package/dist/epic/tools/_assets/emoji/fomantic/h.js +2 -2
- package/dist/epic/tools/_assets/emoji/fomantic/i.js +2 -2
- package/dist/epic/tools/_assets/emoji/fomantic/j.js +2 -2
- package/dist/epic/tools/_assets/emoji/fomantic/k.js +2 -2
- package/dist/epic/tools/_assets/emoji/fomantic/l.js +2 -2
- package/dist/epic/tools/_assets/emoji/fomantic/m.js +2 -2
- package/dist/epic/tools/_assets/emoji/fomantic/n.js +2 -2
- package/dist/epic/tools/_assets/emoji/fomantic/o.js +2 -2
- package/dist/epic/tools/_assets/emoji/fomantic/p.js +2 -2
- package/dist/epic/tools/_assets/emoji/fomantic/q.js +2 -2
- package/dist/epic/tools/_assets/emoji/fomantic/r.js +2 -2
- package/dist/epic/tools/_assets/emoji/fomantic/s.js +2 -2
- package/dist/epic/tools/_assets/emoji/fomantic/t.js +2 -2
- package/dist/epic/tools/_assets/emoji/fomantic/u.js +2 -2
- package/dist/epic/tools/_assets/emoji/fomantic/v.js +2 -2
- package/dist/epic/tools/_assets/emoji/fomantic/w.js +2 -2
- package/dist/epic/tools/_assets/emoji/fomantic/x.js +2 -2
- package/dist/epic/tools/_assets/emoji/fomantic/y.js +2 -2
- package/dist/epic/tools/_assets/emoji/fomantic/z.js +2 -2
- package/dist/epic/tools/_assets/goals-live.js +318 -210
- package/dist/epic/tools/_assets/highlight.min.js +5764 -5269
- package/dist/epic/tools/_assets/lazy/code-engine.js +5 -1270
- package/dist/epic/tools/_assets/lazy/markdown-engine.js +67 -1513
- package/dist/epic/tools/_assets/lazy/markdown-sanitizer.js +3 -753
- package/dist/epic/tools/_assets/spell-comments.entry.js +282 -159
- package/dist/epic/tools/_assets/spell-comments.js +24 -3716
- package/dist/epic/tools/_assets/spell-doc-comments.js +1243 -816
- package/dist/epic/tools/_assets/spell-doc-helpers.js +298 -165
- package/dist/epic/tools/_assets/spell-doc-runtime.js +2760 -1415
- package/dist/epic/tools/_assets/spell-doc-toolbar.js +396 -227
- package/dist/epic/tools/_assets/spell-syntax.entry.js +505 -285
- package/dist/epic/tools/_assets/spell-syntax.js +22 -2916
- package/dist/epic/tools/_assets/spell-ui-sources.js +102 -60
- package/dist/epic/tools/_assets/spell-ui.entry.js +108 -40
- package/dist/epic/tools/_assets/spell-ui.js +3131 -46465
- package/dist/epic/tools/pages.d.ts +5 -6
- package/dist/epic/tools/pages.js +7 -6
- package/dist/epic/window.mjs +2 -3
- package/dist/ui/components/ui-accordion/UIAccordion.d.ts +1 -0
- package/dist/ui/components/ui-ad/UIAd.d.ts +1 -0
- package/dist/ui/components/ui-breadcrumbs/UIBreadcrumb.d.ts +1 -0
- package/dist/ui/components/ui-breadcrumbs/UIBreadcrumbs.d.ts +1 -0
- package/dist/ui/components/ui-button/UIButton.d.ts +8 -3
- package/dist/ui/components/ui-button/UIButton.fallback.d.ts +8 -3
- package/dist/ui/components/ui-button/UIButtons.d.ts +1 -0
- package/dist/ui/components/ui-button/UIOr.d.ts +1 -0
- package/dist/ui/components/ui-calendar/UICalendar.d.ts +6 -0
- package/dist/ui/components/ui-calendar/UICalendar.fallback.d.ts +6 -0
- package/dist/ui/components/ui-card/UICards.d.ts +31 -0
- package/dist/ui/components/ui-checkbox/UICheckbox.d.ts +7 -0
- package/dist/ui/components/ui-checkbox/UICheckbox.fallback.d.ts +7 -0
- package/dist/ui/components/ui-comment/UIComment.d.ts +1 -0
- package/dist/ui/components/ui-comment/UIComments.d.ts +1 -0
- package/dist/ui/components/ui-components/UIComponents.d.ts +1 -0
- package/dist/ui/components/ui-dimmer/UIDimmer.d.ts +1 -0
- package/dist/ui/components/ui-divider/UIDivider.d.ts +2 -0
- package/dist/ui/components/ui-dropdown/UIDropdown.d.ts +6 -0
- package/dist/ui/components/ui-dropdown/UIDropdown.fallback.d.ts +6 -0
- package/dist/ui/components/ui-embed/UIEmbed.d.ts +1 -0
- package/dist/ui/components/ui-emoji/UIEmoji.d.ts +1 -0
- package/dist/ui/components/ui-feed/UIFeed.d.ts +1 -0
- package/dist/ui/components/ui-feed/UIFeedEvent.d.ts +1 -0
- package/dist/ui/components/ui-flag/UIFlag.d.ts +1 -0
- package/dist/ui/components/ui-flyout/UIFlyout.d.ts +1 -0
- package/dist/ui/components/ui-form/UIFields.d.ts +1 -0
- package/dist/ui/components/ui-form/UIRepeat.d.ts +1 -0
- package/dist/ui/components/ui-grid/UIColumn.d.ts +1 -0
- package/dist/ui/components/ui-grid/UIGrid.d.ts +1 -0
- package/dist/ui/components/ui-grid/UIRow.d.ts +1 -0
- package/dist/ui/components/ui-icon/UIIcon.d.ts +3 -2
- package/dist/ui/components/ui-icon/UIIcons.d.ts +1 -0
- package/dist/ui/components/ui-icon-picker/UIIconPicker.d.ts +6 -0
- package/dist/ui/components/ui-icon-picker/UIIconPicker.fallback.d.ts +6 -0
- package/dist/ui/components/ui-image/UIImages.d.ts +1 -0
- package/dist/ui/components/ui-include/UIInclude.d.ts +1 -0
- package/dist/ui/components/ui-input/UIInput.fallback.d.ts +9 -2
- package/dist/ui/components/ui-items/UIItems.d.ts +1 -0
- package/dist/ui/components/ui-keys/UIKeys.d.ts +1 -0
- package/dist/ui/components/ui-label/UILabel.d.ts +2 -0
- package/dist/ui/components/ui-label/UILabels.d.ts +1 -0
- package/dist/ui/components/ui-list/UIList.d.ts +2 -0
- package/dist/ui/components/ui-loader/UILoader.d.ts +1 -0
- package/dist/ui/components/ui-message/UIMessage.d.ts +2 -0
- package/dist/ui/components/ui-modal/UIModal.d.ts +1 -0
- package/dist/ui/components/ui-nag/UINag.d.ts +1 -0
- package/dist/ui/components/ui-page/UIPage.d.ts +15 -0
- package/dist/ui/components/ui-page/UIPage.es.d.ts +1 -0
- package/dist/ui/components/ui-parts/UIActions.d.ts +1 -0
- package/dist/ui/components/ui-parts/UIAuthor.d.ts +1 -0
- package/dist/ui/components/ui-parts/UIAvatar.d.ts +1 -0
- package/dist/ui/components/ui-parts/UIContent.d.ts +1 -0
- package/dist/ui/components/ui-parts/UIDate.d.ts +1 -0
- package/dist/ui/components/ui-parts/UIDescription.d.ts +1 -0
- package/dist/ui/components/ui-parts/UIDetail.d.ts +1 -0
- package/dist/ui/components/ui-parts/UIExtra.d.ts +1 -0
- package/dist/ui/components/ui-parts/UIHeader.d.ts +3 -1
- package/dist/ui/components/ui-parts/UIMeta.d.ts +1 -0
- package/dist/ui/components/ui-parts/UIParts.types.d.ts +15 -1
- package/dist/ui/components/ui-parts/UISummary.d.ts +1 -0
- package/dist/ui/components/ui-parts/UITitle.d.ts +1 -0
- package/dist/ui/components/ui-parts/UIValue.d.ts +1 -0
- package/dist/ui/components/ui-placeholder/UIPlaceholder.d.ts +1 -0
- package/dist/ui/components/ui-placeholder/UIPlaceholderHeader.d.ts +1 -0
- package/dist/ui/components/ui-placeholder/UIPlaceholderImage.d.ts +1 -0
- package/dist/ui/components/ui-placeholder/UIPlaceholderLine.d.ts +1 -0
- package/dist/ui/components/ui-placeholder/UIPlaceholderParagraph.d.ts +1 -0
- package/dist/ui/components/ui-progress/UIProgress.d.ts +2 -0
- package/dist/ui/components/ui-quote/UIQuote.d.ts +1 -0
- package/dist/ui/components/ui-rail/UIRail.d.ts +1 -0
- package/dist/ui/components/ui-rating/UIRating.d.ts +6 -0
- package/dist/ui/components/ui-rating/UIRating.fallback.d.ts +6 -0
- package/dist/ui/components/ui-reveal/UIReveal.d.ts +1 -0
- package/dist/ui/components/ui-search/UISearch.fallback.d.ts +13 -1
- package/dist/ui/components/ui-section/UISections.d.ts +1 -0
- package/dist/ui/components/ui-segment/UISegment.d.ts +2 -0
- package/dist/ui/components/ui-segment/UISegments.d.ts +1 -0
- package/dist/ui/components/ui-select/UISelect.d.ts +6 -0
- package/dist/ui/components/ui-select/UISelect.fallback.d.ts +6 -0
- package/dist/ui/components/ui-shape/UISide.d.ts +4 -0
- package/dist/ui/components/ui-sidebar/UIPushable.d.ts +1 -0
- package/dist/ui/components/ui-sidebar/UIPusher.d.ts +1 -0
- package/dist/ui/components/ui-sidebar/UISidebar.d.ts +1 -0
- package/dist/ui/components/ui-sides/UISides.d.ts +6 -0
- package/dist/ui/components/ui-sides/UISides.fallback.d.ts +6 -0
- package/dist/ui/components/ui-slider/UISlider.d.ts +7 -0
- package/dist/ui/components/ui-slider/UISlider.fallback.d.ts +7 -0
- package/dist/ui/components/ui-space/UISpace.d.ts +1 -0
- package/dist/ui/components/ui-statistic/UIStatistic.d.ts +1 -0
- package/dist/ui/components/ui-statistic/UIStatistics.d.ts +1 -0
- package/dist/ui/components/ui-step/UIStep.d.ts +1 -0
- package/dist/ui/components/ui-step/UISteps.d.ts +1 -0
- package/dist/ui/components/ui-table/UICell.d.ts +1 -0
- package/dist/ui/components/ui-terms/UITerm.d.ts +1 -0
- package/dist/ui/components/ui-terms/UITerms.d.ts +1 -0
- package/dist/ui/components/ui-theme-editor/UIColorChip.d.ts +1 -0
- package/dist/ui/components/ui-theme-editor/UIThemeToken.d.ts +1 -0
- package/dist/ui/components/ui-toast/UIToast.d.ts +1 -0
- package/dist/ui/components/ui-toc/UIToc.d.ts +1 -0
- package/dist/ui/components/ui-transition/UITransition.d.ts +1 -0
- package/dist/ui/components/ui-video/UIAudio.d.ts +1 -0
- package/dist/ui/components/ui-video/UIVideo.d.ts +1 -0
- package/dist/ui/components/ui-visibility/UIVisibility.d.ts +1 -0
- package/dist/ui/components/ui-zoom/UIZoom.d.ts +1 -0
- package/dist/util/spell/constants.js +1 -1
- package/epic/.claude-plugin/plugin.json +1 -1
- package/epic/.codex-plugin/plugin.json +1 -1
- package/epic/hooks/handoff.mjs +4 -3
- package/epic/hooks/worktree.mjs +22 -3
- package/epic/package.json +41 -2
- package/epic/skills/details/SKILL.md +2 -1
- package/epic/skills/epic/SKILL.md +7 -1
- package/epic/skills/epic/guide.md +4 -0
- package/epic/skills/isolate/SKILL.md +35 -0
- package/epic/src/AGENTS.md +6 -2
- package/epic/templates/durable.html +1 -1
- package/epic/vscode/package.json +1 -1
- package/epic/vscode/spell-epic.vsix +0 -0
- package/package.json +1 -1
- package/parser/package.json +1 -1
- package/ui/package.json +15 -2
|
@@ -9,9 +9,11 @@ import { checkoutOf } from "spell/server/checkout";
|
|
|
9
9
|
import { Git } from "spell/server/Git";
|
|
10
10
|
import { RealPath } from "spell/server/RealPath";
|
|
11
11
|
import { CLI } from "spell/cli";
|
|
12
|
+
import { EngineFiles } from "../config/EngineFiles.mjs";
|
|
12
13
|
import { EpicConfig } from "../config/EpicConfig.js";
|
|
13
14
|
import { EpicHome } from "../config/EpicHome.js";
|
|
14
15
|
import { EpicRepo } from "../config/EpicRepo.js";
|
|
16
|
+
import { GitHub } from "../config/GitHub.js";
|
|
15
17
|
import { SessionFolders } from "../config/SessionFolders.js";
|
|
16
18
|
import { URGENT_STATES } from "../list/EpicState.js";
|
|
17
19
|
import { PhaseStatuses } from "../phases/index.js";
|
|
@@ -206,7 +208,8 @@ var Worktrees = class _Worktrees {
|
|
|
206
208
|
* 1. its servers stopped (`CheckoutServers.stop()`)
|
|
207
209
|
* 2. `git worktree remove [--force]`: git refuses a worktree with changes, unless `force`
|
|
208
210
|
* 3. its saved-session link taken away, if it's one to main's (`SessionFolders.unlink()`), as the worktree hook does
|
|
209
|
-
* - NOT its branch
|
|
211
|
+
* - NOT its branch, unless `branches`: the caller deletes it (`git branch -d`), as it would after
|
|
212
|
+
* `git worktree remove`
|
|
210
213
|
* - refuses (`EpicCommandError`) the main checkout, a folder that isn't one of the repo's worktrees, and git's refusal
|
|
211
214
|
* - what `/isolate done` (`/epic done`) and `/worktrees`' clean-up (`Stock`) run; the `WorktreeRemove` hook stops
|
|
212
215
|
* the servers itself
|
|
@@ -280,11 +283,37 @@ var Worktrees = class _Worktrees {
|
|
|
280
283
|
if (SessionFolders.unlink(path, sessions).action === "removed") lines.push(" and its session-folder link");
|
|
281
284
|
return lines;
|
|
282
285
|
}
|
|
283
|
-
/**
|
|
286
|
+
/**
|
|
287
|
+
* Delete `branch` in `main`, when merged: a line saying what happened; unmerged work always stays.
|
|
288
|
+
* - `git branch -d`, never a blind `-D`
|
|
289
|
+
* - a base branch that takes only pull requests: `mergedThroughPullRequest()` decides, then `-D`
|
|
290
|
+
* - why: `-d` refuses a squash-merged branch, and passes one that's merely pushed (it checks the upstream)
|
|
291
|
+
*/
|
|
284
292
|
static deleteBranch(main, branch) {
|
|
293
|
+
const config = new EpicConfig(main);
|
|
294
|
+
if (config.baseBranchProtected) {
|
|
295
|
+
const why = _Worktrees.mergedThroughPullRequest(main, branch, config.baseBranch);
|
|
296
|
+
if (!why)
|
|
297
|
+
return `kept branch ${branch}: not in ${config.baseBranch}, and no merged pull request has its last commit`;
|
|
298
|
+
const forced = Git.run(["branch", "-D", branch], main);
|
|
299
|
+
return forced.ok ? `deleted branch ${branch} (${why})` : `kept branch ${branch}: ${forced.err.split("\n")[0]}`;
|
|
300
|
+
}
|
|
285
301
|
const deleted = Git.run(["branch", "-d", branch], main);
|
|
286
302
|
return deleted.ok ? `deleted branch ${branch}` : `kept branch ${branch}: ${deleted.err.split("\n")[0]}`;
|
|
287
303
|
}
|
|
304
|
+
/**
|
|
305
|
+
* Why `branch` counts as merged into `base`, in a repo whose base takes only pull requests; `undefined` if it doesn't:
|
|
306
|
+
* - all its commits in `base`, local or `origin`'s
|
|
307
|
+
* - or a pull request GitHub reports merged whose last commit holds the branch's tip:
|
|
308
|
+
* so a commit made since the merge keeps the branch
|
|
309
|
+
* - runs `gh` only when git alone can't say; `gh` missing or offline: `undefined`, and the branch stays
|
|
310
|
+
*/
|
|
311
|
+
static mergedThroughPullRequest(main, branch, base) {
|
|
312
|
+
const within = /* @__PURE__ */ __name((into) => Git.run(["merge-base", "--is-ancestor", branch, into], main).ok, "within");
|
|
313
|
+
if (within(base) || within(`refs/remotes/origin/${base}`)) return `in ${base}`;
|
|
314
|
+
const merged = GitHub.mergedPullRequests(branch, base, main).find((pull) => within(pull.head));
|
|
315
|
+
return merged && `pull request #${merged.number} merged`;
|
|
316
|
+
}
|
|
288
317
|
/** `move --idle`: move every worktree in the old place that no session works in; a report each. */
|
|
289
318
|
moveIdle({ dryRun = false } = {}) {
|
|
290
319
|
const old = this.config.worktreesFolders[1];
|
|
@@ -600,12 +629,14 @@ function repoLines(states) {
|
|
|
600
629
|
__name(repoLines, "repoLines");
|
|
601
630
|
function mergeMainLines(report) {
|
|
602
631
|
const lines = mergeResultLines(report);
|
|
603
|
-
const { ditched, ditchedTo } = report;
|
|
604
|
-
if (!ditched?.length) return lines;
|
|
632
|
+
const { ditched = [], ditchedTo, baseCatchUp } = report;
|
|
605
633
|
return [
|
|
634
|
+
...baseCatchUp ? [baseCatchUp] : [],
|
|
606
635
|
lines[0],
|
|
607
|
-
|
|
608
|
-
|
|
636
|
+
...ditched.length ? [
|
|
637
|
+
` moved ${ditched.length} generated file(s) aside, into ${ditchedTo}:`,
|
|
638
|
+
...ditched.map((file) => ` ${file}`)
|
|
639
|
+
] : [],
|
|
609
640
|
...lines.slice(1)
|
|
610
641
|
];
|
|
611
642
|
}
|
|
@@ -645,7 +676,7 @@ function mergeResultLines(report) {
|
|
|
645
676
|
];
|
|
646
677
|
}
|
|
647
678
|
__name(mergeResultLines, "mergeResultLines");
|
|
648
|
-
var WORKTREE_HOOK =
|
|
679
|
+
var WORKTREE_HOOK = EngineFiles.path("hooks/worktree.mjs");
|
|
649
680
|
export {
|
|
650
681
|
Worktrees
|
|
651
682
|
};
|
|
@@ -463,6 +463,8 @@ export type PatchReport = {
|
|
|
463
463
|
* - `regenerated`: each generator that ran, and the files it staged
|
|
464
464
|
* - `review`: snapshot entries to show Owen (`SnapshotReview`)
|
|
465
465
|
* - `unstaged`: files a generator changed outside its `outputs`, left for a person to look at
|
|
466
|
+
* - `baseCatchUp`: what happened bringing the local base branch up to date first (`BaseBranch`), for a repo whose base
|
|
467
|
+
* branch takes only pull requests; left out with nothing to say
|
|
466
468
|
*/
|
|
467
469
|
/**
|
|
468
470
|
* What `epic merge` did in one repo (`Requests.merge()`, `mergeEach()`).
|
|
@@ -499,6 +501,7 @@ export type MergeMainReport = {
|
|
|
499
501
|
}[];
|
|
500
502
|
review: SnapshotReview[];
|
|
501
503
|
unstaged: string[];
|
|
504
|
+
baseCatchUp?: string;
|
|
502
505
|
/** a multi-repo top's epic worktree (`MainMerge.runAll()`): the repo's folder name; left out for a single repo */
|
|
503
506
|
repo?: string;
|
|
504
507
|
/** a multi-repo top's: why this repo's merge couldn't start or go on (the others went on) */
|
|
@@ -9,49 +9,49 @@ SpellUI.registerPack({
|
|
|
9
9
|
prefix: "epic-",
|
|
10
10
|
catalog: CATALOG,
|
|
11
11
|
families: {
|
|
12
|
-
"epic-actions": "
|
|
13
|
-
"epic-agents": "
|
|
14
|
-
"epic-answer": "
|
|
15
|
-
"epic-aside": "
|
|
16
|
-
"epic-ask": "
|
|
17
|
-
"epic-away-line": "
|
|
18
|
-
"epic-cards": "
|
|
19
|
-
"epic-change": "
|
|
20
|
-
"epic-choice-rows": "
|
|
21
|
-
"epic-choices": "
|
|
22
|
-
"epic-choices-bar": "
|
|
23
|
-
"epic-code": "
|
|
24
|
-
"epic-comment-pane": "
|
|
25
|
-
"epic-commit": "
|
|
26
|
-
"epic-event": "
|
|
27
|
-
"epic-focus": "
|
|
28
|
-
"epic-item": "
|
|
29
|
-
"epic-link": "
|
|
30
|
-
"epic-list": "
|
|
31
|
-
"epic-mark": "
|
|
32
|
-
"epic-net-effect": "
|
|
33
|
-
"epic-new-item": "
|
|
34
|
-
"epic-note": "
|
|
35
|
-
"epic-option-form": "
|
|
36
|
-
"epic-original": "
|
|
37
|
-
"epic-overview": "
|
|
38
|
-
"epic-page": "
|
|
39
|
-
"epic-page-note-head": "
|
|
40
|
-
"epic-phase": "
|
|
41
|
-
"epic-prompt": "
|
|
42
|
-
"epic-question": "
|
|
43
|
-
"epic-review": "
|
|
44
|
-
"epic-run": "
|
|
45
|
-
"epic-run-row": "
|
|
46
|
-
"epic-section": "
|
|
47
|
-
"epic-send": "
|
|
48
|
-
"epic-send-buttons": "
|
|
49
|
-
"epic-state-filter": "
|
|
50
|
-
"epic-status": "
|
|
51
|
-
"epic-summary": "
|
|
52
|
-
"epic-text-box": "
|
|
53
|
-
"epic-thread": "
|
|
54
|
-
"epic-update": "
|
|
12
|
+
"epic-actions": "ef64e747ea8672b0",
|
|
13
|
+
"epic-agents": "4ffd4c4044893929",
|
|
14
|
+
"epic-answer": "c054a2592dd45d9c",
|
|
15
|
+
"epic-aside": "156ff751a73b5457",
|
|
16
|
+
"epic-ask": "529c7870bac46880",
|
|
17
|
+
"epic-away-line": "cfa6b823a1ad335f",
|
|
18
|
+
"epic-cards": "124995ea104e52b1",
|
|
19
|
+
"epic-change": "1d7445274c7f36e8",
|
|
20
|
+
"epic-choice-rows": "4a8c606ad3bc1b82",
|
|
21
|
+
"epic-choices": "bfc1ae2cdfb301a4",
|
|
22
|
+
"epic-choices-bar": "be403caca00a9d61",
|
|
23
|
+
"epic-code": "3281a9716863157f",
|
|
24
|
+
"epic-comment-pane": "3193c792ae7fb89f",
|
|
25
|
+
"epic-commit": "8e2a903aad4693aa",
|
|
26
|
+
"epic-event": "6a17caf5ef5539ee",
|
|
27
|
+
"epic-focus": "e5b28a3ea962ea78",
|
|
28
|
+
"epic-item": "b1f7cf6de0f9cd75",
|
|
29
|
+
"epic-link": "1f840d15565a2454",
|
|
30
|
+
"epic-list": "ecc05b9e22c6a941",
|
|
31
|
+
"epic-mark": "ca998df684180216",
|
|
32
|
+
"epic-net-effect": "f5ef44203c51991d",
|
|
33
|
+
"epic-new-item": "fc35809a2052d019",
|
|
34
|
+
"epic-note": "bd770b93c2fb577f",
|
|
35
|
+
"epic-option-form": "9e853b176df80597",
|
|
36
|
+
"epic-original": "4664fe7092fbcbb9",
|
|
37
|
+
"epic-overview": "8485ad7194ff71f2",
|
|
38
|
+
"epic-page": "9411eadf91cf74f4",
|
|
39
|
+
"epic-page-note-head": "fc7ada2db299401b",
|
|
40
|
+
"epic-phase": "9408533a1dc3d9f0",
|
|
41
|
+
"epic-prompt": "306c24a6a03ab0a9",
|
|
42
|
+
"epic-question": "2c5edad5f813b7d8",
|
|
43
|
+
"epic-review": "daec103517caa1ce",
|
|
44
|
+
"epic-run": "182c07fc553b119e",
|
|
45
|
+
"epic-run-row": "18bd6292c0d1f894",
|
|
46
|
+
"epic-section": "971db483216c54f8",
|
|
47
|
+
"epic-send": "392137c9bfd6ab75",
|
|
48
|
+
"epic-send-buttons": "33166dd017177ab7",
|
|
49
|
+
"epic-state-filter": "684e4e4dcd8858fd",
|
|
50
|
+
"epic-status": "04800116c353eb5a",
|
|
51
|
+
"epic-summary": "a4dd22a5b99a5e4f",
|
|
52
|
+
"epic-text-box": "9cf523f20790a744",
|
|
53
|
+
"epic-thread": "78a603414c4d21b4",
|
|
54
|
+
"epic-update": "72d34a933e83210e"
|
|
55
55
|
},
|
|
56
56
|
define: /* @__PURE__ */ __name(() => Promise.all([
|
|
57
57
|
import("../epic-actions/index.js"),
|