spell 0.8.8 → 0.8.9
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 +60 -20
- package/app/package.json +1 -1
- package/app/spaces/@spell/guides/SpellUI/SpellUI.spellml +486 -486
- package/app/spaces/@spell/sites/SpellApp/SpellApp.spellml +50 -124
- package/dist/app/app/pages/SiteBoardView.css +5 -5
- package/dist/app/app/pages/SiteBoardView.js +1 -1
- package/dist/app/app/pages/SiteEditorPage.js +6 -3
- package/dist/app/app/pages/SiteEdits.js +27 -10
- package/dist/app/app/pages/SiteWrites.js +11 -0
- package/dist/app/app/runner/spellRuntime.js +1 -0
- package/dist/epic/cli/EpicProgram.js +15 -6
- package/dist/epic/cli/epicGroups.js +5 -0
- package/dist/epic/command/BaseBranch.js +1 -1
- package/dist/epic/command/PullRequest.d.ts +45 -0
- package/dist/epic/command/PullRequest.js +100 -0
- package/dist/epic/command/RepoInit.d.ts +96 -47
- package/dist/epic/command/RepoInit.js +222 -96
- package/dist/epic/command/Requests.js +2 -1
- package/dist/epic/command/Worktrees.d.ts +5 -3
- package/dist/epic/command/Worktrees.js +9 -8
- package/dist/epic/components/__pack/epics.entry.js +43 -43
- package/dist/epic/components/__pack/epics.pack.js +2 -2
- package/dist/epic/config/CodeHost.d.ts +96 -0
- package/dist/epic/config/CodeHost.js +89 -0
- package/dist/epic/config/EpicConfig.d.ts +9 -2
- package/dist/epic/config/EpicConfig.js +16 -0
- package/dist/epic/config/EpicRepo.js +1 -1
- package/dist/epic/config/GitHub.d.ts +34 -2
- package/dist/epic/config/GitHub.js +36 -7
- package/dist/epic/config/GitLab.d.ts +138 -0
- package/dist/epic/config/GitLab.js +297 -0
- package/dist/epic/tool/PlanCommits.d.ts +7 -4
- package/dist/epic/tool/PlanCommits.js +7 -5
- package/dist/epic/tool/PlanDocCommands.js +3 -4
- package/dist/epic/tool/PlanDocFiles.d.ts +3 -1
- package/dist/epic/tool/PlanDocFiles.js +10 -3
- package/dist/parser/core/classes/View.d.ts +20 -0
- package/dist/parser/core/classes/View.js +91 -17
- package/dist/parser/core/core.declarations.json5 +18 -0
- package/dist/parser/core/core.scopes.js +5 -0
- package/dist/parser/core/sites.d.ts +10 -0
- package/dist/parser/core/sites.js +12 -0
- package/dist/parser/parser/tokenizer/Tokenizer.d.ts +9 -1
- package/dist/parser/parser/tokenizer/Tokenizer.js +43 -5
- package/dist/parser/parser/tokenizer/Tokens.d.ts +4 -0
- package/dist/parser/parser/tokenizer/Tokens.js +4 -0
- package/dist/parser/parser/tokenizer/tokenizer.types.d.ts +5 -0
- package/dist/parser/parser/tokenizer/tokenizer.types.js +2 -0
- package/dist/parser/py/core/spell_core/apps.py +2 -0
- package/dist/parser/spell/PARSING.md +21 -0
- package/dist/parser/spell/SpellParser.d.ts +2 -0
- package/dist/parser/spell/SpellParser.js +58 -3
- package/dist/parser/spell/SpellxTokenizer.js +2 -1
- package/dist/parser/spell/SpellxTwin.d.ts +4 -1
- package/dist/parser/spell/SpellxTwin.js +10 -3
- package/dist/parser/spell/builtinTypes.js +24 -1
- package/dist/parser/spell/ingest/PlaceIngest.js +3 -1
- package/dist/parser/spell/languages/Language.d.ts +11 -2
- package/dist/parser/spell/languages/en/words.js +3 -2
- package/dist/parser/spell/languages/es/words.js +7 -4
- package/dist/parser/spell/rules/Statement.js +1 -1
- package/dist/parser/spell/rules/classes/DrawSlot.js +6 -1
- package/dist/parser/spell/rules/sites/SitePage.d.ts +3 -3
- package/dist/parser/spell/rules/sites/SitePage.js +2 -2
- package/dist/parser/spell/rules/sites/sites.en.js +1 -1
- package/dist/parser/spell/rules/sites/sites.es.js +1 -1
- package/dist/parser/spell/rules/sites/sites.shared.d.ts +2 -2
- package/dist/parser/spell/spell.types.d.ts +7 -0
- package/dist/parser/spell/spellSyntax.es.json +6 -6
- package/dist/parser/spell/spellSyntax.json +6 -6
- package/dist/parser/spellx/SpellxView.js +2 -1
- package/dist/ui/components/ui-parts/UIHeader.d.ts +12 -2
- package/dist/ui/components/ui-parts/UIHeader.en.d.ts +5 -2
- package/dist/ui/components/ui-parts/UIHeader.en.js +6 -3
- package/dist/ui/components/ui-parts/UIHeader.js +45 -5
- package/dist/ui/components/ui-parts/UIParts.css +18 -0
- package/dist/ui/components/ui-parts/UIParts.css.inline.js +1 -1
- package/dist/ui/jsx.d.ts +4 -4
- package/dist/ui/vocabulary/defaults.generated.js +1 -1
- 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/package.json +1 -1
- package/epic/skills/epic/SKILL.md +2 -2
- package/epic/skills/epic/guide.md +2 -3
- package/epic/skills/isolate/SKILL.md +25 -27
- package/epic/src/AGENTS.md +5 -0
- 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 +1 -1
|
@@ -11,6 +11,7 @@ import { SRV } from "spell/server";
|
|
|
11
11
|
import { Git } from "spell/server/Git";
|
|
12
12
|
import { PageServer } from "spell/server/page";
|
|
13
13
|
import { CLI } from "spell/cli";
|
|
14
|
+
import { CodeHost } from "../config/CodeHost.js";
|
|
14
15
|
import { EpicConfig } from "../config/EpicConfig.js";
|
|
15
16
|
import { Transcript } from "../config/Transcript.js";
|
|
16
17
|
import { DataFile } from "../data/DataFile.js";
|
|
@@ -406,7 +407,7 @@ ${merged.err}`);
|
|
|
406
407
|
const { baseBranch: base, baseBranchProtected } = new EpicConfig(main);
|
|
407
408
|
if (baseBranchProtected)
|
|
408
409
|
throw new EpicCommandError(
|
|
409
|
-
`merge: ${base} takes only
|
|
410
|
+
`merge: ${base} takes only ${CodeHost.of(new EpicConfig(main)).words.pullRequest}s here (baseBranchProtected): epic pr ${epic} pushes it and opens one; nothing merged`
|
|
410
411
|
);
|
|
411
412
|
const branch = Git.run(["branch", "--show-current"], main).out;
|
|
412
413
|
if (branch !== base) throw new EpicCommandError(`merge: ${label} is on '${branch}', not ${base}`);
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { EpicConfig } from "spell/epic/config/EpicConfig";
|
|
2
|
+
import { type CodeHostClient } from "spell/epic/config/CodeHost";
|
|
2
3
|
import { type CheckoutPlace, type IdleWorktree, type LiveSession, type MoveReport, type NameStatus, type PlanFacts, type PlanSummary, type RepoState, type RunningSession } from "./command.types";
|
|
3
4
|
import { Sessions } from "./Sessions";
|
|
4
5
|
/****************
|
|
@@ -130,11 +131,12 @@ export declare class Worktrees {
|
|
|
130
131
|
/**
|
|
131
132
|
* Why `branch` counts as merged into `base`, in a repo whose base takes only pull requests; `undefined` if it doesn't:
|
|
132
133
|
* - all its commits in `base`, local or `origin`'s
|
|
133
|
-
* - or a pull request
|
|
134
|
+
* - or a pull or merge request `host` reports merged whose last commit holds the branch's tip:
|
|
134
135
|
* so a commit made since the merge keeps the branch
|
|
135
|
-
* - runs `gh` only when git alone can't say;
|
|
136
|
+
* - runs its command (`gh`, `glab`) only when git alone can't say; missing or offline: `undefined`, and the branch
|
|
137
|
+
* stays
|
|
136
138
|
*/
|
|
137
|
-
static mergedThroughPullRequest(main: string, branch: string, base: string): string | undefined;
|
|
139
|
+
static mergedThroughPullRequest(main: string, branch: string, base: string, host: CodeHostClient): string | undefined;
|
|
138
140
|
/** `move --idle`: move every worktree in the old place that no session works in; a report each. */
|
|
139
141
|
moveIdle({ dryRun }?: {
|
|
140
142
|
dryRun?: boolean;
|
|
@@ -13,7 +13,7 @@ import { EngineFiles } from "../config/EngineFiles.mjs";
|
|
|
13
13
|
import { EpicConfig } from "../config/EpicConfig.js";
|
|
14
14
|
import { EpicHome } from "../config/EpicHome.js";
|
|
15
15
|
import { EpicRepo } from "../config/EpicRepo.js";
|
|
16
|
-
import {
|
|
16
|
+
import { CodeHost } from "../config/CodeHost.js";
|
|
17
17
|
import { SessionFolders } from "../config/SessionFolders.js";
|
|
18
18
|
import { URGENT_STATES } from "../list/EpicState.js";
|
|
19
19
|
import { PhaseStatuses } from "../phases/index.js";
|
|
@@ -292,9 +292,9 @@ var Worktrees = class _Worktrees {
|
|
|
292
292
|
static deleteBranch(main, branch) {
|
|
293
293
|
const config = new EpicConfig(main);
|
|
294
294
|
if (config.baseBranchProtected) {
|
|
295
|
-
const why = _Worktrees.mergedThroughPullRequest(main, branch, config.baseBranch);
|
|
295
|
+
const why = _Worktrees.mergedThroughPullRequest(main, branch, config.baseBranch, CodeHost.of(config));
|
|
296
296
|
if (!why)
|
|
297
|
-
return `kept branch ${branch}: not in ${config.baseBranch}, and no merged
|
|
297
|
+
return `kept branch ${branch}: not in ${config.baseBranch}, and no merged ${CodeHost.of(config).words.pullRequest} has its last commit`;
|
|
298
298
|
const forced = Git.run(["branch", "-D", branch], main);
|
|
299
299
|
return forced.ok ? `deleted branch ${branch} (${why})` : `kept branch ${branch}: ${forced.err.split("\n")[0]}`;
|
|
300
300
|
}
|
|
@@ -304,15 +304,16 @@ var Worktrees = class _Worktrees {
|
|
|
304
304
|
/**
|
|
305
305
|
* Why `branch` counts as merged into `base`, in a repo whose base takes only pull requests; `undefined` if it doesn't:
|
|
306
306
|
* - all its commits in `base`, local or `origin`'s
|
|
307
|
-
* - or a pull request
|
|
307
|
+
* - or a pull or merge request `host` reports merged whose last commit holds the branch's tip:
|
|
308
308
|
* so a commit made since the merge keeps the branch
|
|
309
|
-
* - runs `gh` only when git alone can't say;
|
|
309
|
+
* - runs its command (`gh`, `glab`) only when git alone can't say; missing or offline: `undefined`, and the branch
|
|
310
|
+
* stays
|
|
310
311
|
*/
|
|
311
|
-
static mergedThroughPullRequest(main, branch, base) {
|
|
312
|
+
static mergedThroughPullRequest(main, branch, base, host) {
|
|
312
313
|
const within = /* @__PURE__ */ __name((into) => Git.run(["merge-base", "--is-ancestor", branch, into], main).ok, "within");
|
|
313
314
|
if (within(base) || within(`refs/remotes/origin/${base}`)) return `in ${base}`;
|
|
314
|
-
const merged =
|
|
315
|
-
return merged &&
|
|
315
|
+
const merged = host.mergedPullRequests(branch, base, main).find((pull) => within(pull.head));
|
|
316
|
+
return merged && `${host.words.pullRequest} ${host.words.number(merged.number)} merged`;
|
|
316
317
|
}
|
|
317
318
|
/** `move --idle`: move every worktree in the old place that no session works in; a report each. */
|
|
318
319
|
moveIdle({ dryRun = false } = {}) {
|
|
@@ -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": "17aa66d8b3a210e7",
|
|
13
|
+
"epic-agents": "3a3ba27149b92463",
|
|
14
|
+
"epic-answer": "8ac659d77913cfd7",
|
|
15
|
+
"epic-aside": "b5070a134646e8e1",
|
|
16
|
+
"epic-ask": "dcd18de68190958f",
|
|
17
|
+
"epic-away-line": "2b5823350572fc0c",
|
|
18
|
+
"epic-cards": "3e52412150e30a81",
|
|
19
|
+
"epic-change": "838fc22361d06b86",
|
|
20
|
+
"epic-choice-rows": "6ed09c3337d078ad",
|
|
21
|
+
"epic-choices": "60d0dd099a80c39f",
|
|
22
|
+
"epic-choices-bar": "a80e1e80d1a1b12f",
|
|
23
|
+
"epic-code": "135384b5f935787e",
|
|
24
|
+
"epic-comment-pane": "ee3a3b7361a34247",
|
|
25
|
+
"epic-commit": "bb98ee1fc92150e7",
|
|
26
|
+
"epic-event": "d23ace4b0f65f013",
|
|
27
|
+
"epic-focus": "df3a32ff0937c3be",
|
|
28
|
+
"epic-item": "6edfd1f080100b03",
|
|
29
|
+
"epic-link": "4411636175eab8b3",
|
|
30
|
+
"epic-list": "2a88c9c7a7530234",
|
|
31
|
+
"epic-mark": "1c68974bcf67a7a2",
|
|
32
|
+
"epic-net-effect": "c74464566bd1b9d7",
|
|
33
|
+
"epic-new-item": "d850118a7c384b0c",
|
|
34
|
+
"epic-note": "7d532f03f12a7cd6",
|
|
35
|
+
"epic-option-form": "fc8a7ae1a031185b",
|
|
36
|
+
"epic-original": "a3223280be213ca3",
|
|
37
|
+
"epic-overview": "0a7110ff60ab3b12",
|
|
38
|
+
"epic-page": "8e66e6573f6b6351",
|
|
39
|
+
"epic-page-note-head": "f63ca79ef536f75c",
|
|
40
|
+
"epic-phase": "b78befbf3ffc607d",
|
|
41
|
+
"epic-prompt": "cc5d17cc40934665",
|
|
42
|
+
"epic-question": "3d08f22e6228bbd1",
|
|
43
|
+
"epic-review": "6c7ac8f70e526440",
|
|
44
|
+
"epic-run": "479821dd298893c7",
|
|
45
|
+
"epic-run-row": "f04c3de29a033536",
|
|
46
|
+
"epic-section": "bbd63420149c34e7",
|
|
47
|
+
"epic-send": "377fd631f92885bd",
|
|
48
|
+
"epic-send-buttons": "fa8c4ec06235e342",
|
|
49
|
+
"epic-state-filter": "7fc55acc2403b294",
|
|
50
|
+
"epic-status": "eee7c84130c6724c",
|
|
51
|
+
"epic-summary": "36ed93316dbefde5",
|
|
52
|
+
"epic-text-box": "f400b02a60281d25",
|
|
53
|
+
"epic-thread": "70721c8b129a4df8",
|
|
54
|
+
"epic-update": "343c6042686bf109"
|
|
55
55
|
},
|
|
56
56
|
define: /* @__PURE__ */ __name(() => Promise.all([
|
|
57
57
|
import("../epic-actions/index.js"),
|