agentsx 0.1.2 → 0.1.4
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 +1 -1
- package/REQUIREMENTS.md +2 -0
- package/dist/core/run-sync-command.js +23 -11
- package/dist/core/run-sync-command.js.map +1 -1
- package/dist/core/target-selectors.d.ts +5 -1
- package/dist/core/target-selectors.js +35 -35
- package/dist/core/target-selectors.js.map +1 -1
- package/dist/index.js +1 -1
- package/dist/ui/prompts.js +5 -2
- package/dist/ui/prompts.js.map +1 -1
- package/dist/ui/structured-tree.d.ts +13 -2
- package/dist/ui/structured-tree.js +298 -57
- package/dist/ui/structured-tree.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -22,7 +22,7 @@ npx agentsx sync <agent> [targets...] [--conflict fail-all|overwrite|partial] [-
|
|
|
22
22
|
- 선택 단위는 파일 자체가 아니라 에이전트별 **설정 항목(예: skills, plugins, mcp, instructions)** 입니다.
|
|
23
23
|
- v1 동기화 범위는 사용자 전역 설정(`home`)이며, 프로젝트 로컬 설정은 제외됩니다.
|
|
24
24
|
- CLI 세부 선택: `--jsonpath targetId=$.path`를 반복해 JSONPath 단위 부분 동기화 가능
|
|
25
|
-
- TUI 세부 선택:
|
|
25
|
+
- TUI 세부 선택: 파일+JSON 트리 결합 뷰에서 `←/→` 펼침/접기, `↑/↓` 이동, `Space` 선택(하위 포함), `Enter` 확정
|
|
26
26
|
- JSONPath를 선택한 구조화 설정은 충돌도 JSONPath 단위로 판정되며, TUI에서 `파일#jsonpath` 형태로 표시됩니다.
|
|
27
27
|
- 선택/충돌 결정은 `~/.agentsx/state.json`에 저장되어 재사용됩니다.
|
|
28
28
|
- 원격 기본 브랜치가 비어 있으면 첫 `push/pull/sync` 실행 시 자동 초기화됩니다.
|
package/REQUIREMENTS.md
CHANGED
|
@@ -96,6 +96,8 @@ v1에서는 사용자 전역 설정(`home` 범위)만 동기화 대상으로 취
|
|
|
96
96
|
- CLI 모드(`[targets...]` 지정): 정책을 옵션으로 선택 가능
|
|
97
97
|
- TUI 모드(`[targets...]` 미지정): 충돌 항목별 선택 UI 제공 (JSONPath 선택이 있을 경우 `파일#jsonpath` 형태로 표시)
|
|
98
98
|
|
|
99
|
+
구조화 설정 탐색 TUI는 아래 키 동작을 지원해야 한다.\n- `←/→`: 트리 접기/펼치기\n- `↑/↓`: 포커스 이동\n- `Space`: 현재 노드와 하위 노드 일괄 선택/해제\n- `Enter`: 파일+JSON 트리 선택 확정\n- 열린 하위 노드의 상/하단에서 `↑/↓`를 누르면 상위/다음 항목으로 자연스럽게 이어서 이동
|
|
100
|
+
|
|
99
101
|
### 5.3 충돌 선택값 저장
|
|
100
102
|
- 사용자의 충돌 선택은 `~/.agentsx` 상태 파일에 저장한다.
|
|
101
103
|
- 동일한 조건(명령/에이전트/대상)에 대해 다음 실행 시 기본적으로 재질문하지 않는다.
|
|
@@ -4,7 +4,7 @@ import { conflictDefaultKey, saveState } from "./state.js";
|
|
|
4
4
|
import { selectTargets } from "./targets.js";
|
|
5
5
|
import { executeSyncEngine } from "./sync-engine.js";
|
|
6
6
|
import { requireRemote } from "./remote.js";
|
|
7
|
-
import { combineJsonPathSelections, parseCliJsonPathSelections,
|
|
7
|
+
import { combineJsonPathSelections, parseCliJsonPathSelections, promptInteractiveCombinedSelection, } from "./target-selectors.js";
|
|
8
8
|
function timestampIso() {
|
|
9
9
|
return new Date().toISOString();
|
|
10
10
|
}
|
|
@@ -14,20 +14,32 @@ function commitMessage(command, agent) {
|
|
|
14
14
|
export async function runSyncCommand(command, agentInput, targetIds, conflictPolicy, jsonPathRules = []) {
|
|
15
15
|
const adapter = resolveAgentAdapter(agentInput);
|
|
16
16
|
const { state, remote } = await requireRemote();
|
|
17
|
+
const cwd = process.cwd();
|
|
17
18
|
const remoteStatus = prepareRemoteBranch(remote.mirrorPath, remote.defaultBranch);
|
|
18
19
|
if (remoteStatus === "initialized") {
|
|
19
20
|
console.log(`원격 브랜치 origin/${remote.defaultBranch}가 없어 자동 초기화했습니다.`);
|
|
20
21
|
}
|
|
21
|
-
const
|
|
22
|
-
|
|
22
|
+
const requestedTargets = targetIds.map((item) => item.trim()).filter(Boolean);
|
|
23
|
+
let selectedTargets = [];
|
|
24
|
+
let interactiveTargets = false;
|
|
25
|
+
let interactiveJsonPathSelections = {};
|
|
26
|
+
if (requestedTargets.length === 0) {
|
|
27
|
+
const interactiveSelection = await promptInteractiveCombinedSelection(command, adapter, adapter.targets, cwd, remote.mirrorPath);
|
|
28
|
+
selectedTargets = interactiveSelection.selectedTargets;
|
|
29
|
+
interactiveTargets = true;
|
|
30
|
+
interactiveJsonPathSelections = interactiveSelection.jsonPathSelectionsByTarget;
|
|
31
|
+
}
|
|
32
|
+
else {
|
|
33
|
+
const selection = await selectTargets(adapter, requestedTargets);
|
|
34
|
+
selectedTargets = selection.targets;
|
|
35
|
+
interactiveTargets = selection.interactive;
|
|
36
|
+
}
|
|
37
|
+
if (selectedTargets.length === 0) {
|
|
23
38
|
throw new Error("동기화할 대상을 최소 1개 이상 선택해야 합니다.");
|
|
24
39
|
}
|
|
25
|
-
const cliJsonPathSelections = parseCliJsonPathSelections(
|
|
26
|
-
const interactiveJsonPathSelections = selection.interactive
|
|
27
|
-
? await promptInteractiveJsonPathSelections(command, adapter, selection.targets, process.cwd(), remote.mirrorPath)
|
|
28
|
-
: {};
|
|
40
|
+
const cliJsonPathSelections = parseCliJsonPathSelections(selectedTargets, jsonPathRules);
|
|
29
41
|
const jsonPathSelectionsByTarget = combineJsonPathSelections(cliJsonPathSelections, interactiveJsonPathSelections);
|
|
30
|
-
const selectionFingerprint =
|
|
42
|
+
const selectionFingerprint = selectedTargets.map((target) => {
|
|
31
43
|
const selectors = jsonPathSelectionsByTarget[target.id];
|
|
32
44
|
if (!selectors || selectors.length === 0) {
|
|
33
45
|
return `${target.id}:*`;
|
|
@@ -38,12 +50,12 @@ export async function runSyncCommand(command, agentInput, targetIds, conflictPol
|
|
|
38
50
|
const summary = await executeSyncEngine({
|
|
39
51
|
command,
|
|
40
52
|
adapter,
|
|
41
|
-
targets:
|
|
42
|
-
cwd
|
|
53
|
+
targets: selectedTargets,
|
|
54
|
+
cwd,
|
|
43
55
|
mirrorPath: remote.mirrorPath,
|
|
44
56
|
state,
|
|
45
57
|
conflictStateKey: conflictKey,
|
|
46
|
-
interactiveTargets
|
|
58
|
+
interactiveTargets,
|
|
47
59
|
explicitPolicy: conflictPolicy,
|
|
48
60
|
jsonPathSelectionsByTarget,
|
|
49
61
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-sync-command.js","sourceRoot":"","sources":["../../src/core/run-sync-command.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,QAAQ,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAC1F,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EACL,yBAAyB,EACzB,0BAA0B,EAC1B,
|
|
1
|
+
{"version":3,"file":"run-sync-command.js","sourceRoot":"","sources":["../../src/core/run-sync-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
import type { AgentAdapter, SyncCommand, TargetSpec } from "../types.js";
|
|
2
2
|
export declare function parseCliJsonPathSelections(selectedTargets: TargetSpec[], rules: string[]): Record<string, string[]>;
|
|
3
|
-
export
|
|
3
|
+
export interface InteractiveSelectionResult {
|
|
4
|
+
selectedTargets: TargetSpec[];
|
|
5
|
+
jsonPathSelectionsByTarget: Record<string, string[]>;
|
|
6
|
+
}
|
|
7
|
+
export declare function promptInteractiveCombinedSelection(command: SyncCommand, adapter: AgentAdapter, targets: TargetSpec[], cwd: string, mirrorPath: string): Promise<InteractiveSelectionResult>;
|
|
4
8
|
export declare function combineJsonPathSelections(cliSelections: Record<string, string[]>, interactiveSelections: Record<string, string[]>): Record<string, string[]>;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import
|
|
1
|
+
import path from "node:path";
|
|
2
2
|
import { exists } from "../utils/fs.js";
|
|
3
3
|
import { getLocalTargetBase, getRemoteTargetBase } from "./layout.js";
|
|
4
|
-
import { isStructuredConfigTarget, parseJsonPathRule, resolveTargetFormat, } from "./structured-config.js";
|
|
5
|
-
import {
|
|
4
|
+
import { isStructuredConfigTarget, parseJsonPathRule, readStructuredFile, resolveTargetFormat, } from "./structured-config.js";
|
|
5
|
+
import { promptCombinedTargetAndJsonTreeSelection, } from "../ui/structured-tree.js";
|
|
6
6
|
function ensureSelectedTargetMap(targets) {
|
|
7
7
|
return new Map(targets.map((target) => [target.id, target]));
|
|
8
8
|
}
|
|
@@ -38,7 +38,7 @@ function mergeSelections(base, extra) {
|
|
|
38
38
|
}
|
|
39
39
|
return merged;
|
|
40
40
|
}
|
|
41
|
-
function
|
|
41
|
+
function resolveSourceForTarget(command, adapter, target, cwd, mirrorPath) {
|
|
42
42
|
const localPath = getLocalTargetBase(target, cwd);
|
|
43
43
|
const remotePath = getRemoteTargetBase(mirrorPath, adapter, target);
|
|
44
44
|
if (command === "push") {
|
|
@@ -49,46 +49,46 @@ function resolveSourcePathForTree(command, adapter, target, cwd, mirrorPath) {
|
|
|
49
49
|
}
|
|
50
50
|
return { path: localPath, sourceKind: "local" };
|
|
51
51
|
}
|
|
52
|
-
export async function
|
|
53
|
-
const
|
|
52
|
+
export async function promptInteractiveCombinedSelection(command, adapter, targets, cwd, mirrorPath) {
|
|
53
|
+
const inputs = [];
|
|
54
54
|
for (const target of targets) {
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
const source = resolveSourcePathForTree(command, adapter, target, cwd, mirrorPath);
|
|
59
|
-
let sourcePath = source.path;
|
|
60
|
-
let sourceKind = source.sourceKind;
|
|
55
|
+
const preferred = resolveSourceForTarget(command, adapter, target, cwd, mirrorPath);
|
|
56
|
+
let sourcePath = preferred.path;
|
|
57
|
+
let sourceKind = preferred.sourceKind;
|
|
61
58
|
if (command === "sync" && !(await exists(sourcePath))) {
|
|
62
|
-
const
|
|
63
|
-
if (await exists(
|
|
64
|
-
sourcePath =
|
|
59
|
+
const fallbackRemote = getRemoteTargetBase(mirrorPath, adapter, target);
|
|
60
|
+
if (await exists(fallbackRemote)) {
|
|
61
|
+
sourcePath = fallbackRemote;
|
|
65
62
|
sourceKind = "remote";
|
|
66
63
|
}
|
|
67
64
|
}
|
|
68
|
-
|
|
69
|
-
|
|
65
|
+
let rootValue = undefined;
|
|
66
|
+
if (target.kind === "file" && isStructuredConfigTarget(target) && await exists(sourcePath)) {
|
|
67
|
+
const format = resolveTargetFormat(target, sourcePath);
|
|
68
|
+
rootValue = await readStructuredFile(sourcePath, format);
|
|
70
69
|
}
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
70
|
+
inputs.push({
|
|
71
|
+
targetId: target.id,
|
|
72
|
+
label: target.label,
|
|
73
|
+
description: `${target.description} (${path.basename(sourcePath)})`,
|
|
74
|
+
sourceKind,
|
|
75
|
+
sourcePath,
|
|
76
|
+
rootValue,
|
|
78
77
|
});
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
if (expressions.length > 0) {
|
|
88
|
-
selected[target.id] = expressions;
|
|
78
|
+
}
|
|
79
|
+
const selection = await promptCombinedTargetAndJsonTreeSelection(`? ${adapter.displayName}에서 동기화할 설정 항목을 선택하세요.`, inputs);
|
|
80
|
+
const byId = ensureSelectedTargetMap(targets);
|
|
81
|
+
const selectedTargets = [];
|
|
82
|
+
for (const targetId of selection.selectedTargetIds) {
|
|
83
|
+
const target = byId.get(targetId);
|
|
84
|
+
if (target) {
|
|
85
|
+
selectedTargets.push(target);
|
|
89
86
|
}
|
|
90
87
|
}
|
|
91
|
-
return
|
|
88
|
+
return {
|
|
89
|
+
selectedTargets,
|
|
90
|
+
jsonPathSelectionsByTarget: selection.jsonPathSelectionsByTarget,
|
|
91
|
+
};
|
|
92
92
|
}
|
|
93
93
|
export function combineJsonPathSelections(cliSelections, interactiveSelections) {
|
|
94
94
|
return mergeSelections(cliSelections, interactiveSelections);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"target-selectors.js","sourceRoot":"","sources":["../../src/core/target-selectors.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"target-selectors.js","sourceRoot":"","sources":["../../src/core/target-selectors.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
package/dist/ui/prompts.js
CHANGED
|
@@ -33,9 +33,12 @@ export async function promptConflictPolicy(defaultPolicy) {
|
|
|
33
33
|
return result;
|
|
34
34
|
}
|
|
35
35
|
export async function promptPerFileDecision(command, conflict) {
|
|
36
|
+
const label = conflict.selector
|
|
37
|
+
? `${conflict.relPath} (jsonpath: ${conflict.selector})`
|
|
38
|
+
: conflict.relPath;
|
|
36
39
|
if (command === "push" || command === "pull") {
|
|
37
40
|
const result = await select({
|
|
38
|
-
message: `충돌: ${
|
|
41
|
+
message: `충돌: ${label}`,
|
|
39
42
|
choices: [
|
|
40
43
|
{ value: "use-source", name: "덮어쓰기" },
|
|
41
44
|
{ value: "skip", name: "건너뛰기" },
|
|
@@ -44,7 +47,7 @@ export async function promptPerFileDecision(command, conflict) {
|
|
|
44
47
|
return result;
|
|
45
48
|
}
|
|
46
49
|
const result = await select({
|
|
47
|
-
message: `충돌: ${
|
|
50
|
+
message: `충돌: ${label}`,
|
|
48
51
|
choices: [
|
|
49
52
|
{ value: "use-local", name: "로컬 버전 사용" },
|
|
50
53
|
{ value: "use-remote", name: "원격 버전 사용" },
|
package/dist/ui/prompts.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../../src/ui/prompts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAUrD,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,OAAqB,EACrB,OAAqB;IAErB,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC;QAC9B,OAAO,EAAE,GAAG,OAAO,CAAC,WAAW,oDAAoD;QACnF,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAChC,IAAI,EAAE,GAAG,MAAM,CAAC,KAAK,KAAK,MAAM,CAAC,QAAQ,OAAO,MAAM,CAAC,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACtG,KAAK,EAAE,MAAM,CAAC,EAAE;YAChB,OAAO,EAAE,MAAM,CAAC,gBAAgB,IAAI,CAAC,MAAM,CAAC,SAAS;SACtD,CAAC,CAAC;QACH,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC;IAEH,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,aAA8B;IACvE,MAAM,MAAM,GAAG,MAAM,MAAM,CAAiB;QAC1C,OAAO,EAAE,kBAAkB;QAC3B,OAAO,EAAE,aAAa;QACtB,OAAO,EAAE;YACP;gBACE,KAAK,EAAE,UAAU;gBACjB,IAAI,EAAE,+BAA+B;aACtC;YACD;gBACE,KAAK,EAAE,WAAW;gBAClB,IAAI,EAAE,6BAA6B;aACpC;YACD;gBACE,KAAK,EAAE,SAAS;gBAChB,IAAI,EAAE,4BAA4B;aACnC;SACF;KACF,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,OAAoB,EACpB,QAAsB;IAEtB,IAAI,OAAO,KAAK,MAAM,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;QAC7C,MAAM,MAAM,GAAG,MAAM,MAAM,CAAkB;YAC3C,OAAO,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../../src/ui/prompts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAUrD,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,OAAqB,EACrB,OAAqB;IAErB,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC;QAC9B,OAAO,EAAE,GAAG,OAAO,CAAC,WAAW,oDAAoD;QACnF,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAChC,IAAI,EAAE,GAAG,MAAM,CAAC,KAAK,KAAK,MAAM,CAAC,QAAQ,OAAO,MAAM,CAAC,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACtG,KAAK,EAAE,MAAM,CAAC,EAAE;YAChB,OAAO,EAAE,MAAM,CAAC,gBAAgB,IAAI,CAAC,MAAM,CAAC,SAAS;SACtD,CAAC,CAAC;QACH,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC;IAEH,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,aAA8B;IACvE,MAAM,MAAM,GAAG,MAAM,MAAM,CAAiB;QAC1C,OAAO,EAAE,kBAAkB;QAC3B,OAAO,EAAE,aAAa;QACtB,OAAO,EAAE;YACP;gBACE,KAAK,EAAE,UAAU;gBACjB,IAAI,EAAE,+BAA+B;aACtC;YACD;gBACE,KAAK,EAAE,WAAW;gBAClB,IAAI,EAAE,6BAA6B;aACpC;YACD;gBACE,KAAK,EAAE,SAAS;gBAChB,IAAI,EAAE,4BAA4B;aACnC;SACF;KACF,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,OAAoB,EACpB,QAAsB;IAEtB,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ;QAC7B,CAAC,CAAC,GAAG,QAAQ,CAAC,OAAO,eAAe,QAAQ,CAAC,QAAQ,GAAG;QACxD,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC;IAErB,IAAI,OAAO,KAAK,MAAM,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;QAC7C,MAAM,MAAM,GAAG,MAAM,MAAM,CAAkB;YAC3C,OAAO,EAAE,OAAO,KAAK,EAAE;YACvB,OAAO,EAAE;gBACP,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE;gBACrC,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE;aAChC;SACF,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,MAAM,CAAkB;QAC3C,OAAO,EAAE,OAAO,KAAK,EAAE;QACvB,OAAO,EAAE;YACP,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE;YACxC,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,UAAU,EAAE;YACzC,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE;SAChC;KACF,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -1,2 +1,13 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
export interface CombinedTreeTargetInput {
|
|
2
|
+
targetId: string;
|
|
3
|
+
label: string;
|
|
4
|
+
description: string;
|
|
5
|
+
sourceKind: "local" | "remote";
|
|
6
|
+
sourcePath: string;
|
|
7
|
+
rootValue: unknown | undefined;
|
|
8
|
+
}
|
|
9
|
+
export interface CombinedTreeSelection {
|
|
10
|
+
selectedTargetIds: string[];
|
|
11
|
+
jsonPathSelectionsByTarget: Record<string, string[]>;
|
|
12
|
+
}
|
|
13
|
+
export declare function promptCombinedTargetAndJsonTreeSelection(title: string, inputs: CombinedTreeTargetInput[]): Promise<CombinedTreeSelection>;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import
|
|
2
|
-
import
|
|
1
|
+
import path from "node:path";
|
|
2
|
+
import readline from "node:readline";
|
|
3
3
|
function nodeSummary(value) {
|
|
4
4
|
if (Array.isArray(value)) {
|
|
5
5
|
return `array(${value.length})`;
|
|
@@ -7,76 +7,317 @@ function nodeSummary(value) {
|
|
|
7
7
|
if (value && typeof value === "object") {
|
|
8
8
|
return `object(${Object.keys(value).length})`;
|
|
9
9
|
}
|
|
10
|
-
|
|
10
|
+
const text = JSON.stringify(value);
|
|
11
|
+
if (!text) {
|
|
12
|
+
return "null";
|
|
13
|
+
}
|
|
14
|
+
return text.length > 48 ? `${text.slice(0, 45)}...` : text;
|
|
11
15
|
}
|
|
12
|
-
function
|
|
13
|
-
|
|
14
|
-
|
|
16
|
+
function toJsonPath(segments) {
|
|
17
|
+
let output = "$";
|
|
18
|
+
for (const segment of segments) {
|
|
19
|
+
if (typeof segment === "number") {
|
|
20
|
+
output += `[${segment}]`;
|
|
21
|
+
continue;
|
|
22
|
+
}
|
|
23
|
+
if (/^[A-Za-z_][A-Za-z0-9_]*$/.test(segment)) {
|
|
24
|
+
output += `.${segment}`;
|
|
25
|
+
continue;
|
|
26
|
+
}
|
|
27
|
+
const escaped = segment.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
|
|
28
|
+
output += `['${escaped}']`;
|
|
15
29
|
}
|
|
16
|
-
|
|
17
|
-
|
|
30
|
+
return output;
|
|
31
|
+
}
|
|
32
|
+
function childEntries(value) {
|
|
33
|
+
if (Array.isArray(value)) {
|
|
34
|
+
return value.map((item, index) => ({ key: index, value: item }));
|
|
35
|
+
}
|
|
36
|
+
if (value && typeof value === "object") {
|
|
37
|
+
return Object.entries(value).map(([key, item]) => ({ key, value: item }));
|
|
18
38
|
}
|
|
19
39
|
return [];
|
|
20
40
|
}
|
|
21
|
-
|
|
22
|
-
const
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
41
|
+
function buildTree(inputs) {
|
|
42
|
+
const nodes = new Map();
|
|
43
|
+
let seq = 0;
|
|
44
|
+
const createNode = (partial) => {
|
|
45
|
+
const id = `n${seq}`;
|
|
46
|
+
seq += 1;
|
|
47
|
+
nodes.set(id, { id, children: [], ...partial });
|
|
48
|
+
if (partial.parentId) {
|
|
49
|
+
const parent = nodes.get(partial.parentId);
|
|
50
|
+
if (parent) {
|
|
51
|
+
parent.children.push(id);
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
return id;
|
|
55
|
+
};
|
|
56
|
+
const rootId = createNode({
|
|
57
|
+
parentId: undefined,
|
|
58
|
+
kind: "target",
|
|
59
|
+
targetId: "__root__",
|
|
60
|
+
label: "동기화 설정 트리",
|
|
61
|
+
sourceLabel: undefined,
|
|
62
|
+
jsonPath: undefined,
|
|
63
|
+
value: null,
|
|
64
|
+
});
|
|
65
|
+
const addJsonChildren = (parentId, targetId, value, segments) => {
|
|
66
|
+
for (const entry of childEntries(value)) {
|
|
67
|
+
const nextSegments = [...segments, entry.key];
|
|
68
|
+
const nextPath = toJsonPath(nextSegments);
|
|
69
|
+
const childId = createNode({
|
|
70
|
+
parentId,
|
|
71
|
+
kind: "json",
|
|
72
|
+
targetId,
|
|
73
|
+
label: String(entry.key),
|
|
74
|
+
sourceLabel: undefined,
|
|
75
|
+
jsonPath: nextPath,
|
|
76
|
+
value: entry.value,
|
|
45
77
|
});
|
|
78
|
+
addJsonChildren(childId, targetId, entry.value, nextSegments);
|
|
46
79
|
}
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
80
|
+
};
|
|
81
|
+
for (const input of inputs) {
|
|
82
|
+
const targetNodeId = createNode({
|
|
83
|
+
parentId: rootId,
|
|
84
|
+
kind: "target",
|
|
85
|
+
targetId: input.targetId,
|
|
86
|
+
label: input.label,
|
|
87
|
+
sourceLabel: `source=${input.sourceKind}`,
|
|
88
|
+
jsonPath: undefined,
|
|
89
|
+
value: input.description,
|
|
51
90
|
});
|
|
52
|
-
if (
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
91
|
+
if (input.rootValue !== undefined) {
|
|
92
|
+
const fileNodeId = createNode({
|
|
93
|
+
parentId: targetNodeId,
|
|
94
|
+
kind: "json",
|
|
95
|
+
targetId: input.targetId,
|
|
96
|
+
label: path.basename(input.sourcePath),
|
|
97
|
+
sourceLabel: undefined,
|
|
98
|
+
jsonPath: "$",
|
|
99
|
+
value: input.rootValue,
|
|
100
|
+
});
|
|
101
|
+
addJsonChildren(fileNodeId, input.targetId, input.rootValue, []);
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
return { nodes, rootId };
|
|
105
|
+
}
|
|
106
|
+
function visibleRows(rootId, nodes, expanded) {
|
|
107
|
+
const rows = [];
|
|
108
|
+
const walk = (nodeId, depth) => {
|
|
109
|
+
rows.push({ id: nodeId, depth });
|
|
110
|
+
if (!expanded.has(nodeId)) {
|
|
111
|
+
return;
|
|
112
|
+
}
|
|
113
|
+
const node = nodes.get(nodeId);
|
|
114
|
+
if (!node) {
|
|
115
|
+
return;
|
|
116
|
+
}
|
|
117
|
+
for (const childId of node.children) {
|
|
118
|
+
walk(childId, depth + 1);
|
|
119
|
+
}
|
|
120
|
+
};
|
|
121
|
+
walk(rootId, 0);
|
|
122
|
+
return rows;
|
|
123
|
+
}
|
|
124
|
+
function descendants(nodeId, nodes) {
|
|
125
|
+
const out = [];
|
|
126
|
+
const stack = [nodeId];
|
|
127
|
+
while (stack.length > 0) {
|
|
128
|
+
const current = stack.pop();
|
|
129
|
+
if (!current) {
|
|
59
130
|
continue;
|
|
60
131
|
}
|
|
61
|
-
|
|
62
|
-
|
|
132
|
+
out.push(current);
|
|
133
|
+
const node = nodes.get(current);
|
|
134
|
+
if (!node) {
|
|
63
135
|
continue;
|
|
64
136
|
}
|
|
65
|
-
|
|
66
|
-
|
|
137
|
+
for (const childId of node.children) {
|
|
138
|
+
stack.push(childId);
|
|
67
139
|
}
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
140
|
+
}
|
|
141
|
+
return out;
|
|
142
|
+
}
|
|
143
|
+
function selectionState(nodeId, nodes, selected) {
|
|
144
|
+
const node = nodes.get(nodeId);
|
|
145
|
+
if (!node) {
|
|
146
|
+
return "none";
|
|
147
|
+
}
|
|
148
|
+
if (node.children.length === 0) {
|
|
149
|
+
return selected.has(nodeId) ? "all" : "none";
|
|
150
|
+
}
|
|
151
|
+
let all = selected.has(nodeId);
|
|
152
|
+
let any = selected.has(nodeId);
|
|
153
|
+
for (const childId of node.children) {
|
|
154
|
+
const child = selectionState(childId, nodes, selected);
|
|
155
|
+
if (child !== "all") {
|
|
156
|
+
all = false;
|
|
157
|
+
}
|
|
158
|
+
if (child !== "none") {
|
|
159
|
+
any = true;
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
if (all) {
|
|
163
|
+
return "all";
|
|
164
|
+
}
|
|
165
|
+
if (any) {
|
|
166
|
+
return "partial";
|
|
167
|
+
}
|
|
168
|
+
return "none";
|
|
169
|
+
}
|
|
170
|
+
function render(title, rows, focusIndex, nodes, expanded, selected) {
|
|
171
|
+
readline.cursorTo(process.stdout, 0, 0);
|
|
172
|
+
readline.clearScreenDown(process.stdout);
|
|
173
|
+
const lines = [
|
|
174
|
+
title,
|
|
175
|
+
"←/→ 접기/펼치기, ↑/↓ 이동, Space 선택(하위 포함), Enter 확정",
|
|
176
|
+
"",
|
|
177
|
+
];
|
|
178
|
+
for (let i = 0; i < rows.length; i += 1) {
|
|
179
|
+
const row = rows[i];
|
|
180
|
+
if (!row) {
|
|
181
|
+
continue;
|
|
182
|
+
}
|
|
183
|
+
const node = nodes.get(row.id);
|
|
184
|
+
if (!node) {
|
|
185
|
+
continue;
|
|
186
|
+
}
|
|
187
|
+
const state = selectionState(node.id, nodes, selected);
|
|
188
|
+
const marker = state === "all" ? "◉" : state === "partial" ? "◐" : "◯";
|
|
189
|
+
const branch = node.children.length > 0 ? (expanded.has(node.id) ? "▾" : "▸") : "·";
|
|
190
|
+
const focus = i === focusIndex ? "❯" : " ";
|
|
191
|
+
const indent = " ".repeat(row.depth);
|
|
192
|
+
const detail = node.kind === "json"
|
|
193
|
+
? nodeSummary(node.value)
|
|
194
|
+
: node.sourceLabel ?? "";
|
|
195
|
+
lines.push(`${focus}${indent}${branch} ${marker} ${node.label}${detail ? ` ${detail}` : ""}`);
|
|
196
|
+
}
|
|
197
|
+
process.stdout.write(`${lines.join("\n")}\n`);
|
|
198
|
+
}
|
|
199
|
+
function collectSelection(nodes, selected) {
|
|
200
|
+
const selectedTargetIds = new Set();
|
|
201
|
+
const jsonPathSelectionsByTarget = {};
|
|
202
|
+
const orderedSelected = [...selected];
|
|
203
|
+
for (const nodeId of orderedSelected) {
|
|
204
|
+
const node = nodes.get(nodeId);
|
|
205
|
+
if (!node || node.targetId === "__root__") {
|
|
206
|
+
continue;
|
|
207
|
+
}
|
|
208
|
+
if (node.kind === "target") {
|
|
209
|
+
selectedTargetIds.add(node.targetId);
|
|
210
|
+
delete jsonPathSelectionsByTarget[node.targetId];
|
|
211
|
+
continue;
|
|
212
|
+
}
|
|
213
|
+
if (!selectedTargetIds.has(node.targetId) && node.jsonPath) {
|
|
214
|
+
const arr = jsonPathSelectionsByTarget[node.targetId] ?? [];
|
|
215
|
+
if (!arr.includes(node.jsonPath)) {
|
|
216
|
+
arr.push(node.jsonPath);
|
|
78
217
|
}
|
|
218
|
+
jsonPathSelectionsByTarget[node.targetId] = arr;
|
|
219
|
+
selectedTargetIds.add(node.targetId);
|
|
79
220
|
}
|
|
80
221
|
}
|
|
222
|
+
for (const [targetId, paths] of Object.entries(jsonPathSelectionsByTarget)) {
|
|
223
|
+
jsonPathSelectionsByTarget[targetId] = paths.sort();
|
|
224
|
+
}
|
|
225
|
+
return {
|
|
226
|
+
selectedTargetIds: [...selectedTargetIds].sort(),
|
|
227
|
+
jsonPathSelectionsByTarget,
|
|
228
|
+
};
|
|
229
|
+
}
|
|
230
|
+
export async function promptCombinedTargetAndJsonTreeSelection(title, inputs) {
|
|
231
|
+
if (!process.stdin.isTTY || !process.stdout.isTTY) {
|
|
232
|
+
return {
|
|
233
|
+
selectedTargetIds: inputs.map((item) => item.targetId),
|
|
234
|
+
jsonPathSelectionsByTarget: {},
|
|
235
|
+
};
|
|
236
|
+
}
|
|
237
|
+
const { nodes, rootId } = buildTree(inputs);
|
|
238
|
+
const expanded = new Set([rootId]);
|
|
239
|
+
let rows = visibleRows(rootId, nodes, expanded).filter((row) => row.id !== rootId);
|
|
240
|
+
let focusIndex = 0;
|
|
241
|
+
const selected = new Set();
|
|
242
|
+
return await new Promise((resolve, reject) => {
|
|
243
|
+
const input = process.stdin;
|
|
244
|
+
const output = process.stdout;
|
|
245
|
+
readline.emitKeypressEvents(input);
|
|
246
|
+
input.setRawMode(true);
|
|
247
|
+
output.write("\x1B[?25l");
|
|
248
|
+
const cleanup = () => {
|
|
249
|
+
input.off("keypress", onKeypress);
|
|
250
|
+
input.setRawMode(false);
|
|
251
|
+
output.write("\x1B[?25h");
|
|
252
|
+
output.write("\n");
|
|
253
|
+
};
|
|
254
|
+
const onKeypress = (_str, key) => {
|
|
255
|
+
if (key.ctrl && key.name === "c") {
|
|
256
|
+
cleanup();
|
|
257
|
+
reject(new Error("사용자가 트리 선택을 중단했습니다."));
|
|
258
|
+
return;
|
|
259
|
+
}
|
|
260
|
+
const row = rows[focusIndex];
|
|
261
|
+
const currentNode = row ? nodes.get(row.id) : undefined;
|
|
262
|
+
if (key.name === "up") {
|
|
263
|
+
focusIndex = Math.max(0, focusIndex - 1);
|
|
264
|
+
}
|
|
265
|
+
else if (key.name === "down") {
|
|
266
|
+
focusIndex = Math.min(rows.length - 1, focusIndex + 1);
|
|
267
|
+
}
|
|
268
|
+
else if (key.name === "right") {
|
|
269
|
+
if (currentNode && currentNode.children.length > 0) {
|
|
270
|
+
if (!expanded.has(currentNode.id)) {
|
|
271
|
+
expanded.add(currentNode.id);
|
|
272
|
+
rows = visibleRows(rootId, nodes, expanded).filter((item) => item.id !== rootId);
|
|
273
|
+
}
|
|
274
|
+
else {
|
|
275
|
+
focusIndex = Math.min(rows.length - 1, focusIndex + 1);
|
|
276
|
+
}
|
|
277
|
+
}
|
|
278
|
+
}
|
|
279
|
+
else if (key.name === "left") {
|
|
280
|
+
if (currentNode) {
|
|
281
|
+
if (expanded.has(currentNode.id) && currentNode.children.length > 0) {
|
|
282
|
+
expanded.delete(currentNode.id);
|
|
283
|
+
rows = visibleRows(rootId, nodes, expanded).filter((item) => item.id !== rootId);
|
|
284
|
+
focusIndex = Math.min(focusIndex, rows.length - 1);
|
|
285
|
+
}
|
|
286
|
+
else if (currentNode.parentId) {
|
|
287
|
+
const parentIndex = rows.findIndex((item) => item.id === currentNode.parentId);
|
|
288
|
+
if (parentIndex >= 0) {
|
|
289
|
+
focusIndex = parentIndex;
|
|
290
|
+
}
|
|
291
|
+
}
|
|
292
|
+
}
|
|
293
|
+
}
|
|
294
|
+
else if (key.name === "space") {
|
|
295
|
+
if (currentNode) {
|
|
296
|
+
const desc = descendants(currentNode.id, nodes);
|
|
297
|
+
const allSelected = desc.every((nodeId) => selected.has(nodeId));
|
|
298
|
+
if (allSelected) {
|
|
299
|
+
for (const nodeId of desc) {
|
|
300
|
+
selected.delete(nodeId);
|
|
301
|
+
}
|
|
302
|
+
}
|
|
303
|
+
else {
|
|
304
|
+
for (const nodeId of desc) {
|
|
305
|
+
selected.add(nodeId);
|
|
306
|
+
}
|
|
307
|
+
}
|
|
308
|
+
}
|
|
309
|
+
}
|
|
310
|
+
else if (key.name === "return" || key.name === "enter") {
|
|
311
|
+
cleanup();
|
|
312
|
+
resolve(collectSelection(nodes, selected));
|
|
313
|
+
return;
|
|
314
|
+
}
|
|
315
|
+
rows = visibleRows(rootId, nodes, expanded).filter((item) => item.id !== rootId);
|
|
316
|
+
focusIndex = Math.min(focusIndex, rows.length - 1);
|
|
317
|
+
render(title, rows, focusIndex, nodes, expanded, selected);
|
|
318
|
+
};
|
|
319
|
+
render(title, rows, focusIndex, nodes, expanded, selected);
|
|
320
|
+
input.on("keypress", onKeypress);
|
|
321
|
+
});
|
|
81
322
|
}
|
|
82
323
|
//# sourceMappingURL=structured-tree.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"structured-tree.js","sourceRoot":"","sources":["../../src/ui/structured-tree.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"structured-tree.js","sourceRoot":"","sources":["../../src/ui/structured-tree.ts"],"names":[],"mappings":"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"}
|