codex-orchestrator 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/dist/src/git/worktree.d.ts +1 -0
- package/dist/src/git/worktree.d.ts.map +1 -1
- package/dist/src/git/worktree.js +49 -2
- package/dist/src/git/worktree.js.map +1 -1
- package/dist/src/setup/project-config.d.ts +1 -0
- package/dist/src/setup/project-config.d.ts.map +1 -1
- package/dist/src/setup/project-config.js +111 -0
- package/dist/src/setup/project-config.js.map +1 -1
- package/dist/src/setup/setup-command.d.ts.map +1 -1
- package/dist/src/setup/setup-command.js +3 -2
- package/dist/src/setup/setup-command.js.map +1 -1
- package/package.json +1 -1
|
@@ -45,6 +45,7 @@ export declare class GitWorktreeManager {
|
|
|
45
45
|
abortMerge(worktreePath: string): Promise<void>;
|
|
46
46
|
removeWorktree(input: RemoveWorktreeInput): Promise<void>;
|
|
47
47
|
private git;
|
|
48
|
+
private removeMergedStaleBranchWorktree;
|
|
48
49
|
}
|
|
49
50
|
export declare function renderBranchTemplate(template: string, values: BranchTemplateValues): string;
|
|
50
51
|
//# sourceMappingURL=worktree.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktree.d.ts","sourceRoot":"","sources":["../../../src/git/worktree.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAG7D,MAAM,WAAW,oBAAoB;IACnC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,wBAAwB;IACvC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,eAAe;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,qBAAa,qBAAsB,SAAQ,KAAK;aAE5B,YAAY,EAAE,MAAM;aACpB,UAAU,EAAE,MAAM;aAClB,MAAM,EAAE,MAAM;aACd,MAAM,EAAE,MAAM;gBAHd,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM;CAKjC;AAED,qBAAa,kBAAkB;IACV,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,GAAE,eAAwC;IAEzE,OAAO,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAK9C,mBAAmB,CAAC,KAAK,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"worktree.d.ts","sourceRoot":"","sources":["../../../src/git/worktree.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAG7D,MAAM,WAAW,oBAAoB;IACnC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,wBAAwB;IACvC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,eAAe;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,qBAAa,qBAAsB,SAAQ,KAAK;aAE5B,YAAY,EAAE,MAAM;aACpB,UAAU,EAAE,MAAM;aAClB,MAAM,EAAE,MAAM;aACd,MAAM,EAAE,MAAM;gBAHd,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM;CAKjC;AAED,qBAAa,kBAAkB;IACV,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,GAAE,eAAwC;IAEzE,OAAO,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAK9C,mBAAmB,CAAC,KAAK,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBnE,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAKzD,SAAS,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB/C,UAAU,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAcjD,WAAW,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBnD,UAAU,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/C,cAAc,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;YAIxD,GAAG;YAQH,+BAA+B;CA6B9C;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,oBAAoB,GAAG,MAAM,CAI3F"}
|
package/dist/src/git/worktree.js
CHANGED
|
@@ -26,7 +26,7 @@ export class GitWorktreeManager {
|
|
|
26
26
|
}
|
|
27
27
|
async createIssueWorktree(input) {
|
|
28
28
|
await mkdir(dirname(input.workspacePath), { recursive: true });
|
|
29
|
-
|
|
29
|
+
const args = [
|
|
30
30
|
'-C',
|
|
31
31
|
input.targetRoot,
|
|
32
32
|
'worktree',
|
|
@@ -35,7 +35,16 @@ export class GitWorktreeManager {
|
|
|
35
35
|
input.branchName,
|
|
36
36
|
input.workspacePath,
|
|
37
37
|
input.baseBranch,
|
|
38
|
-
]
|
|
38
|
+
];
|
|
39
|
+
const result = await this.executor('git', args);
|
|
40
|
+
if (result.exitCode === 0) {
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
if (!/a branch named .+ already exists/i.test(result.stderr)) {
|
|
44
|
+
throw new Error(`git command failed: git ${args.join(' ')}\n${result.stderr}`);
|
|
45
|
+
}
|
|
46
|
+
await this.removeMergedStaleBranchWorktree(input);
|
|
47
|
+
await this.git(args);
|
|
39
48
|
}
|
|
40
49
|
async listChangedFiles(worktreePath) {
|
|
41
50
|
const result = await this.git(['-C', worktreePath, 'status', '--porcelain=v1', '-z']);
|
|
@@ -104,6 +113,29 @@ export class GitWorktreeManager {
|
|
|
104
113
|
}
|
|
105
114
|
return result;
|
|
106
115
|
}
|
|
116
|
+
async removeMergedStaleBranchWorktree(input) {
|
|
117
|
+
const ancestor = await this.executor('git', [
|
|
118
|
+
'-C',
|
|
119
|
+
input.targetRoot,
|
|
120
|
+
'merge-base',
|
|
121
|
+
'--is-ancestor',
|
|
122
|
+
input.branchName,
|
|
123
|
+
input.baseBranch,
|
|
124
|
+
]);
|
|
125
|
+
if (ancestor.exitCode !== 0) {
|
|
126
|
+
throw new Error(`Existing branch ${input.branchName} is not merged into ${input.baseBranch}; refusing to remove it automatically.`);
|
|
127
|
+
}
|
|
128
|
+
const worktrees = parseWorktreeList((await this.git(['-C', input.targetRoot, 'worktree', 'list', '--porcelain'])).stdout);
|
|
129
|
+
const staleWorktree = worktrees.find((worktree) => worktree.branch === `refs/heads/${input.branchName}`);
|
|
130
|
+
if (staleWorktree) {
|
|
131
|
+
const status = await this.git(['-C', staleWorktree.path, 'status', '--porcelain=v1']);
|
|
132
|
+
if (status.stdout.trim().length > 0) {
|
|
133
|
+
throw new Error(`Existing worktree for ${input.branchName} has uncommitted changes at ${staleWorktree.path}; refusing to remove it automatically.`);
|
|
134
|
+
}
|
|
135
|
+
await this.removeWorktree({ targetRoot: input.targetRoot, worktreePath: staleWorktree.path });
|
|
136
|
+
}
|
|
137
|
+
await this.git(['-C', input.targetRoot, 'branch', '-d', input.branchName]);
|
|
138
|
+
}
|
|
107
139
|
}
|
|
108
140
|
export function renderBranchTemplate(template, values) {
|
|
109
141
|
return template
|
|
@@ -136,4 +168,19 @@ function parsePorcelainChangedFiles(output) {
|
|
|
136
168
|
function normalizePath(path) {
|
|
137
169
|
return path.replaceAll('\\', '/');
|
|
138
170
|
}
|
|
171
|
+
function parseWorktreeList(output) {
|
|
172
|
+
const worktrees = [];
|
|
173
|
+
let current;
|
|
174
|
+
for (const line of output.split('\n')) {
|
|
175
|
+
if (line.startsWith('worktree ')) {
|
|
176
|
+
current = { path: line.slice('worktree '.length) };
|
|
177
|
+
worktrees.push(current);
|
|
178
|
+
continue;
|
|
179
|
+
}
|
|
180
|
+
if (current && line.startsWith('branch ')) {
|
|
181
|
+
current.branch = line.slice('branch '.length);
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
return worktrees;
|
|
185
|
+
}
|
|
139
186
|
//# sourceMappingURL=worktree.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktree.js","sourceRoot":"","sources":["../../../src/git/worktree.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAmC/D,MAAM,OAAO,qBAAsB,SAAQ,KAAK;IAE5B;IACA;IACA;IACA;IAJlB,YACkB,YAAoB,EACpB,UAAkB,EAClB,MAAc,EACd,MAAc;QAE9B,KAAK,CAAC,wBAAwB,UAAU,OAAO,YAAY,EAAE,CAAC,CAAC;QAL/C,iBAAY,GAAZ,YAAY,CAAQ;QACpB,eAAU,GAAV,UAAU,CAAQ;QAClB,WAAM,GAAN,MAAM,CAAQ;QACd,WAAM,GAAN,MAAM,CAAQ;QAG9B,IAAI,CAAC,IAAI,GAAG,uBAAuB,CAAC;IACtC,CAAC;CACF;AAED,MAAM,OAAO,kBAAkB;IACO;IAApC,YAAoC,WAA4B,sBAAsB;QAAlD,aAAQ,GAAR,QAAQ,CAA0C;IAAG,CAAC;IAEnF,KAAK,CAAC,OAAO,CAAC,YAAoB;QACvC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;QACzE,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAC9B,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAAC,KAA+B;QAC9D,MAAM,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/D,MAAM,IAAI,
|
|
1
|
+
{"version":3,"file":"worktree.js","sourceRoot":"","sources":["../../../src/git/worktree.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ export interface BuildProjectConfigInput {
|
|
|
8
8
|
}
|
|
9
9
|
export declare const defaultLabels: CodexOrchestratorConfig['github']['labels'];
|
|
10
10
|
export declare function buildProjectConfig(input: BuildProjectConfigInput): CodexOrchestratorConfig;
|
|
11
|
+
export declare function mergeExistingProjectConfig(defaults: CodexOrchestratorConfig, existing: Record<string, unknown> | undefined): CodexOrchestratorConfig;
|
|
11
12
|
export declare function readExistingConfig(configPath: string): Promise<Record<string, unknown> | undefined>;
|
|
12
13
|
export declare function assertNoRuntimeState(value: Record<string, unknown> | undefined): void;
|
|
13
14
|
export declare function writeProjectConfig(targetRoot: string, config: CodexOrchestratorConfig): Promise<string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-config.d.ts","sourceRoot":"","sources":["../../../src/setup/project-config.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,uBAAuB,EAAmB,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAE5G,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAExD,MAAM,WAAW,uBAAuB;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,sBAAsB,CAAC;IACtC,SAAS,EAAE,iBAAiB,CAAC;CAC9B;AAED,eAAO,MAAM,aAAa,EAAE,uBAAuB,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAQrE,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,uBAAuB,GAAG,uBAAuB,CAqH1F;AAED,wBAAsB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC,CAWzG;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GAAG,IAAI,CASrF;AAED,wBAAsB,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,uBAAuB,GAAG,OAAO,CAAC,MAAM,CAAC,CAW7G;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAE5D"}
|
|
1
|
+
{"version":3,"file":"project-config.d.ts","sourceRoot":"","sources":["../../../src/setup/project-config.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,uBAAuB,EAAmB,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAE5G,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAExD,MAAM,WAAW,uBAAuB;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,sBAAsB,CAAC;IACtC,SAAS,EAAE,iBAAiB,CAAC;CAC9B;AAED,eAAO,MAAM,aAAa,EAAE,uBAAuB,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAQrE,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,uBAAuB,GAAG,uBAAuB,CAqH1F;AAED,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,uBAAuB,EACjC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GAC5C,uBAAuB,CA6EzB;AAED,wBAAsB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC,CAWzG;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GAAG,IAAI,CASrF;AAED,wBAAsB,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,uBAAuB,GAAG,OAAO,CAAC,MAAM,CAAC,CAW7G;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAE5D"}
|
|
@@ -129,6 +129,82 @@ export function buildProjectConfig(input) {
|
|
|
129
129
|
},
|
|
130
130
|
};
|
|
131
131
|
}
|
|
132
|
+
export function mergeExistingProjectConfig(defaults, existing) {
|
|
133
|
+
if (!existing) {
|
|
134
|
+
return defaults;
|
|
135
|
+
}
|
|
136
|
+
const existingGithub = readObject(existing.github);
|
|
137
|
+
const existingRunner = readObject(existing.runner);
|
|
138
|
+
const existingCodex = readObject(existing.codex);
|
|
139
|
+
const existingProject = readObject(existing.project);
|
|
140
|
+
const existingWorkflows = readObject(existing.workflows);
|
|
141
|
+
const existingChecks = readStringRecord(existing.checks);
|
|
142
|
+
const existingReviewGates = readObject(existing.reviewGates);
|
|
143
|
+
const existingVisualProof = readObject(existingReviewGates?.visualProof);
|
|
144
|
+
const existingDeny = readObject(existing.deny);
|
|
145
|
+
const existingBranches = readObject(existing.branches);
|
|
146
|
+
const existingPullRequests = readObject(existing.pullRequests);
|
|
147
|
+
const existingIssueClassification = readObject(existing.issueClassification);
|
|
148
|
+
return {
|
|
149
|
+
...defaults,
|
|
150
|
+
github: {
|
|
151
|
+
...defaults.github,
|
|
152
|
+
...existingGithub,
|
|
153
|
+
owner: defaults.github.owner,
|
|
154
|
+
repo: defaults.github.repo,
|
|
155
|
+
prepareLabels: defaults.github.prepareLabels,
|
|
156
|
+
labels: {
|
|
157
|
+
...defaults.github.labels,
|
|
158
|
+
...readObject(existingGithub?.labels),
|
|
159
|
+
},
|
|
160
|
+
},
|
|
161
|
+
runner: {
|
|
162
|
+
...defaults.runner,
|
|
163
|
+
...existingRunner,
|
|
164
|
+
},
|
|
165
|
+
codex: {
|
|
166
|
+
...defaults.codex,
|
|
167
|
+
...existingCodex,
|
|
168
|
+
args: migrateCodexArgs(readStringArray(existingCodex?.args), defaults.codex.args),
|
|
169
|
+
promptFileEnv: defaults.codex.promptFileEnv,
|
|
170
|
+
reportFileEnv: defaults.codex.reportFileEnv,
|
|
171
|
+
adapter: defaults.codex.adapter,
|
|
172
|
+
},
|
|
173
|
+
project: {
|
|
174
|
+
...defaults.project,
|
|
175
|
+
...existingProject,
|
|
176
|
+
},
|
|
177
|
+
workflows: {
|
|
178
|
+
...defaults.workflows,
|
|
179
|
+
...existingWorkflows,
|
|
180
|
+
},
|
|
181
|
+
checks: existingChecks ?? defaults.checks,
|
|
182
|
+
reviewGates: {
|
|
183
|
+
...defaults.reviewGates,
|
|
184
|
+
...existingReviewGates,
|
|
185
|
+
visualProof: {
|
|
186
|
+
...defaults.reviewGates.visualProof,
|
|
187
|
+
...existingVisualProof,
|
|
188
|
+
},
|
|
189
|
+
},
|
|
190
|
+
deny: {
|
|
191
|
+
...defaults.deny,
|
|
192
|
+
...existingDeny,
|
|
193
|
+
},
|
|
194
|
+
branches: {
|
|
195
|
+
...defaults.branches,
|
|
196
|
+
...existingBranches,
|
|
197
|
+
},
|
|
198
|
+
pullRequests: {
|
|
199
|
+
...defaults.pullRequests,
|
|
200
|
+
...existingPullRequests,
|
|
201
|
+
},
|
|
202
|
+
issueClassification: {
|
|
203
|
+
...defaults.issueClassification,
|
|
204
|
+
...existingIssueClassification,
|
|
205
|
+
},
|
|
206
|
+
};
|
|
207
|
+
}
|
|
132
208
|
export async function readExistingConfig(configPath) {
|
|
133
209
|
try {
|
|
134
210
|
const content = await readFile(configPath, 'utf8');
|
|
@@ -166,4 +242,39 @@ export function projectConfigPath(targetRoot) {
|
|
|
166
242
|
function label(name, color, description) {
|
|
167
243
|
return { name, color, description };
|
|
168
244
|
}
|
|
245
|
+
function migrateCodexArgs(existingArgs, defaultArgs) {
|
|
246
|
+
if (!existingArgs) {
|
|
247
|
+
return defaultArgs;
|
|
248
|
+
}
|
|
249
|
+
if (!existingArgs.includes('--ignore-user-config')) {
|
|
250
|
+
return existingArgs;
|
|
251
|
+
}
|
|
252
|
+
const migrated = [];
|
|
253
|
+
for (let index = 0; index < existingArgs.length; index += 1) {
|
|
254
|
+
const arg = existingArgs[index];
|
|
255
|
+
if (arg === '--ignore-user-config') {
|
|
256
|
+
if (!migrated.includes('-c') && !existingArgs.includes('sandbox_workspace_write.network_access=true')) {
|
|
257
|
+
migrated.push('-c', 'sandbox_workspace_write.network_access=true');
|
|
258
|
+
}
|
|
259
|
+
continue;
|
|
260
|
+
}
|
|
261
|
+
migrated.push(arg);
|
|
262
|
+
}
|
|
263
|
+
return migrated;
|
|
264
|
+
}
|
|
265
|
+
function readObject(value) {
|
|
266
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value)
|
|
267
|
+
? value
|
|
268
|
+
: undefined;
|
|
269
|
+
}
|
|
270
|
+
function readStringArray(value) {
|
|
271
|
+
return Array.isArray(value) && value.every((item) => typeof item === 'string') ? value : undefined;
|
|
272
|
+
}
|
|
273
|
+
function readStringRecord(value) {
|
|
274
|
+
const object = readObject(value);
|
|
275
|
+
if (!object || Object.values(object).some((item) => typeof item !== 'string')) {
|
|
276
|
+
return undefined;
|
|
277
|
+
}
|
|
278
|
+
return object;
|
|
279
|
+
}
|
|
169
280
|
//# sourceMappingURL=project-config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-config.js","sourceRoot":"","sources":["../../../src/setup/project-config.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"project-config.js","sourceRoot":"","sources":["../../../src/setup/project-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-command.d.ts","sourceRoot":"","sources":["../../../src/setup/setup-command.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAGnE,OAAO,KAAK,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"setup-command.d.ts","sourceRoot":"","sources":["../../../src/setup/setup-command.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAGnE,OAAO,KAAK,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAcjE,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,YAAY,CAAC,EAAE,kBAAkB,CAAC;CACnC;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,uBAAuB,CAAC;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAiD/F"}
|
|
@@ -5,7 +5,7 @@ import { promisify } from 'node:util';
|
|
|
5
5
|
import { validateConfig } from '../config/schema.js';
|
|
6
6
|
import { GhCliLabelAdapter } from './github-label-adapter.js';
|
|
7
7
|
import { planLabels } from './labels.js';
|
|
8
|
-
import { assertNoRuntimeState, buildProjectConfig, projectConfigPath, readExistingConfig, writeProjectConfig, } from './project-config.js';
|
|
8
|
+
import { assertNoRuntimeState, buildProjectConfig, mergeExistingProjectConfig, projectConfigPath, readExistingConfig, writeProjectConfig, } from './project-config.js';
|
|
9
9
|
import { defaultSkillsRoot, resolveWorkflowConfigs, workflowDefinitions } from './workflows.js';
|
|
10
10
|
const execFileAsync = promisify(execFile);
|
|
11
11
|
export async function runSetupCommand(options) {
|
|
@@ -21,12 +21,13 @@ export async function runSetupCommand(options) {
|
|
|
21
21
|
}
|
|
22
22
|
const prepareLabels = options.prepareLabels ? 'create-missing' : 'report-only';
|
|
23
23
|
const workflows = await resolveWorkflowConfigs(options.skillsRoot ?? defaultSkillsRoot());
|
|
24
|
-
const
|
|
24
|
+
const defaultConfig = buildProjectConfig({
|
|
25
25
|
owner,
|
|
26
26
|
repo,
|
|
27
27
|
prepareLabels,
|
|
28
28
|
workflows,
|
|
29
29
|
});
|
|
30
|
+
const config = mergeExistingProjectConfig(defaultConfig, existingConfig);
|
|
30
31
|
const validation = validateConfig(config);
|
|
31
32
|
if (!validation.ok) {
|
|
32
33
|
throw new Error(`Generated config is invalid: ${validation.errors.join('; ')}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-command.js","sourceRoot":"","sources":["../../../src/setup/setup-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAGtC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EACL,oBAAoB,EACpB,kBAAkB,EAClB,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,GACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAEhG,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;AAsB1C,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,OAA4B;IAChE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,KAAK,CAAC;IACvC,MAAM,UAAU,GAAG,iBAAiB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACzD,MAAM,cAAc,GAAG,MAAM,kBAAkB,CAAC,UAAU,CAAC,CAAC;IAE5D,oBAAoB,CAAC,cAAc,CAAC,CAAC;IAErC,MAAM,kBAAkB,GAAG,MAAM,yBAAyB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC/E,MAAM,KAAK,GAAG,OAAO,CAAC,WAAW,IAAI,kBAAkB,CAAC,cAAc,EAAE,QAAQ,EAAE,OAAO,CAAC,IAAI,kBAAkB,EAAE,KAAK,CAAC;IACxH,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,IAAI,kBAAkB,CAAC,cAAc,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,kBAAkB,EAAE,IAAI,CAAC;IAEpH,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CAAC,2GAA2G,CAAC,CAAC;IAC/H,CAAC;IAED,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,aAAa,CAAC;IAC/E,MAAM,SAAS,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,UAAU,IAAI,iBAAiB,EAAE,CAAC,CAAC;IAC1F,MAAM,
|
|
1
|
+
{"version":3,"file":"setup-command.js","sourceRoot":"","sources":["../../../src/setup/setup-command.ts"],"names":[],"mappings":"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"}
|