iskills 0.2.32 → 0.2.40

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.
Files changed (142) hide show
  1. package/README.md +1 -0
  2. package/dist/src/commands/browser-actions.js +28 -29
  3. package/dist/src/commands/browser-actions.js.map +1 -1
  4. package/dist/src/commands/index.js +7 -3
  5. package/dist/src/commands/index.js.map +1 -1
  6. package/dist/src/commands/library.d.ts +0 -3
  7. package/dist/src/commands/library.js +30 -27
  8. package/dist/src/commands/library.js.map +1 -1
  9. package/dist/src/commands/search.js +25 -6
  10. package/dist/src/commands/search.js.map +1 -1
  11. package/dist/src/domain/core.d.ts +2 -1
  12. package/dist/src/domain/core.js +17 -3
  13. package/dist/src/domain/core.js.map +1 -1
  14. package/dist/src/domain/types.d.ts +7 -1
  15. package/dist/src/ui/browser/browser.d.ts +1 -1
  16. package/dist/src/ui/browser/browser.js +75 -139
  17. package/dist/src/ui/browser/browser.js.map +1 -1
  18. package/dist/src/ui/browser/detail.js +2 -1
  19. package/dist/src/ui/browser/detail.js.map +1 -1
  20. package/dist/src/ui/browser/footer.d.ts +6 -0
  21. package/dist/src/ui/browser/footer.js +199 -0
  22. package/dist/src/ui/browser/footer.js.map +1 -0
  23. package/dist/src/ui/browser/format.d.ts +17 -0
  24. package/dist/src/ui/browser/format.js +62 -16
  25. package/dist/src/ui/browser/format.js.map +1 -1
  26. package/dist/src/ui/browser/index.d.ts +1 -1
  27. package/dist/src/ui/browser/index.js +12 -30
  28. package/dist/src/ui/browser/index.js.map +1 -1
  29. package/dist/src/ui/browser/layout.d.ts +1 -1
  30. package/dist/src/ui/browser/layout.js +2 -2
  31. package/dist/src/ui/browser/layout.js.map +1 -1
  32. package/dist/src/ui/browser/shortcut-help.d.ts +10 -0
  33. package/dist/src/ui/browser/shortcut-help.js +124 -0
  34. package/dist/src/ui/browser/shortcut-help.js.map +1 -0
  35. package/dist/src/ui/browser/store.d.ts +22 -1
  36. package/dist/src/ui/browser/store.js +30 -5
  37. package/dist/src/ui/browser/store.js.map +1 -1
  38. package/dist/src/ui/browser/types.d.ts +7 -11
  39. package/dist/src/ui/collection-match.d.ts +7 -0
  40. package/dist/src/ui/collection-match.js +15 -0
  41. package/dist/src/ui/collection-match.js.map +1 -0
  42. package/dist/src/ui/components/colors.js +2 -1
  43. package/dist/src/ui/components/colors.js.map +1 -1
  44. package/dist/src/ui/components/confirm.js +2 -1
  45. package/dist/src/ui/components/confirm.js.map +1 -1
  46. package/dist/src/ui/components/framed-panel.d.ts +6 -2
  47. package/dist/src/ui/components/framed-panel.js +42 -19
  48. package/dist/src/ui/components/framed-panel.js.map +1 -1
  49. package/dist/src/ui/components/modal.js +2 -1
  50. package/dist/src/ui/components/modal.js.map +1 -1
  51. package/dist/src/ui/components/mouse/bounds.d.ts +13 -0
  52. package/dist/src/ui/components/mouse/bounds.js +29 -0
  53. package/dist/src/ui/components/mouse/bounds.js.map +1 -0
  54. package/dist/src/ui/components/mouse/clickable.d.ts +10 -0
  55. package/dist/src/ui/components/mouse/clickable.js +14 -0
  56. package/dist/src/ui/components/mouse/clickable.js.map +1 -0
  57. package/dist/src/ui/components/mouse/index.d.ts +4 -0
  58. package/dist/src/ui/components/mouse/index.js +5 -0
  59. package/dist/src/ui/components/mouse/index.js.map +1 -0
  60. package/dist/src/ui/components/mouse/parse.d.ts +13 -0
  61. package/dist/src/ui/components/mouse/parse.js +54 -0
  62. package/dist/src/ui/components/mouse/parse.js.map +1 -0
  63. package/dist/src/ui/components/mouse/provider.d.ts +31 -0
  64. package/dist/src/ui/components/mouse/provider.js +114 -0
  65. package/dist/src/ui/components/mouse/provider.js.map +1 -0
  66. package/dist/src/ui/components/multi-select.d.ts +2 -1
  67. package/dist/src/ui/components/multi-select.js +7 -4
  68. package/dist/src/ui/components/multi-select.js.map +1 -1
  69. package/dist/src/ui/components/select.js +2 -1
  70. package/dist/src/ui/components/select.js.map +1 -1
  71. package/dist/src/ui/components/tabs.js +8 -6
  72. package/dist/src/ui/components/tabs.js.map +1 -1
  73. package/dist/src/ui/components/tag-editor.d.ts +2 -1
  74. package/dist/src/ui/components/tag-editor.js +6 -3
  75. package/dist/src/ui/components/tag-editor.js.map +1 -1
  76. package/dist/src/ui/components/text-input.js +2 -1
  77. package/dist/src/ui/components/text-input.js.map +1 -1
  78. package/dist/src/ui/components/use-input.d.ts +12 -0
  79. package/dist/src/ui/components/use-input.js +21 -0
  80. package/dist/src/ui/components/use-input.js.map +1 -0
  81. package/dist/src/ui/footer/resolve-footer.d.ts +8 -0
  82. package/dist/src/ui/footer/resolve-footer.js +178 -0
  83. package/dist/src/ui/footer/resolve-footer.js.map +1 -0
  84. package/dist/src/ui/footer/types.d.ts +63 -0
  85. package/dist/src/ui/footer/types.js +2 -0
  86. package/dist/src/ui/footer/types.js.map +1 -0
  87. package/dist/src/ui/import/index.d.ts +1 -1
  88. package/dist/src/ui/import/index.js +1 -1
  89. package/dist/src/ui/import/review.js +6 -1
  90. package/dist/src/ui/import/review.js.map +1 -1
  91. package/dist/src/ui/import/skill-select.js +6 -17
  92. package/dist/src/ui/import/skill-select.js.map +1 -1
  93. package/dist/src/ui/install/index.d.ts +1 -1
  94. package/dist/src/ui/install/index.js +1 -1
  95. package/dist/src/ui/install/review.js +2 -1
  96. package/dist/src/ui/install/review.js.map +1 -1
  97. package/dist/src/ui/overlay/bridge.d.ts +6 -1
  98. package/dist/src/ui/overlay/bridge.js +2 -2
  99. package/dist/src/ui/overlay/bridge.js.map +1 -1
  100. package/dist/src/ui/overlay/dialogs.js +2 -1
  101. package/dist/src/ui/overlay/dialogs.js.map +1 -1
  102. package/dist/src/ui/overlay/host.d.ts +10 -4
  103. package/dist/src/ui/overlay/host.js +86 -26
  104. package/dist/src/ui/overlay/host.js.map +1 -1
  105. package/dist/src/ui/overlay/index.d.ts +6 -3
  106. package/dist/src/ui/overlay/index.js +6 -3
  107. package/dist/src/ui/overlay/index.js.map +1 -1
  108. package/dist/src/ui/overlay/slot.d.ts +2 -0
  109. package/dist/src/ui/overlay/slot.js.map +1 -1
  110. package/dist/src/ui/overlay/static.d.ts +13 -0
  111. package/dist/src/ui/overlay/static.js +34 -0
  112. package/dist/src/ui/overlay/static.js.map +1 -0
  113. package/dist/src/ui/overlay/types.d.ts +16 -0
  114. package/dist/src/ui/prompts/index.d.ts +5 -14
  115. package/dist/src/ui/prompts/index.js +3 -40
  116. package/dist/src/ui/prompts/index.js.map +1 -1
  117. package/dist/src/ui/prompts/present.d.ts +29 -0
  118. package/dist/src/ui/prompts/present.js +71 -0
  119. package/dist/src/ui/prompts/present.js.map +1 -0
  120. package/dist/src/ui/search/index.d.ts +1 -0
  121. package/dist/src/ui/search/index.js +14 -7
  122. package/dist/src/ui/search/index.js.map +1 -1
  123. package/dist/src/ui/search/types.d.ts +3 -2
  124. package/dist/src/ui/shell/app-shell.d.ts +6 -3
  125. package/dist/src/ui/shell/app-shell.js +20 -15
  126. package/dist/src/ui/shell/app-shell.js.map +1 -1
  127. package/dist/src/ui/shell/footer.d.ts +7 -0
  128. package/dist/src/ui/shell/footer.js +38 -0
  129. package/dist/src/ui/shell/footer.js.map +1 -0
  130. package/dist/src/ui/shell/run.js +19 -7
  131. package/dist/src/ui/shell/run.js.map +1 -1
  132. package/package.json +1 -1
  133. package/THIRD_PARTY_NOTICES.md +0 -30
  134. package/dist/src/background-sync.d.ts +0 -1
  135. package/dist/src/background-sync.js +0 -3
  136. package/dist/src/background-sync.js.map +0 -1
  137. package/dist/src/ui/overlay/confirm.d.ts +0 -5
  138. package/dist/src/ui/overlay/confirm.js +0 -13
  139. package/dist/src/ui/overlay/confirm.js.map +0 -1
  140. package/dist/src/ui/prompts/port.d.ts +0 -17
  141. package/dist/src/ui/prompts/port.js +0 -2
  142. package/dist/src/ui/prompts/port.js.map +0 -1
