iskills 0.2.40 → 0.2.45
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.md +120 -26
- package/README.zh-CN.md +142 -0
- package/bin/iskills.js +77 -2
- package/bin/opentui-register.mjs +10 -0
- package/bin/opentui-resolve-hook.mjs +12 -0
- package/bin/patch-react-reconciler.mjs +71 -0
- package/dist/src/cli.js +7 -5
- package/dist/src/cli.js.map +1 -1
- package/dist/src/commands/browser-actions.js +31 -31
- package/dist/src/commands/browser-actions.js.map +1 -1
- package/dist/src/commands/create.d.ts +1 -0
- package/dist/src/commands/create.js +36 -0
- package/dist/src/commands/create.js.map +1 -0
- package/dist/src/commands/index.d.ts +1 -0
- package/dist/src/commands/index.js +28 -9
- package/dist/src/commands/index.js.map +1 -1
- package/dist/src/commands/library.js +15 -28
- package/dist/src/commands/library.js.map +1 -1
- package/dist/src/domain/collection-write.d.ts +2 -0
- package/dist/src/domain/collection-write.js +44 -2
- package/dist/src/domain/collection-write.js.map +1 -1
- package/dist/src/domain/core.d.ts +29 -1
- package/dist/src/domain/core.js +125 -8
- package/dist/src/domain/core.js.map +1 -1
- package/dist/src/domain/types.d.ts +2 -0
- package/dist/src/ui/browser/browser.d.ts +2 -1
- package/dist/src/ui/browser/browser.js +213 -58
- package/dist/src/ui/browser/browser.js.map +1 -1
- package/dist/src/ui/browser/detail.d.ts +1 -1
- package/dist/src/ui/browser/detail.js +3 -3
- package/dist/src/ui/browser/detail.js.map +1 -1
- package/dist/src/ui/browser/footer.js +4 -3
- package/dist/src/ui/browser/footer.js.map +1 -1
- package/dist/src/ui/browser/format.d.ts +17 -6
- package/dist/src/ui/browser/format.js +54 -29
- package/dist/src/ui/browser/format.js.map +1 -1
- package/dist/src/ui/browser/index.js +9 -9
- package/dist/src/ui/browser/index.js.map +1 -1
- package/dist/src/ui/browser/layout.d.ts +1 -1
- package/dist/src/ui/browser/layout.js +1 -1
- package/dist/src/ui/browser/shortcut-help.d.ts +2 -0
- package/dist/src/ui/browser/shortcut-help.js +32 -12
- package/dist/src/ui/browser/shortcut-help.js.map +1 -1
- package/dist/src/ui/browser/types.d.ts +1 -1
- package/dist/src/ui/collection-match.js +1 -1
- package/dist/src/ui/collection-match.js.map +1 -1
- package/dist/src/ui/components/colors.d.ts +55 -5
- package/dist/src/ui/components/colors.js +58 -6
- package/dist/src/ui/components/colors.js.map +1 -1
- package/dist/src/ui/components/confirm.js +2 -2
- package/dist/src/ui/components/confirm.js.map +1 -1
- package/dist/src/ui/components/framed-panel.d.ts +3 -3
- package/dist/src/ui/components/framed-panel.js +29 -11
- package/dist/src/ui/components/framed-panel.js.map +1 -1
- package/dist/src/ui/components/link.js +13 -8
- package/dist/src/ui/components/link.js.map +1 -1
- package/dist/src/ui/components/modal-panel.d.ts +9 -0
- package/dist/src/ui/components/modal-panel.js +8 -0
- package/dist/src/ui/components/modal-panel.js.map +1 -0
- package/dist/src/ui/components/modal.js +3 -3
- package/dist/src/ui/components/modal.js.map +1 -1
- package/dist/src/ui/components/mouse/bounds.d.ts +1 -6
- package/dist/src/ui/components/mouse/bounds.js +1 -22
- package/dist/src/ui/components/mouse/bounds.js.map +1 -1
- package/dist/src/ui/components/mouse/clickable.d.ts +6 -4
- package/dist/src/ui/components/mouse/clickable.js +26 -10
- package/dist/src/ui/components/mouse/clickable.js.map +1 -1
- package/dist/src/ui/components/mouse/index.d.ts +2 -2
- package/dist/src/ui/components/mouse/index.js +2 -2
- package/dist/src/ui/components/mouse/index.js.map +1 -1
- package/dist/src/ui/components/mouse/parse.d.ts +1 -1
- package/dist/src/ui/components/mouse/parse.js +3 -3
- package/dist/src/ui/components/mouse/parse.js.map +1 -1
- package/dist/src/ui/components/mouse/provider.d.ts +17 -15
- package/dist/src/ui/components/mouse/provider.js +29 -85
- package/dist/src/ui/components/mouse/provider.js.map +1 -1
- package/dist/src/ui/components/multi-select.js +23 -7
- package/dist/src/ui/components/multi-select.js.map +1 -1
- package/dist/src/ui/components/options.d.ts +2 -1
- package/dist/src/ui/components/options.js +2 -1
- package/dist/src/ui/components/options.js.map +1 -1
- package/dist/src/ui/components/select.d.ts +4 -0
- package/dist/src/ui/components/select.js +31 -34
- package/dist/src/ui/components/select.js.map +1 -1
- package/dist/src/ui/components/spinner.d.ts +16 -0
- package/dist/src/ui/components/spinner.js +45 -0
- package/dist/src/ui/components/spinner.js.map +1 -0
- package/dist/src/ui/components/tabs.js +10 -6
- package/dist/src/ui/components/tabs.js.map +1 -1
- package/dist/src/ui/components/tag-editor.js +8 -5
- package/dist/src/ui/components/tag-editor.js.map +1 -1
- package/dist/src/ui/components/termcn.d.ts +3 -1
- package/dist/src/ui/components/termcn.js +5 -3
- package/dist/src/ui/components/termcn.js.map +1 -1
- package/dist/src/ui/components/text-input.d.ts +8 -1
- package/dist/src/ui/components/text-input.js +34 -68
- package/dist/src/ui/components/text-input.js.map +1 -1
- package/dist/src/ui/components/use-input.d.ts +21 -7
- package/dist/src/ui/components/use-input.js +61 -9
- package/dist/src/ui/components/use-input.js.map +1 -1
- package/dist/src/ui/footer/resolve-footer.js +11 -2
- package/dist/src/ui/footer/resolve-footer.js.map +1 -1
- package/dist/src/ui/import/review.js +13 -7
- package/dist/src/ui/import/review.js.map +1 -1
- package/dist/src/ui/import/skill-select.js +37 -7
- package/dist/src/ui/import/skill-select.js.map +1 -1
- package/dist/src/ui/import/types.d.ts +1 -1
- package/dist/src/ui/install/review.js +15 -10
- package/dist/src/ui/install/review.js.map +1 -1
- package/dist/src/ui/install/types.d.ts +4 -6
- package/dist/src/ui/install/types.js +1 -1
- package/dist/src/ui/overlay/bridge.js +4 -0
- package/dist/src/ui/overlay/bridge.js.map +1 -1
- package/dist/src/ui/overlay/dialogs.js +1 -1
- package/dist/src/ui/overlay/host.js +4 -4
- package/dist/src/ui/overlay/host.js.map +1 -1
- package/dist/src/ui/prompts/present.d.ts +1 -1
- package/dist/src/ui/prompts/present.js +4 -3
- package/dist/src/ui/prompts/present.js.map +1 -1
- package/dist/src/ui/search/index.js +7 -6
- package/dist/src/ui/search/index.js.map +1 -1
- package/dist/src/ui/shell/app-shell.d.ts +1 -1
- package/dist/src/ui/shell/app-shell.js +4 -6
- package/dist/src/ui/shell/app-shell.js.map +1 -1
- package/dist/src/ui/shell/footer.js +5 -8
- package/dist/src/ui/shell/footer.js.map +1 -1
- package/dist/src/ui/shell/lifecycle.d.ts +12 -0
- package/dist/src/ui/shell/lifecycle.js +30 -0
- package/dist/src/ui/shell/lifecycle.js.map +1 -0
- package/dist/src/ui/shell/run.d.ts +35 -10
- package/dist/src/ui/shell/run.js +175 -88
- package/dist/src/ui/shell/run.js.map +1 -1
- package/dist/src/ui/shell/terminal.d.ts +1 -1
- package/dist/src/ui/shell/terminal.js +1 -1
- package/dist/src/ui/tui/hooks.d.ts +45 -0
- package/dist/src/ui/tui/hooks.js +79 -0
- package/dist/src/ui/tui/hooks.js.map +1 -0
- package/dist/src/ui/tui/index.d.ts +2 -0
- package/dist/src/ui/tui/index.js +3 -0
- package/dist/src/ui/tui/index.js.map +1 -0
- package/dist/src/ui/tui/primitives.d.ts +12 -0
- package/dist/src/ui/tui/primitives.js +56 -0
- package/dist/src/ui/tui/primitives.js.map +1 -0
- package/dist/src/util/open-path.d.ts +2 -0
- package/dist/src/util/open-path.js +27 -0
- package/dist/src/util/open-path.js.map +1 -0
- package/package.json +11 -8
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/ui/search/index.tsx"],"names":[],"mappings":";AAAA;;;GAGG;AACH,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/ui/search/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type ReactNode } from 'react';
|
|
2
2
|
/**
|
|
3
|
-
* Pure
|
|
3
|
+
* Pure interactive shell: first-frame visibility + global key callbacks.
|
|
4
4
|
* Composes {@link OverlayHost} for Layer / Modal slots — does not own overlay logic.
|
|
5
5
|
*
|
|
6
6
|
* Does **not** call `exit` or throw InterruptError.
|
|
@@ -1,12 +1,11 @@
|
|
|
1
|
-
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
-
import { Box } from 'ink';
|
|
1
|
+
import { jsx as _jsx } from "@opentui/react/jsx-runtime";
|
|
3
2
|
import { useInput } from '../components/use-input.js';
|
|
4
3
|
import { useEffect, useState } from 'react';
|
|
5
4
|
import { MouseProvider } from '../components/mouse/index.js';
|
|
6
5
|
import { OverlayHost, useOverlayBusy, } from '../overlay/host.js';
|
|
7
6
|
import { OverlayOnlyFooter } from './footer.js';
|
|
8
7
|
/**
|
|
9
|
-
* Pure
|
|
8
|
+
* Pure interactive shell: first-frame visibility + global key callbacks.
|
|
10
9
|
* Composes {@link OverlayHost} for Layer / Modal slots — does not own overlay logic.
|
|
11
10
|
*
|
|
12
11
|
* Does **not** call `exit` or throw InterruptError.
|
|
@@ -21,8 +20,7 @@ export { useLayer, useModal, useOverlayBusy, } from '../overlay/host.js';
|
|
|
21
20
|
export function AppShell({ cancelOnEscape = false, onCancel, onCtrlC, bottomChrome, children, }) {
|
|
22
21
|
const [ready, setReady] = useState(false);
|
|
23
22
|
useEffect(() => {
|
|
24
|
-
//
|
|
25
|
-
// interactive tree until those listeners and raw mode are active, or a
|
|
23
|
+
// Do not show an interactive tree until key listeners are active, or a
|
|
26
24
|
// fast keypress can be echoed by the terminal and lost between screens.
|
|
27
25
|
const timer = setTimeout(() => setReady(true), 0);
|
|
28
26
|
return () => clearTimeout(timer);
|
|
@@ -41,6 +39,6 @@ function AppShellBody({ ready, cancelOnEscape = false, onCancel, onCtrlC, childr
|
|
|
41
39
|
onCancel?.();
|
|
42
40
|
}
|
|
43
41
|
});
|
|
44
|
-
return (_jsx(
|
|
42
|
+
return (_jsx("box", { visible: ready, flexDirection: "column", width: "100%", height: "100%", children: children }));
|
|
45
43
|
}
|
|
46
44
|
//# sourceMappingURL=app-shell.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-shell.js","sourceRoot":"","sources":["../../../../src/ui/shell/app-shell.tsx"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"app-shell.js","sourceRoot":"","sources":["../../../../src/ui/shell/app-shell.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAkB,MAAM,OAAO,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EACL,WAAW,EACX,cAAc,GACf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD;;;;;;;;;;GAUG;AAEH,uEAAuE;AACvE,OAAO,EACL,QAAQ,EACR,QAAQ,EACR,cAAc,GACf,MAAM,oBAAoB,CAAC;AAa5B,MAAM,UAAU,QAAQ,CAAC,EACvB,cAAc,GAAG,KAAK,EACtB,QAAQ,EACR,OAAO,EACP,YAAY,EACZ,QAAQ,GAQT;IACC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE1C,SAAS,CAAC,GAAG,EAAE;QACb,uEAAuE;QACvE,wEAAwE;QACxE,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QAClD,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,CACL,KAAC,aAAa,cACZ,KAAC,WAAW,IACV,YAAY,EACV,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,IAAI,KAAC,iBAAiB,KAAG,CAAC,CAAC,CAAC,CAAC,IAAI,YAGxD,KAAC,YAAY,IACX,KAAK,EAAE,KAAK,EACZ,cAAc,EAAE,cAAc,KAC1B,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KAC9B,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,YAE/B,QAAQ,GACI,GACH,GACA,CACjB,CAAC;AACJ,CAAC;AAED,gFAAgF;AAChF,SAAS,YAAY,CAAC,EACpB,KAAK,EACL,cAAc,GAAG,KAAK,EACtB,QAAQ,EACR,OAAO,EACP,QAAQ,GAOT;IACC,MAAM,IAAI,GAAG,cAAc,EAAE,CAAC;IAE9B,QAAQ,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;QACtB,IAAI,GAAG,CAAC,IAAI,IAAI,KAAK,KAAK,GAAG,EAAE,CAAC;YAC9B,OAAO,EAAE,EAAE,CAAC;YACZ,OAAO;QACT,CAAC;QACD,IAAI,CAAC,IAAI,IAAI,cAAc,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;YAC1C,QAAQ,EAAE,EAAE,CAAC;QACf,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,CACL,cACE,OAAO,EAAE,KAAK,EACd,aAAa,EAAC,QAAQ,EACtB,KAAK,EAAC,MAAM,EACZ,MAAM,EAAC,MAAM,YAEZ,QAAQ,GACL,CACP,CAAC;AACJ,CAAC"}
|
|
@@ -1,14 +1,10 @@
|
|
|
1
|
-
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
-
import {
|
|
1
|
+
import { jsx as _jsx, jsxs as _jsxs } from "@opentui/react/jsx-runtime";
|
|
2
|
+
import { Text, useModalChrome, useStdout } from '../tui/index.js';
|
|
3
3
|
import { termcnColors } from '../components/colors.js';
|
|
4
4
|
import { formatFooterItem, resolveFooter, } from '../footer/resolve-footer.js';
|
|
5
5
|
import { useOverlayFooterItems } from '../overlay/host.js';
|
|
6
|
-
function statusColor(kind) {
|
|
7
|
-
if (kind === 'error')
|
|
8
|
-
return termcnColors.error;
|
|
9
|
-
return termcnColors.muted;
|
|
10
|
-
}
|
|
11
6
|
export function FooterPaint({ view }) {
|
|
7
|
+
const chrome = useModalChrome();
|
|
12
8
|
if (view.mode === 'empty')
|
|
13
9
|
return null;
|
|
14
10
|
if (view.mode === 'input')
|
|
@@ -16,7 +12,8 @@ export function FooterPaint({ view }) {
|
|
|
16
12
|
if (view.items.length === 0 && !view.status)
|
|
17
13
|
return null;
|
|
18
14
|
const left = view.items.map(formatFooterItem).join(' · ');
|
|
19
|
-
|
|
15
|
+
const statusFg = view.statusKind === 'error' ? termcnColors.error : chrome.muted;
|
|
16
|
+
return (_jsxs("box", { flexDirection: "row", justifyContent: "space-between", width: "100%", children: [_jsx("box", { flexDirection: "row", flexGrow: 1, flexShrink: 1, marginRight: 1, children: _jsx(Text, { color: chrome.muted, wrap: "truncate-end", children: left }) }), view.status ? (_jsx(Text, { color: statusFg, wrap: "truncate-end", children: view.status })) : null] }));
|
|
20
17
|
}
|
|
21
18
|
/** Overlay-only footer (no browser jotai Provider). */
|
|
22
19
|
export function OverlayOnlyFooter() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"footer.js","sourceRoot":"","sources":["../../../../src/ui/shell/footer.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"footer.js","sourceRoot":"","sources":["../../../../src/ui/shell/footer.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EACL,gBAAgB,EAChB,aAAa,GACd,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,MAAM,UAAU,WAAW,CAAC,EAAE,IAAI,EAAwB;IACxD,MAAM,MAAM,GAAG,cAAc,EAAE,CAAC;IAChC,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO;QAAE,OAAO,IAAI,CAAC;IACvC,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO;QAAE,OAAO,IAAI,CAAC;IACvC,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IAEzD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC1D,MAAM,QAAQ,GACZ,IAAI,CAAC,UAAU,KAAK,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;IAClE,OAAO,CACL,eAAK,aAAa,EAAC,KAAK,EAAC,cAAc,EAAC,eAAe,EAAC,KAAK,EAAC,MAAM,aAClE,cAAK,aAAa,EAAC,KAAK,EAAC,QAAQ,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,YACjE,KAAC,IAAI,IAAC,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,IAAI,EAAC,cAAc,YAC3C,IAAI,GACA,GACH,EACL,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CACb,KAAC,IAAI,IAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAC,cAAc,YACvC,IAAI,CAAC,MAAM,GACP,CACR,CAAC,CAAC,CAAC,IAAI,IACJ,CACP,CAAC;AACJ,CAAC;AAED,uDAAuD;AACvD,MAAM,UAAU,iBAAiB;IAC/B,MAAM,YAAY,GAAG,qBAAqB,EAAE,CAAC;IAC7C,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,aAAa,CAAC;QACzB,YAAY;QACZ,UAAU,EAAE,KAAK;QACjB,UAAU,EAAE,KAAK;QACjB,WAAW,EAAE,EAAE;QACf,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,IAAI;QACZ,MAAM,EAAE,IAAI;QACZ,WAAW,EAAE,IAAI;QACjB,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,EAAE;KAC9B,CAAC,CAAC;IACH,OAAO,KAAC,WAAW,IAAC,IAAI,EAAE,IAAI,GAAI,CAAC;AACrC,CAAC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Process-level TUI instance registry without importing OpenTUI.
|
|
3
|
+
* CLI `finally` can tear down without loading the native renderer.
|
|
4
|
+
*/
|
|
5
|
+
export type TuiDisposer = {
|
|
6
|
+
unmount: () => void;
|
|
7
|
+
cleanup: () => void;
|
|
8
|
+
};
|
|
9
|
+
export declare function setActiveTui(instance: TuiDisposer | undefined): void;
|
|
10
|
+
export declare function getActiveTui(): TuiDisposer | undefined;
|
|
11
|
+
/** Force-unmount whatever is active (CLI main `finally`). */
|
|
12
|
+
export declare function closeTui(): void;
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Process-level TUI instance registry without importing OpenTUI.
|
|
3
|
+
* CLI `finally` can tear down without loading the native renderer.
|
|
4
|
+
*/
|
|
5
|
+
let activeInstance;
|
|
6
|
+
export function setActiveTui(instance) {
|
|
7
|
+
activeInstance = instance;
|
|
8
|
+
}
|
|
9
|
+
export function getActiveTui() {
|
|
10
|
+
return activeInstance;
|
|
11
|
+
}
|
|
12
|
+
/** Force-unmount whatever is active (CLI main `finally`). */
|
|
13
|
+
export function closeTui() {
|
|
14
|
+
if (!activeInstance)
|
|
15
|
+
return;
|
|
16
|
+
const instance = activeInstance;
|
|
17
|
+
activeInstance = undefined;
|
|
18
|
+
try {
|
|
19
|
+
instance.unmount();
|
|
20
|
+
}
|
|
21
|
+
catch {
|
|
22
|
+
try {
|
|
23
|
+
instance.cleanup();
|
|
24
|
+
}
|
|
25
|
+
catch {
|
|
26
|
+
// ignore double teardown
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
//# sourceMappingURL=lifecycle.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"lifecycle.js","sourceRoot":"","sources":["../../../../src/ui/shell/lifecycle.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,IAAI,cAAuC,CAAC;AAE5C,MAAM,UAAU,YAAY,CAAC,QAAiC;IAC5D,cAAc,GAAG,QAAQ,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,YAAY;IAC1B,OAAO,cAAc,CAAC;AACxB,CAAC;AAED,6DAA6D;AAC7D,MAAM,UAAU,QAAQ;IACtB,IAAI,CAAC,cAAc;QAAE,OAAO;IAC5B,MAAM,QAAQ,GAAG,cAAc,CAAC;IAChC,cAAc,GAAG,SAAS,CAAC;IAC3B,IAAI,CAAC;QACH,QAAQ,CAAC,OAAO,EAAE,CAAC;IACrB,CAAC;IAAC,MAAM,CAAC;QACP,IAAI,CAAC;YACH,QAAQ,CAAC,OAAO,EAAE,CAAC;QACrB,CAAC;QAAC,MAAM,CAAC;YACP,yBAAyB;QAC3B,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -1,13 +1,36 @@
|
|
|
1
|
-
import { type Instance } from 'ink';
|
|
2
1
|
import type { ReactNode } from 'react';
|
|
2
|
+
import { type TuiDisposer } from './lifecycle.js';
|
|
3
|
+
export { closeTui } from './lifecycle.js';
|
|
4
|
+
/**
|
|
5
|
+
* OpenTUI UI runtime (shell package): mount registry + session runners + AppShell.
|
|
6
|
+
*
|
|
7
|
+
* OpenTUI is loaded lazily so non-interactive CLI paths never touch the native core.
|
|
8
|
+
*
|
|
9
|
+
* - `mountTui` / `closeTui` — process-level active instance
|
|
10
|
+
* - `runScreen` — low-level one-shot Promise screen (prefer Modal/Layer + bootstrap)
|
|
11
|
+
* - `startApp` / `runApp` — long-lived tree (`ui/browser`); remount via handle
|
|
12
|
+
* - registers overlay bootstrap so static Modal/Layer work without a pre-mounted tree
|
|
13
|
+
*/
|
|
14
|
+
export type TuiInstance = TuiDisposer & {
|
|
15
|
+
renderer: {
|
|
16
|
+
destroy: () => void;
|
|
17
|
+
};
|
|
18
|
+
root: {
|
|
19
|
+
render: (node: ReactNode) => void;
|
|
20
|
+
unmount: () => void;
|
|
21
|
+
};
|
|
22
|
+
waitUntilExit: () => Promise<void>;
|
|
23
|
+
settle: (error?: Error) => void;
|
|
24
|
+
};
|
|
3
25
|
/** Mount a root node; replaces the process-level active instance pointer. */
|
|
4
|
-
export declare function
|
|
26
|
+
export declare function mountTui(node: ReactNode, options?: {
|
|
27
|
+
alternateScreen?: boolean;
|
|
28
|
+
useMouse?: boolean;
|
|
29
|
+
}): Promise<TuiInstance>;
|
|
5
30
|
/** Cleanup after exit/unmount; clear active if it matches. */
|
|
6
|
-
export declare function
|
|
31
|
+
export declare function releaseTui(instance: TuiInstance): void;
|
|
7
32
|
/** Unmount + cleanup one instance; clears active if it matches. */
|
|
8
|
-
export declare function
|
|
9
|
-
/** Force-unmount whatever is active (CLI main `finally`). */
|
|
10
|
-
export declare function closeInk(): void;
|
|
33
|
+
export declare function unmountTui(instance: TuiInstance): void;
|
|
11
34
|
/**
|
|
12
35
|
* One-shot screen: mount → await finish/cancel/interrupt → unmount.
|
|
13
36
|
*
|
|
@@ -20,7 +43,7 @@ export interface RunAppHandle {
|
|
|
20
43
|
/** Replace the mounted tree (e.g. after suspendForSubprocess). */
|
|
21
44
|
remount: (node: ReactNode) => void;
|
|
22
45
|
waitUntilExit: () => Promise<void>;
|
|
23
|
-
/** Unmount + cleanup
|
|
46
|
+
/** Unmount + cleanup. */
|
|
24
47
|
dispose: () => void;
|
|
25
48
|
}
|
|
26
49
|
export interface RunAppOptions {
|
|
@@ -30,12 +53,14 @@ export interface RunAppOptions {
|
|
|
30
53
|
export declare function enterAlternateScreen(): void;
|
|
31
54
|
export declare function leaveAlternateScreen(): void;
|
|
32
55
|
/**
|
|
33
|
-
* Long-lived
|
|
56
|
+
* Long-lived OpenTUI app: mount until the tree exits, then cleanup.
|
|
34
57
|
* Prefer `startApp` when the host must remount (e.g. Git TTY handoff).
|
|
35
58
|
*/
|
|
36
59
|
export declare function runApp(node: ReactNode, options?: RunAppOptions): Promise<void>;
|
|
37
60
|
/**
|
|
38
61
|
* Start a long-lived app and return a handle for remount / wait / dispose.
|
|
39
|
-
*
|
|
62
|
+
* Uses OpenTUI alternate-screen mode when `alternateScreen` is true.
|
|
40
63
|
*/
|
|
41
|
-
export declare function startApp(node: ReactNode): RunAppHandle
|
|
64
|
+
export declare function startApp(node: ReactNode, options?: RunAppOptions): Promise<RunAppHandle>;
|
|
65
|
+
/** Rebuild a disposed app (e.g. after subprocess TTY handoff). */
|
|
66
|
+
export declare function restartApp(node: ReactNode, options?: RunAppOptions): Promise<RunAppHandle>;
|
package/dist/src/ui/shell/run.js
CHANGED
|
@@ -1,47 +1,130 @@
|
|
|
1
|
-
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
-
import { render, useApp } from 'ink';
|
|
3
1
|
import { getActiveOverlayHost, setOverlayBootstrap, } from '../overlay/bridge.js';
|
|
4
2
|
import { InterruptError } from './terminal.js';
|
|
5
|
-
import {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
3
|
+
import { getActiveTui, setActiveTui, } from './lifecycle.js';
|
|
4
|
+
export { closeTui } from './lifecycle.js';
|
|
5
|
+
async function loadOpenTui() {
|
|
6
|
+
const [{ createCliRenderer }, { createRoot }, hooks, appShell, react] = await Promise.all([
|
|
7
|
+
import('@opentui/core'),
|
|
8
|
+
import('@opentui/react'),
|
|
9
|
+
import('../tui/hooks.js'),
|
|
10
|
+
import('./app-shell.js'),
|
|
11
|
+
import('react'),
|
|
12
|
+
]);
|
|
13
|
+
return {
|
|
14
|
+
createCliRenderer: createCliRenderer,
|
|
15
|
+
createRoot: createRoot,
|
|
16
|
+
ExitProvider: hooks.ExitProvider,
|
|
17
|
+
AppShell: appShell.AppShell,
|
|
18
|
+
createElement: react.createElement,
|
|
19
|
+
};
|
|
20
|
+
}
|
|
21
|
+
function createExitController() {
|
|
22
|
+
let settled = false;
|
|
23
|
+
let resolveExit;
|
|
24
|
+
let rejectExit;
|
|
25
|
+
const promise = new Promise((resolve, reject) => {
|
|
26
|
+
resolveExit = resolve;
|
|
27
|
+
rejectExit = reject;
|
|
28
|
+
});
|
|
29
|
+
void promise.catch(() => undefined);
|
|
30
|
+
const settle = (error) => {
|
|
31
|
+
if (settled)
|
|
32
|
+
return;
|
|
33
|
+
settled = true;
|
|
34
|
+
if (error)
|
|
35
|
+
rejectExit(error);
|
|
36
|
+
else
|
|
37
|
+
resolveExit();
|
|
38
|
+
};
|
|
39
|
+
const exit = (error) => {
|
|
40
|
+
settle(error);
|
|
41
|
+
};
|
|
42
|
+
return {
|
|
43
|
+
exit,
|
|
44
|
+
waitUntilExit: () => promise,
|
|
45
|
+
settle,
|
|
46
|
+
};
|
|
47
|
+
}
|
|
16
48
|
/** Mount a root node; replaces the process-level active instance pointer. */
|
|
17
|
-
export function
|
|
18
|
-
const
|
|
19
|
-
|
|
49
|
+
export async function mountTui(node, options = {}) {
|
|
50
|
+
const { createCliRenderer, createRoot, ExitProvider, createElement } = await loadOpenTui();
|
|
51
|
+
const controller = createExitController();
|
|
52
|
+
let renderer;
|
|
53
|
+
try {
|
|
54
|
+
const useMouse = options.useMouse ?? true;
|
|
55
|
+
renderer = await createCliRenderer({
|
|
56
|
+
exitOnCtrlC: false,
|
|
57
|
+
useMouse,
|
|
58
|
+
// Hover (onMouseOver/Out) needs movement reports, not just button clicks.
|
|
59
|
+
enableMouseMovement: useMouse,
|
|
60
|
+
// Do NOT force backgroundColor — inherit the terminal's default bg (user theme).
|
|
61
|
+
screenMode: options.alternateScreen ? 'alternate-screen' : 'main-screen',
|
|
62
|
+
clearOnShutdown: true,
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
catch (error) {
|
|
66
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
67
|
+
if (/native FFI|not available for this runtime/i.test(message)) {
|
|
68
|
+
throw new Error('OpenTUI native renderer is unavailable in this runtime. ' +
|
|
69
|
+
'Interactive TUI requires Bun on PATH (bin/iskills.js re-execs to bun when Node lacks node:ffi) ' +
|
|
70
|
+
'or a Node build with node:ffi. Install: https://bun.sh — then re-run `iskills`. ' +
|
|
71
|
+
`Underlying error: ${message}`);
|
|
72
|
+
}
|
|
73
|
+
throw error;
|
|
74
|
+
}
|
|
75
|
+
const root = createRoot(renderer);
|
|
76
|
+
let disposed = false;
|
|
77
|
+
const cleanup = () => {
|
|
78
|
+
if (disposed)
|
|
79
|
+
return;
|
|
80
|
+
disposed = true;
|
|
81
|
+
try {
|
|
82
|
+
root.unmount();
|
|
83
|
+
}
|
|
84
|
+
catch {
|
|
85
|
+
// ignore double-unmount
|
|
86
|
+
}
|
|
87
|
+
try {
|
|
88
|
+
renderer.destroy();
|
|
89
|
+
}
|
|
90
|
+
catch {
|
|
91
|
+
// ignore double-destroy
|
|
92
|
+
}
|
|
93
|
+
if (getActiveTui() === instance) {
|
|
94
|
+
setActiveTui(undefined);
|
|
95
|
+
}
|
|
96
|
+
};
|
|
97
|
+
const instance = {
|
|
98
|
+
renderer,
|
|
99
|
+
root,
|
|
100
|
+
waitUntilExit: controller.waitUntilExit,
|
|
101
|
+
unmount: () => {
|
|
102
|
+
controller.settle();
|
|
103
|
+
cleanup();
|
|
104
|
+
},
|
|
105
|
+
cleanup,
|
|
106
|
+
settle: controller.settle,
|
|
107
|
+
};
|
|
108
|
+
setActiveTui(instance);
|
|
109
|
+
const exit = (error) => {
|
|
110
|
+
controller.settle(error);
|
|
111
|
+
cleanup();
|
|
112
|
+
};
|
|
113
|
+
root.render(createElement(ExitProvider, { exit, children: node }));
|
|
20
114
|
return instance;
|
|
21
115
|
}
|
|
22
116
|
/** Cleanup after exit/unmount; clear active if it matches. */
|
|
23
|
-
export function
|
|
117
|
+
export function releaseTui(instance) {
|
|
24
118
|
instance.cleanup();
|
|
25
|
-
if (
|
|
26
|
-
|
|
119
|
+
if (getActiveTui() === instance)
|
|
120
|
+
setActiveTui(undefined);
|
|
27
121
|
}
|
|
28
122
|
/** Unmount + cleanup one instance; clears active if it matches. */
|
|
29
|
-
export function
|
|
123
|
+
export function unmountTui(instance) {
|
|
30
124
|
instance.unmount();
|
|
31
|
-
|
|
32
|
-
}
|
|
33
|
-
/** Force-unmount whatever is active (CLI main `finally`). */
|
|
34
|
-
export function closeInk() {
|
|
35
|
-
if (!activeInstance)
|
|
36
|
-
return;
|
|
37
|
-
unmountInk(activeInstance);
|
|
125
|
+
releaseTui(instance);
|
|
38
126
|
}
|
|
39
127
|
// ─── one-shot screen ────────────────────────────────────────────────────────
|
|
40
|
-
function ExitBridge({ register, }) {
|
|
41
|
-
const { exit } = useApp();
|
|
42
|
-
register(exit);
|
|
43
|
-
return null;
|
|
44
|
-
}
|
|
45
128
|
/**
|
|
46
129
|
* One-shot screen: mount → await finish/cancel/interrupt → unmount.
|
|
47
130
|
*
|
|
@@ -49,33 +132,35 @@ function ExitBridge({ register, }) {
|
|
|
49
132
|
* - Ctrl+C → reject `InterruptError`
|
|
50
133
|
* - `finish(value)` → resolve value
|
|
51
134
|
*/
|
|
52
|
-
export function runScreen(cancelledValue, component, cancelOnEscape = true) {
|
|
135
|
+
export async function runScreen(cancelledValue, component, cancelOnEscape = true) {
|
|
136
|
+
const { AppShell, createElement } = await loadOpenTui();
|
|
53
137
|
return new Promise((resolve, reject) => {
|
|
54
138
|
let finished = false;
|
|
55
|
-
let exit;
|
|
56
139
|
let instance;
|
|
57
140
|
const settle = (complete) => {
|
|
58
141
|
if (finished)
|
|
59
142
|
return;
|
|
60
143
|
finished = true;
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
void exited.then(() => {
|
|
67
|
-
releaseInk(instance);
|
|
68
|
-
// React runs passive useInput cleanup after Ink resolves its exit promise.
|
|
69
|
-
setTimeout(complete, 10);
|
|
70
|
-
}, (error) => {
|
|
71
|
-
releaseInk(instance);
|
|
72
|
-
reject(error);
|
|
73
|
-
});
|
|
144
|
+
if (instance) {
|
|
145
|
+
instance.settle();
|
|
146
|
+
instance.cleanup();
|
|
147
|
+
}
|
|
148
|
+
setTimeout(complete, 10);
|
|
74
149
|
};
|
|
75
150
|
const finish = (value) => settle(() => resolve(value));
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
151
|
+
void mountTui(createElement(AppShell, {
|
|
152
|
+
cancelOnEscape,
|
|
153
|
+
onCancel: () => finish(cancelledValue),
|
|
154
|
+
onCtrlC: () => settle(() => reject(new InterruptError())),
|
|
155
|
+
children: component(finish),
|
|
156
|
+
}))
|
|
157
|
+
.then((mounted) => {
|
|
158
|
+
instance = mounted;
|
|
159
|
+
if (finished) {
|
|
160
|
+
mounted.cleanup();
|
|
161
|
+
}
|
|
162
|
+
})
|
|
163
|
+
.catch(reject);
|
|
79
164
|
});
|
|
80
165
|
}
|
|
81
166
|
// ─── long-lived app ─────────────────────────────────────────────────────────
|
|
@@ -89,41 +174,51 @@ export function leaveAlternateScreen() {
|
|
|
89
174
|
process.stdout.write(LEAVE_ALTERNATE_SCREEN);
|
|
90
175
|
}
|
|
91
176
|
/**
|
|
92
|
-
* Long-lived
|
|
177
|
+
* Long-lived OpenTUI app: mount until the tree exits, then cleanup.
|
|
93
178
|
* Prefer `startApp` when the host must remount (e.g. Git TTY handoff).
|
|
94
179
|
*/
|
|
95
180
|
export async function runApp(node, options = {}) {
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
181
|
+
const mountOptions = options.alternateScreen === undefined
|
|
182
|
+
? {}
|
|
183
|
+
: { alternateScreen: options.alternateScreen };
|
|
184
|
+
const instance = await mountTui(node, mountOptions);
|
|
99
185
|
try {
|
|
100
186
|
await instance.waitUntilExit();
|
|
101
187
|
}
|
|
102
188
|
finally {
|
|
103
|
-
|
|
104
|
-
if (options.alternateScreen)
|
|
105
|
-
leaveAlternateScreen();
|
|
189
|
+
instance.cleanup();
|
|
106
190
|
}
|
|
107
191
|
}
|
|
108
192
|
/**
|
|
109
193
|
* Start a long-lived app and return a handle for remount / wait / dispose.
|
|
110
|
-
*
|
|
194
|
+
* Uses OpenTUI alternate-screen mode when `alternateScreen` is true.
|
|
111
195
|
*/
|
|
112
|
-
export function startApp(node) {
|
|
113
|
-
|
|
196
|
+
export async function startApp(node, options = {}) {
|
|
197
|
+
const mountOptions = options.alternateScreen === undefined
|
|
198
|
+
? {}
|
|
199
|
+
: { alternateScreen: options.alternateScreen };
|
|
200
|
+
const instance = await mountTui(node, mountOptions);
|
|
201
|
+
const { ExitProvider, createElement } = await loadOpenTui();
|
|
114
202
|
return {
|
|
115
203
|
remount: (next) => {
|
|
116
|
-
|
|
117
|
-
|
|
204
|
+
const exit = (error) => {
|
|
205
|
+
instance.settle(error);
|
|
206
|
+
instance.cleanup();
|
|
207
|
+
};
|
|
208
|
+
instance.root.render(createElement(ExitProvider, { exit, children: next }));
|
|
118
209
|
},
|
|
119
210
|
waitUntilExit: async () => {
|
|
120
211
|
await instance.waitUntilExit();
|
|
121
212
|
},
|
|
122
213
|
dispose: () => {
|
|
123
|
-
|
|
214
|
+
instance.unmount();
|
|
124
215
|
},
|
|
125
216
|
};
|
|
126
217
|
}
|
|
218
|
+
/** Rebuild a disposed app (e.g. after subprocess TTY handoff). */
|
|
219
|
+
export async function restartApp(node, options = {}) {
|
|
220
|
+
return startApp(node, options);
|
|
221
|
+
}
|
|
127
222
|
// ─── overlay bootstrap (CLI confirm without a pre-mounted tree) ─────────────
|
|
128
223
|
function waitForOverlayHost(timeoutMs = 5000) {
|
|
129
224
|
return new Promise((resolve, reject) => {
|
|
@@ -148,49 +243,41 @@ function waitForOverlayHost(timeoutMs = 5000) {
|
|
|
148
243
|
* Registered for `ui/overlay` withOverlayHost — overlay never imports this module.
|
|
149
244
|
*/
|
|
150
245
|
setOverlayBootstrap(async () => {
|
|
246
|
+
const { AppShell, createElement } = await loadOpenTui();
|
|
151
247
|
let finished = false;
|
|
152
|
-
let exit;
|
|
153
248
|
let instance;
|
|
154
249
|
let rejectInterrupt;
|
|
155
250
|
const interrupted = new Promise((_resolve, reject) => {
|
|
156
251
|
rejectInterrupt = reject;
|
|
157
252
|
});
|
|
158
|
-
// Avoid unhandled rejection if dispose wins the race first.
|
|
159
253
|
void interrupted.catch(() => undefined);
|
|
160
|
-
const dispose =
|
|
161
|
-
if (finished)
|
|
162
|
-
resolve();
|
|
254
|
+
const dispose = async () => {
|
|
255
|
+
if (finished)
|
|
163
256
|
return;
|
|
164
|
-
}
|
|
165
257
|
finished = true;
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
releaseInk(instance);
|
|
173
|
-
setTimeout(resolve, 10);
|
|
174
|
-
}, (error) => {
|
|
175
|
-
releaseInk(instance);
|
|
176
|
-
reject(error);
|
|
177
|
-
});
|
|
178
|
-
});
|
|
258
|
+
if (instance) {
|
|
259
|
+
instance.settle();
|
|
260
|
+
instance.cleanup();
|
|
261
|
+
}
|
|
262
|
+
await new Promise((resolve) => setTimeout(resolve, 10));
|
|
263
|
+
};
|
|
179
264
|
const settleOverlays = () => {
|
|
180
265
|
const host = getActiveOverlayHost();
|
|
181
266
|
host?.modal.destroyAll();
|
|
182
267
|
host?.layer.destroyAll();
|
|
183
268
|
};
|
|
184
|
-
instance =
|
|
269
|
+
instance = await mountTui(createElement(AppShell, {
|
|
270
|
+
cancelOnEscape: true,
|
|
271
|
+
onCancel: () => {
|
|
185
272
|
settleOverlays();
|
|
186
273
|
void dispose();
|
|
187
|
-
},
|
|
188
|
-
|
|
274
|
+
},
|
|
275
|
+
onCtrlC: () => {
|
|
189
276
|
rejectInterrupt?.(new InterruptError());
|
|
190
277
|
void dispose();
|
|
191
|
-
},
|
|
192
|
-
|
|
193
|
-
|
|
278
|
+
},
|
|
279
|
+
children: null,
|
|
280
|
+
}));
|
|
194
281
|
const host = await waitForOverlayHost();
|
|
195
282
|
return {
|
|
196
283
|
host,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../../src/ui/shell/run.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../../src/ui/shell/run.tsx"],"names":[],"mappings":"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"}
|