@@ -1,6 +1,6 @@
1
1
  import { parseArgs } from 'node:util';
2
- import { assertSkillName, errorMessage, listCollection, sanitizeTerminal } from '../domain/core.js';
3
- import { confirm } from '../ui/prompts/index.js';
2
+ import { assertSkillName, errorMessage, listCollection, normalizeGitRepositoryIdentity, sanitizeTerminal, } from '../domain/core.js';
3
+ import { Modal } from '../ui/overlay/static.js';
4
4
  import { searchRemoteSkill } from '../ui/search/index.js';
5
5
  import { importRemoteSkillToCollection } from './library.js';
6
6
  const GITHUB_SOURCE = /^[A-Za-z0-9](?:[A-Za-z0-9-]{0,37}[A-Za-z0-9])?\/(?!\.{1,2}$)[A-Za-z0-9_.-]{1,100}$/;
@@ -10,6 +10,23 @@ function formatIdentity(skill) {
10
10
  const path = source.path && source.path !== '.' ? `/${source.path}` : '';
11
11
  return sanitizeTerminal(`${base.replace(/\/$/, '')}${path}`);
12
12
  }
13
+ /**
14
+ * The in-repository source path is only known after cloning, so a matching
15
+ * repository cannot prove same origin yet; only a different repository is
16
+ * conclusive before the clone.
17
+ */
18
+ function collectionMatch(collection, skill) {
19
+ const collected = collection.find((item) => item.name.toLowerCase() === skill.name.toLowerCase());
20
+ if (!collected)
21
+ return undefined;
22
+ const collectedRepository = collected.source.type === 'git' && collected.source.url
23
+ ? normalizeGitRepositoryIdentity(collected.source.url)
24
+ : undefined;
25
+ const incomingRepository = normalizeGitRepositoryIdentity(`https://github.com/${skill.source}`);
26
+ return collectedRepository && collectedRepository !== incomingRepository
27
+ ? 'conflicting-source'
28
+ : 'unverified-source';
29
+ }
13
30
  function printImportResult(result) {
14
31
  if (result.status === 'imported')
15
32
  console.log(`已收藏 ${result.name}。`);
@@ -71,10 +88,9 @@ export async function commandSearch(argv) {
71
88
  throw new Error('独立搜索 TUI 需要 stdin 和 stdout TTY;当前终端不支持。');
72
89
  }
73
90
  const collection = await listCollection();
74
- const collectedNames = new Set(collection.map((skill) => skill.name.toLowerCase()));
75
91
  const selected = await searchRemoteSkill({
76
92
  initialQuery: positionals.join(' ').trim(),
77
- collectedNames,
93
+ matchCollection: (skill) => collectionMatch(collection, skill),
78
94
  search: searchSkills,
79
95
  });
80
96
  if (!selected)
@@ -84,14 +100,17 @@ export async function commandSearch(argv) {
84
100
  try {
85
101
  const result = await importRemoteSkillToCollection(selected.source, selected.name, {
86
102
  replace: values.replace ?? false,
87
- confirmReplace: (current, incoming) => confirm(`替换 ${selected.name}:${formatIdentity(current)} → ${formatIdentity(incoming)}?`),
103
+ confirmReplace: (current, incoming) => Modal.confirm({
104
+ title: '确认',
105
+ message: `替换 ${selected.name}:${formatIdentity(current)} → ${formatIdentity(incoming)}?`,
106
+ }),
88
107
  });
89
108
  printImportResult(result);
90
109
  return;
91
110
  }
92
111
  catch (error) {
93
112
  console.error(`收藏失败:${errorMessage(error)}`);
94
- if (!(await confirm('重试收藏吗?'))) {
113
+ if (!(await Modal.confirm({ title: '确认', message: '重试收藏吗?' }))) {
95
114
  process.exitCode = 1;
96
115
  return;
97
116
  }
@@ -1 +1 @@
1
- {"version":3,"file":"search.js","sourceRoot":"","sources":["../../../src/commands/search.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"search.js","sourceRoot":"","sources":["../../../src/commands/search.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import type { AgentConfig, CollectedSkill, CollectionPaths, CollectionState, ParsedGitSource, Skill, SkillMetadata, SkillSource } from './types.js';
1
+ import type { AgentConfig, CollectedSkill, CollectionMatch, CollectionPaths, CollectionState, ParsedGitSource, Skill, SkillMetadata, SkillSource } from './types.js';
2
2
  export declare const PROJECT_SKILL_DIRS: readonly ['.agents/skills', '.claude/skills', '.codex/skills', '.cursor/skills', '.opencode/skills'];
3
3
  export declare const AGENTS: Record<string, AgentConfig>;
4
4
  export declare function collectionPaths(): CollectionPaths;
@@ -12,6 +12,7 @@ export declare function sourceSkillFile(path: string): string;
12
12
  export declare function sanitizeTerminal(value: string): string;
13
13
  export declare function normalizeGitRepositoryIdentity(value: string): string;
14
14
  export declare function sameGitIdentity(current: SkillMetadata, incoming: SkillMetadata): boolean;
15
+ export declare function classifyCollectionMatch(current: SkillMetadata, incoming: SkillMetadata): CollectionMatch;
15
16
  export declare function readSkill(path: string): Promise<Skill>;
16
17
  export declare function validateSkillTree(root: string, current?: string): Promise<void>;
17
18
  export declare function discoverSkills(root: string, depth?: number, maxDepth?: number): Promise<Skill[]>;
@@ -2,7 +2,6 @@ import { execFileSync, spawn } from 'node:child_process';
2
2
  import { access, appendFile, cp, lstat, mkdir, readFile, readdir, readlink, realpath, rename, rm, writeFile, } from 'node:fs/promises';
3
3
  import { homedir } from 'node:os';
4
4
  import { basename, dirname, join, resolve, sep } from 'node:path';
5
- import { fileURLToPath } from 'node:url';
6
5
  const SKIP_DIRS = new Set(['.git', 'node_modules', 'dist', 'build', '__pycache__']);
7
6
  export const PROJECT_SKILL_DIRS = [
8
7
  '.agents/skills',
@@ -124,6 +123,15 @@ export function sameGitIdentity(current, incoming) {
124
123
  normalizeGitRepositoryIdentity(incoming.source.url) &&
125
124
  (current.source.path || '.') === (incoming.source.path || '.');
126
125
  }
126
+ export function classifyCollectionMatch(current, incoming) {
127
+ if (sameGitIdentity(current, incoming))
128
+ return 'same-source';
129
+ const comparable = current.source.type === 'git' &&
130
+ incoming.source.type === 'git' &&
131
+ !!current.source.url &&
132
+ !!incoming.source.url;
133
+ return comparable ? 'conflicting-source' : 'unverified-source';
134
+ }
127
135
  function parseScalar(value) {
128
136
  const trimmed = value.trim();
129
137
  if ((trimmed.startsWith('"') && trimmed.endsWith('"')) ||
@@ -382,11 +390,17 @@ export async function isExactSymlink(path, target) {
382
390
  return false;
383
391
  }
384
392
  }
393
+ /** Detached child: push/pull collection after commit without blocking the CLI. */
385
394
  function startBackgroundSync() {
386
395
  if (process.env.SK_NO_BACKGROUND_SYNC === '1' || process.env.SK_SYNC_CHILD === '1')
387
396
  return;
388
- const entry = fileURLToPath(new URL('../background-sync.js', import.meta.url));
389
- const child = spawn(process.execPath, [entry], {
397
+ // Spawn Node once with domain/git — no dedicated entry wrapper file.
398
+ const gitHref = new URL('./git.js', import.meta.url).href;
399
+ const child = spawn(process.execPath, [
400
+ '--input-type=module',
401
+ '-e',
402
+ `import(${JSON.stringify(gitHref)}).then((m) => m.backgroundCollectionSync())`,
403
+ ], {
390
404
  detached: true,
391
405
  stdio: 'ignore',
392
406
  env: { ...process.env, SK_SYNC_CHILD: '1' },
@@ -1 +1 @@
1
- {"version":3,"file":"core.js","sourceRoot":"","sources":["../../../src/domain/core.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"core.js","sourceRoot":"","sources":["../../../src/domain/core.ts"],"names":[],"mappings":"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"}
@@ -16,6 +16,12 @@ export interface GitSource extends SkillSource {
16
16
  refType: RefType;
17
17
  path: string;
18
18
  }
19
+ /**
20
+ * How a candidate Skill relates to a collected Skill of the same name.
21
+ * `unverified-source` is not a weaker conflict: it means provenance cannot
22
+ * prove sameness either way, so it must not be presented as a known difference.
23
+ */
24
+ export type CollectionMatch = 'same-source' | 'conflicting-source' | 'unverified-source';
19
25
  export interface Skill {
20
26
  name: string;
21
27
  description: string;
@@ -25,7 +31,7 @@ export interface Skill {
25
31
  note?: string;
26
32
  source?: SkillSource;
27
33
  fromCollection?: boolean;
28
- collectionStatus?: 'same-source' | 'same-name';
34
+ collectionStatus?: CollectionMatch;
29
35
  }
30
36
  export interface RemoteSkill {
31
37
  resultId: string;
@@ -7,5 +7,5 @@ interface BrowserProps extends BrowserViewInput {
7
7
  * (BrowserApp store). Does not create a nested store.
8
8
  * Overlays (? / more-actions) go through {@link useModal}.
9
9
  */
10
- export declare function Browser({ projectGroups, collection, globalGroups, canSync, status, transientStatus, checkUpdates, updatingSkillName, updatingProgress, workingAction, finish, }: BrowserProps): import("react").JSX.Element;
10
+ export declare function Browser({ projectGroups, collection, globalGroups, canSync, checkUpdates, updatingSkillName, finish, }: BrowserProps): import("react").JSX.Element;
11
11
  export {};
@@ -1,14 +1,16 @@
1
1
  import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
2
- import { Box, Text, useInput, useStdout } from 'ink';
3
- import { useAtom, useAtomValue } from 'jotai';
2
+ import { Box, Text, useStdout } from 'ink';
3
+ import { useInput } from '../components/use-input.js';
4
+ import { useAtom, useAtomValue, useStore } from 'jotai';
4
5
  import { useEffect, useMemo, useRef, useState } from 'react';
5
- import { browserNavigationAtom, browserSelectionAtom, } from './store.js';
6
+ import { browserFilterAtom, browserGroupJumpAtom, browserNavigationAtom, browserSelectionAtom, browserUpdateCheckAtom, } from './store.js';
6
7
  import { browserFrameDimensions, masterDetailLayout, masterDetailSeparator, masterDetailViewportHeight, masterDetailWidths, } from './layout.js';
7
- import { TAG_FILTER_ALL, browseDetailRows, collectionCategoryLines, collectionListColumnLines, flatRows, focusAfterDownFromAgents, focusAfterDownFromTabs, focusAfterUpFromList, focusAfterUpFromTags, groupedRows, listSkillSummary, moreActionModalContent, nextAgent, nextMainTab, selectableSkills, shortcutModalContent, skillsForTagFilter, tagFilterOptions, visibleAgentGroups, } from './format.js';
8
+ import { TAG_FILTER_ALL, browseDetailRows, collectionCategoryLines, collectionListColumnLines, flatRows, focusAfterDownFromAgents, focusAfterDownFromTabs, focusAfterUpFromList, focusAfterUpFromTags, groupedRows, listSkillSummary, moreActionModalContent, nextAgent, nextMainTab, selectableSkills, skillsForTagFilter, tagFilterOptions, visibleAgentGroups, } from './format.js';
8
9
  import { useModal, useOverlayBusy } from '../overlay/host.js';
9
10
  import { FramedPanel } from '../components/framed-panel.js';
10
- import { Select, Tabs, TextInput, termcnColors, } from '../components/termcn.js';
11
+ import { Select, Tabs, termcnColors, } from '../components/termcn.js';
11
12
  import { padColumns, sliceColumns } from '../components/terminal-layout.js';
13
+ import { ShortcutHelpPanel } from './shortcut-help.js';
12
14
  /** Framed more-actions panel for absolute modal overlay (list shows through). */
13
15
  function MoreActionsPanel({ scope, onConfirm, onCancel, }) {
14
16
  return (_jsx(FramedPanel, { title: " \u66F4\u591A\u64CD\u4F5C ", content: [...moreActionModalContent(scope), 'Enter 执行 · Esc 返回'], width: 64, muteLastContent: true, onEscape: onCancel, onKey: (input, key) => {
@@ -16,19 +18,6 @@ function MoreActionsPanel({ scope, onConfirm, onCancel, }) {
16
18
  onConfirm();
17
19
  } }));
18
20
  }
19
- const spinnerFrames = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
20
- function useSpinner(active) {
21
- const [index, setIndex] = useState(0);
22
- useEffect(() => {
23
- if (!active)
24
- return undefined;
25
- const timer = setInterval(() => {
26
- setIndex((value) => (value + 1) % spinnerFrames.length);
27
- }, 80);
28
- return () => clearInterval(timer);
29
- }, [active]);
30
- return spinnerFrames[index] ?? '⠋';
31
- }
32
21
  function masterDetailBlankRow(tagWidth, listWidth, peekWidth) {
33
22
  const divider = '│';
34
23
  return (_jsxs(Box, { flexDirection: "row", children: [_jsxs(Box, { width: tagWidth + 1, flexDirection: "row", children: [_jsx(Text, { wrap: "truncate-end", children: padColumns('', tagWidth) }), _jsx(Text, { color: termcnColors.border, children: divider })] }), _jsxs(Box, { width: listWidth + 1, flexDirection: "row", children: [_jsx(Text, { wrap: "truncate-end", children: padColumns('', listWidth) }), _jsx(Text, { color: termcnColors.border, children: divider })] }), _jsx(Box, { width: peekWidth, children: _jsx(Text, { wrap: "truncate-end", children: padColumns('', peekWidth) }) })] }));
@@ -105,9 +94,10 @@ function MasterDetailBody({ tagLines, listLines, peekLines, tagWidth, listWidth,
105
94
  * (BrowserApp store). Does not create a nested store.
106
95
  * Overlays (? / more-actions) go through {@link useModal}.
107
96
  */
108
- export function Browser({ projectGroups, collection, globalGroups, canSync, status, transientStatus, checkUpdates, updatingSkillName, updatingProgress, workingAction = '更新', finish, }) {
97
+ export function Browser({ projectGroups, collection, globalGroups, canSync, checkUpdates, updatingSkillName, finish, }) {
109
98
  const modal = useModal();
110
99
  const shellBusy = useOverlayBusy();
100
+ const store = useStore();
111
101
  const [navigation, setNavigationState] = useAtom(browserNavigationAtom);
112
102
  const [selected, setSelected] = useAtom(browserSelectionAtom);
113
103
  const navigationRef = useRef(navigation);
@@ -125,7 +115,6 @@ export function Browser({ projectGroups, collection, globalGroups, canSync, stat
125
115
  const cursor = navigation?.cursor ?? 0;
126
116
  const agent = navigation?.agent ?? '';
127
117
  const focus = navigation?.focus ?? 'tabs';
128
- const [visibleStatus, setVisibleStatus] = useState(status);
129
118
  const visibleProjectGroups = useMemo(() => visibleAgentGroups(projectGroups), [projectGroups]);
130
119
  const visibleGlobalGroups = useMemo(() => visibleAgentGroups(globalGroups), [globalGroups]);
131
120
  const activeProjectAgent = visibleProjectGroups.some((group) => group.agent === agent)
@@ -169,19 +158,10 @@ export function Browser({ projectGroups, collection, globalGroups, canSync, stat
169
158
  return { ...current, cursor: nextCursor };
170
159
  });
171
160
  };
172
- const [searching, setSearching] = useState(false);
173
- const [choosingGroup, setChoosingGroup] = useState(false);
174
- const [queryBeforeSearch, setQueryBeforeSearch] = useState(query);
175
- const [cursorBeforeSearch, setCursorBeforeSearch] = useState(0);
176
- const [updateCheck, setUpdateCheck] = useState({ checking: false, updates: new Set(), failed: 0 });
177
- const updateSpinner = useSpinner(Boolean(updatingSkillName));
178
- useEffect(() => {
179
- setVisibleStatus(status);
180
- if (!status || !transientStatus)
181
- return undefined;
182
- const timer = setTimeout(() => setVisibleStatus(''), 3500);
183
- return () => clearTimeout(timer);
184
- }, [status, transientStatus]);
161
+ const [filter, setFilter] = useAtom(browserFilterAtom);
162
+ const [choosingGroup, setChoosingGroup] = useAtom(browserGroupJumpAtom);
163
+ const [updateCheck, setUpdateCheck] = useAtom(browserUpdateCheckAtom);
164
+ const searching = filter.open;
185
165
  const selectedCollection = collection.filter((skill) => selected.has(skill.path));
186
166
  const selectedUpdates = selectedCollection.filter((skill) => updateCheck.updates.has(skill.name));
187
167
  const selectedProject = project.filter((skill) => selected.has(skill.path));
@@ -206,6 +186,8 @@ export function Browser({ projectGroups, collection, globalGroups, canSync, stat
206
186
  const tagOptions = useMemo(() => tagFilterOptions(tabSkills, groups), [groups, tabSkills]);
207
187
  const [tagFilter, setTagFilter] = useState(TAG_FILTER_ALL);
208
188
  const [tagCursor, setTagCursor] = useState(0);
189
+ const tagCursorRef = useRef(tagCursor);
190
+ tagCursorRef.current = tagCursor;
209
191
  const masterDetailSkills = useMemo(() => skillsForTagFilter(tabSkills, tagFilter), [tabSkills, tagFilter]);
210
192
  const masterDetailRows = useMemo(() => flatRows(masterDetailSkills, query), [masterDetailSkills, query]);
211
193
  const listRows = useMasterDetail ? masterDetailRows : rows;
@@ -244,26 +226,32 @@ export function Browser({ projectGroups, collection, globalGroups, canSync, stat
244
226
  if (focus === 'agents' && !hasAgentTabs)
245
227
  setFocus(useMasterDetail ? 'tags' : 'list');
246
228
  }, [focus, hasAgentTabs, useMasterDetail]);
247
- const checkedUpdates = useRef(false);
248
229
  useEffect(() => {
249
- if (tab !== 'collection' || checkedUpdates.current)
230
+ if (tab !== 'collection')
250
231
  return;
251
- checkedUpdates.current = true;
252
232
  let active = true;
253
- setUpdateCheck((current) => ({ ...current, checking: true }));
233
+ setUpdateCheck((current) => ({
234
+ ...current,
235
+ checking: true,
236
+ }));
254
237
  void checkUpdates(collection)
255
238
  .then(({ updates, failed }) => {
256
239
  if (active)
257
240
  setUpdateCheck({ checking: false, updates, failed });
258
241
  })
259
242
  .catch(() => {
260
- if (active)
261
- setUpdateCheck({ checking: false, updates: new Set(), failed: collection.length });
243
+ if (active) {
244
+ setUpdateCheck({
245
+ checking: false,
246
+ updates: new Set(),
247
+ failed: collection.length,
248
+ });
249
+ }
262
250
  });
263
251
  return () => {
264
252
  active = false;
265
253
  };
266
- }, [checkUpdates, collection, tab]);
254
+ }, [checkUpdates, collection, tab, setUpdateCheck]);
267
255
  const frame = browserFrameDimensions({
268
256
  rows: stdout.rows,
269
257
  columns: stdout.columns,
@@ -294,11 +282,6 @@ export function Browser({ projectGroups, collection, globalGroups, canSync, stat
294
282
  const masterListOffset = useMasterDetail
295
283
  ? Math.max(0, Math.min(cursor - Math.floor(masterListVisibleHeight / 2), Math.max(0, listRows.length - masterListVisibleHeight)))
296
284
  : 0;
297
- const listScrollHint = useBrowseHome && listRows.length
298
- ? `${cursor + 1}/${listRows.length}`
299
- : useMasterDetail && listRows.length > masterListVisibleHeight
300
- ? `${masterListOffset + 1}–${Math.min(masterListOffset + masterListVisibleHeight, listRows.length)} / ${listRows.length}`
301
- : '';
302
285
  const peekSkill = focus === 'list' && currentRow?.type === 'skill' ? currentRow.skill : undefined;
303
286
  useEffect(() => {
304
287
  if (focus === 'tags' && !useMasterDetail)
@@ -309,19 +292,26 @@ export function Browser({ projectGroups, collection, globalGroups, canSync, stat
309
292
  const liveFocus = live?.focus ?? 'tabs';
310
293
  const liveTab = live?.tab ?? 'project';
311
294
  if (input === '?') {
312
- void modal.info({
313
- title: ' 完整快捷键 ',
314
- content: shortcutModalContent(),
315
- width: 76,
295
+ void modal.open({
296
+ footerItems: [
297
+ { key: '↑↓', label: '移动' },
298
+ { key: 'e', label: '展开' },
299
+ { key: 'Esc', label: '关闭' },
300
+ ],
301
+ content: (close) => (_jsx(ShortcutHelpPanel, { onClose: () => close(undefined), maxBodyRows: 14 })),
316
302
  });
317
303
  return;
318
304
  }
319
305
  if (key.escape || input === 'q')
320
306
  return finish({ type: 'quit' });
321
307
  if (input === '/') {
322
- setQueryBeforeSearch(query);
323
- setCursorBeforeSearch(cursorRef.current);
324
- return setSearching(true);
308
+ setFilter({
309
+ open: true,
310
+ draft: query,
311
+ queryBefore: query,
312
+ cursorBefore: cursorRef.current,
313
+ });
314
+ return;
325
315
  }
326
316
  if (input === 'g' && groups.length) {
327
317
  return setChoosingGroup(true);
@@ -396,28 +386,30 @@ export function Browser({ projectGroups, collection, globalGroups, canSync, stat
396
386
  if (!option)
397
387
  return;
398
388
  setTagFilter(option.key);
389
+ tagCursorRef.current = index;
399
390
  setTagCursor(index);
400
391
  setCursor(0);
401
392
  };
393
+ const liveTagCursor = tagCursorRef.current;
402
394
  if (key.upArrow) {
403
- if (tagCursor === 0)
395
+ if (liveTagCursor === 0)
404
396
  return setFocus(focusAfterUpFromTags(hasAgentTabs));
405
- selectTag(tagCursor - 1);
397
+ selectTag(liveTagCursor - 1);
406
398
  return;
407
399
  }
408
400
  if (key.downArrow) {
409
- if (tagCursor >= tagOptions.length - 1)
401
+ if (liveTagCursor >= tagOptions.length - 1)
410
402
  return setFocus('list');
411
- selectTag(tagCursor + 1);
403
+ selectTag(liveTagCursor + 1);
412
404
  return;
413
405
  }
414
406
  if (key.leftArrow)
415
407
  return setFocus(focusAfterUpFromTags(hasAgentTabs));
416
408
  if (key.rightArrow) {
417
- selectTag(tagCursor);
409
+ selectTag(liveTagCursor);
418
410
  return setFocus('list');
419
411
  }
420
- const tagOption = tagOptions[tagCursor];
412
+ const tagOption = tagOptions[liveTagCursor];
421
413
  if (input === ' ' && tagOption) {
422
414
  const paths = tagOption.skills.map((skill) => skill.path);
423
415
  return setSelected((previous) => {
@@ -429,7 +421,7 @@ export function Browser({ projectGroups, collection, globalGroups, canSync, stat
429
421
  });
430
422
  }
431
423
  if (key.return || input.includes('\r') || input.includes('\n')) {
432
- selectTag(tagCursor);
424
+ selectTag(liveTagCursor);
433
425
  return setFocus('list');
434
426
  }
435
427
  return;
@@ -444,6 +436,10 @@ export function Browser({ projectGroups, collection, globalGroups, canSync, stat
444
436
  : `技能:${skills[0]?.name ?? ''}`;
445
437
  void modal
446
438
  .open({
439
+ footerItems: [
440
+ { key: 'Enter', label: '确认' },
441
+ { key: 'Esc', label: '取消' },
442
+ ],
447
443
  content: (close) => (_jsx(MoreActionsPanel, { scope: scope, onConfirm: () => close(true), onCancel: () => close(false) })),
448
444
  })
449
445
  .then((confirmed) => {
@@ -575,6 +571,25 @@ export function Browser({ projectGroups, collection, globalGroups, canSync, stat
575
571
  setChoosingGroup(false);
576
572
  }
577
573
  }, { isActive: !shellBusy && choosingGroup });
574
+ // Backup filter cancel: TextInput also handles Esc; this covers focus edge cases.
575
+ useInput((_input, key) => {
576
+ if (!key.escape)
577
+ return;
578
+ const prior = store.get(browserFilterAtom);
579
+ setFilter({
580
+ open: false,
581
+ draft: '',
582
+ queryBefore: '',
583
+ cursorBefore: 0,
584
+ });
585
+ setNavigation((current) => current
586
+ ? {
587
+ ...current,
588
+ query: prior.queryBefore,
589
+ cursor: prior.cursorBefore,
590
+ }
591
+ : current);
592
+ }, { isActive: !shellBusy && searching });
578
593
  const renderBrowsePane = (paneRows, viewportHeight, options = {}) => {
579
594
  if (useBrowseHome) {
580
595
  const { tagWidth, listWidth, peekWidth } = masterDetailColumns;
@@ -637,85 +652,6 @@ export function Browser({ projectGroups, collection, globalGroups, canSync, stat
637
652
  setChoosingGroup(false);
638
653
  } }));
639
654
  }
640
- const canViewWithRightArrow = currentRow?.type === 'skill' && (tab === 'collection' || currentRow.skill.fromCollection);
641
- const canViewWithEnter = currentRow?.type === 'skill' && tab !== 'collection' && !canViewWithRightArrow;
642
- const canDelete = (tab === 'collection' && selectedCollection.length > 0) ||
643
- (tab === 'project' && selectedProject.length > 0) ||
644
- (tab === 'global' && selectedGlobal.length > 0) ||
645
- currentRow?.type === 'skill';
646
- const actions = updatingSkillName ? [] : [
647
- canOpenActions ? 'm 更多操作' : '',
648
- tab === 'project' && selectedProjectLocal.length ? 'i 加入收藏夹' : '',
649
- tab === 'global' && selectedGlobalLocal.length ? 'i 加入收藏夹' : '',
650
- tab === 'collection' && selectedCollection.length ? 'Enter 添加 · t 批量加标签' : '',
651
- tab === 'collection' && !updatingSkillName && selectedCollection.length && selectedUpdates.length
652
- ? `u 更新可更新的已选技能 (${selectedUpdates.length})`
653
- : tab === 'collection' && !updatingSkillName && !selectedCollection.length
654
- && currentRow?.type === 'skill' && updateCheck.updates.has(currentRow.skill.name)
655
- ? 'u 更新当前技能'
656
- : '',
657
- ].filter(Boolean);
658
- const activity = [
659
- updatingSkillName
660
- ? `${updateSpinner} 正在${workingAction}${updatingProgress &&
661
- (workingAction === '转换' || updatingProgress.total > 1)
662
- ? ` ${updatingProgress.current}/${updatingProgress.total}`
663
- : ''}:${updatingSkillName}`
664
- : '',
665
- updateCheck.checking ? '正在检查更新…' : '',
666
- !updateCheck.checking && updateCheck.failed ? `${updateCheck.failed} 个技能检查失败` : '',
667
- visibleStatus,
668
- query ? `搜索:${query}` : '',
669
- ].filter(Boolean);
670
- const navigationHint = updatingSkillName
671
- ? `正在${workingAction} · 请稍候`
672
- : focus === 'tabs'
673
- ? `←/→ 切换 Tab · ↓ 进入 · / 筛选 · ?`
674
- : focus === 'agents'
675
- ? `←/→ 切换 Agent · ↑ 返回 · ↓ 进入 · / 筛选 · ?`
676
- : focus === 'tags'
677
- ? useBrowseHome
678
- ? `↑/↓ 标签 · Space 选中此标签 · → 列表 · / 搜索 · ?`
679
- : `↑/↓ 标签 · Space 选中此标签 · → 列表 · / 筛选 · ?`
680
- : useBrowseHome && focus === 'list'
681
- ? tab === 'collection' && selectedCollection.length
682
- ? `↑↓ 移动 · Enter 添加 · Space 选中 · d 删除 · / 搜索 · ?`
683
- : `↑↓ 移动 · Enter 详情 · Space 选中 · d 删除 · / 搜索 · ?`
684
- : useMasterDetail && canViewWithRightArrow
685
- ? `← 标签 · Space 选中 · → 全屏详情 · d 删除 · / 筛选 · ?`
686
- : useMasterDetail && canViewWithEnter
687
- ? `← 标签 · Space 选中 · Enter 查看 · d 删除 · / 筛选 · ?`
688
- : useMasterDetail
689
- ? `← 标签 · Space 选中 · d 删除 · / 筛选 · ?`
690
- : currentRow?.type === 'group'
691
- ? `↑/↓ 移动 · Space 选中组 · / 筛选 · ?`
692
- : canViewWithRightArrow
693
- ? `↑/↓ 移动 · Space 选中 · → 查看 · d 删除 · / 筛选 · ?`
694
- : canViewWithEnter
695
- ? `↑/↓ 移动 · Space 选中 · Enter 查看 · d 删除 · / 筛选 · ?`
696
- : canDelete
697
- ? `↑/↓ 移动 · Space 选中 · d 删除 · / 筛选 · ?`
698
- : focus === 'list'
699
- ? `↑/↓ 移动 · Space 选中 · / 筛选 · ?`
700
- : `/ 筛选 · ?`;
701
- const footerBody = [
702
- listScrollHint,
703
- navigationHint,
704
- selected.size ? `已选 ${selected.size}` : '',
705
- ...actions,
706
- ].filter(Boolean).join(' · ');
707
- const footerHint = footerBody ? `${footerBody} · q 退出` : 'q 退出';
708
- const statusHint = activity.filter(Boolean).join(' · ');
709
- return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Tabs, { tabs: tabs, activeTab: tab, onTabChange: (key) => setTab(key), isActive: !shellBusy && !searching && focus === 'tabs', enableArrowNav: false, focused: !shellBusy && !searching && focus === 'tabs', width: frame.frameWidth, bordered: false, chip: useBrowseHome, trailing: useMasterDetail && !searching ? (_jsx(Text, { color: termcnColors.muted, children: "/ \u641C\u7D22\u6280\u80FD\u2026" })) : undefined }), searching ? (_jsx(TextInput, { label: "\u641C\u7D22\u6280\u80FD\uFF08Enter \u786E\u8BA4\uFF0CEsc \u53D6\u6D88\uFF09", initialValue: query, onChange: (value) => {
710
- setQuery(value);
711
- setCursor(0);
712
- }, onCancel: () => {
713
- setQuery(queryBeforeSearch);
714
- setCursor(cursorBeforeSearch);
715
- setSearching(false);
716
- }, onSubmit: (value) => {
717
- setQuery(value);
718
- setSearching(false);
719
- } })) : (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: termcnColors.muted, wrap: "truncate-end", children: footerHint }), statusHint ? (_jsx(Text, { color: updateCheck.failed ? termcnColors.error : termcnColors.muted, wrap: "truncate-end", children: statusHint })) : null] }))] }));
655
+ return (_jsx(Box, { flexDirection: "column", children: _jsx(Tabs, { tabs: tabs, activeTab: tab, onTabChange: (key) => setTab(key), isActive: !shellBusy && !searching && focus === 'tabs', enableArrowNav: false, focused: !shellBusy && !searching && focus === 'tabs', width: frame.frameWidth, bordered: false, chip: useBrowseHome, trailing: useMasterDetail && !searching ? (_jsx(Text, { color: termcnColors.muted, children: "/ \u641C\u7D22\u6280\u80FD\u2026" })) : undefined }) }));
720
656
  }
721
657
  //# sourceMappingURL=browser.js.map