takt 0.35.1 → 0.35.3
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 +2 -2
- package/builtins/en/facets/instructions/write-tests-first.md +4 -34
- package/builtins/en/facets/output-contracts/test-report.md +20 -0
- package/builtins/en/workflows/backend-cqrs.yaml +2 -4
- package/builtins/en/workflows/backend.yaml +2 -4
- package/builtins/en/workflows/default.yaml +2 -4
- package/builtins/en/workflows/dual.yaml +2 -4
- package/builtins/en/workflows/frontend.yaml +2 -4
- package/builtins/en/workflows/takt-default.yaml +2 -4
- package/builtins/ja/facets/instructions/write-tests-first.md +4 -34
- package/builtins/ja/facets/output-contracts/test-report.md +20 -0
- package/builtins/ja/workflows/backend-cqrs.yaml +2 -4
- package/builtins/ja/workflows/backend.yaml +2 -4
- package/builtins/ja/workflows/default.yaml +2 -4
- package/builtins/ja/workflows/dual.yaml +2 -4
- package/builtins/ja/workflows/frontend.yaml +2 -4
- package/builtins/ja/workflows/takt-default.yaml +2 -4
- package/dist/core/models/piece-types.d.ts +3 -0
- package/dist/core/models/piece-types.d.ts.map +1 -1
- package/dist/core/models/workflow-schemas.d.ts +98 -0
- package/dist/core/models/workflow-schemas.d.ts.map +1 -1
- package/dist/core/models/workflow-schemas.js +2 -0
- package/dist/core/models/workflow-schemas.js.map +1 -1
- package/dist/core/piece/engine/MovementExecutor.d.ts +3 -3
- package/dist/core/piece/engine/MovementExecutor.d.ts.map +1 -1
- package/dist/core/piece/engine/MovementExecutor.js +7 -7
- package/dist/core/piece/engine/MovementExecutor.js.map +1 -1
- package/dist/core/piece/engine/OptionsBuilder.d.ts +7 -7
- package/dist/core/piece/engine/OptionsBuilder.d.ts.map +1 -1
- package/dist/core/piece/engine/OptionsBuilder.js +18 -15
- package/dist/core/piece/engine/OptionsBuilder.js.map +1 -1
- package/dist/core/piece/engine/PieceEngine.d.ts.map +1 -1
- package/dist/core/piece/engine/PieceEngine.js +36 -6
- package/dist/core/piece/engine/PieceEngine.js.map +1 -1
- package/dist/core/piece/phase-runner.js +3 -1
- package/dist/core/piece/phase-runner.js.map +1 -1
- package/dist/core/piece/provider-model-compatibility.d.ts +7 -0
- package/dist/core/piece/provider-model-compatibility.d.ts.map +1 -0
- package/dist/core/piece/provider-model-compatibility.js +20 -0
- package/dist/core/piece/provider-model-compatibility.js.map +1 -0
- package/dist/core/piece/provider-resolution.d.ts +13 -1
- package/dist/core/piece/provider-resolution.d.ts.map +1 -1
- package/dist/core/piece/provider-resolution.js +13 -0
- package/dist/core/piece/provider-resolution.js.map +1 -1
- package/dist/core/piece/run/run-meta.d.ts +19 -0
- package/dist/core/piece/run/run-meta.d.ts.map +1 -0
- package/dist/core/piece/run/run-meta.js +42 -0
- package/dist/core/piece/run/run-meta.js.map +1 -0
- package/dist/core/piece/session-key.d.ts +2 -1
- package/dist/core/piece/session-key.d.ts.map +1 -1
- package/dist/core/piece/session-key.js +3 -2
- package/dist/core/piece/session-key.js.map +1 -1
- package/dist/core/piece/types.d.ts +3 -0
- package/dist/core/piece/types.d.ts.map +1 -1
- package/dist/features/interactive/runSessionReader.d.ts.map +1 -1
- package/dist/features/interactive/runSessionReader.js +4 -21
- package/dist/features/interactive/runSessionReader.js.map +1 -1
- package/dist/features/tasks/execute/pieceExecution.d.ts.map +1 -1
- package/dist/features/tasks/execute/pieceExecution.js +1 -0
- package/dist/features/tasks/execute/pieceExecution.js.map +1 -1
- package/dist/features/tasks/execute/postExecution.d.ts.map +1 -1
- package/dist/features/tasks/execute/postExecution.js +14 -22
- package/dist/features/tasks/execute/postExecution.js.map +1 -1
- package/dist/features/tasks/execute/resolveTask.d.ts +1 -1
- package/dist/features/tasks/execute/resolveTask.d.ts.map +1 -1
- package/dist/features/tasks/execute/resolveTask.js +3 -1
- package/dist/features/tasks/execute/resolveTask.js.map +1 -1
- package/dist/features/tasks/execute/runMeta.d.ts +1 -0
- package/dist/features/tasks/execute/runMeta.d.ts.map +1 -1
- package/dist/features/tasks/execute/runMeta.js +5 -0
- package/dist/features/tasks/execute/runMeta.js.map +1 -1
- package/dist/features/tasks/execute/taskExecution.d.ts.map +1 -1
- package/dist/features/tasks/execute/taskExecution.js +12 -5
- package/dist/features/tasks/execute/taskExecution.js.map +1 -1
- package/dist/features/tasks/list/index.d.ts.map +1 -1
- package/dist/features/tasks/list/index.js +15 -9
- package/dist/features/tasks/list/index.js.map +1 -1
- package/dist/features/tasks/list/listNonInteractive.d.ts.map +1 -1
- package/dist/features/tasks/list/listNonInteractive.js +8 -16
- package/dist/features/tasks/list/listNonInteractive.js.map +1 -1
- package/dist/features/tasks/list/taskActionTarget.d.ts +1 -0
- package/dist/features/tasks/list/taskActionTarget.d.ts.map +1 -1
- package/dist/features/tasks/list/taskActionTarget.js +43 -2
- package/dist/features/tasks/list/taskActionTarget.js.map +1 -1
- package/dist/features/tasks/list/taskActions.d.ts +1 -1
- package/dist/features/tasks/list/taskActions.d.ts.map +1 -1
- package/dist/features/tasks/list/taskActions.js +1 -1
- package/dist/features/tasks/list/taskActions.js.map +1 -1
- package/dist/features/tasks/list/taskBranchLifecycleActions.d.ts.map +1 -1
- package/dist/features/tasks/list/taskBranchLifecycleActions.js +24 -3
- package/dist/features/tasks/list/taskBranchLifecycleActions.js.map +1 -1
- package/dist/features/tasks/list/taskDiffActions.d.ts +2 -1
- package/dist/features/tasks/list/taskDiffActions.d.ts.map +1 -1
- package/dist/features/tasks/list/taskDiffActions.js +22 -9
- package/dist/features/tasks/list/taskDiffActions.js.map +1 -1
- package/dist/features/tasks/list/taskForceFailActions.d.ts +3 -0
- package/dist/features/tasks/list/taskForceFailActions.d.ts.map +1 -0
- package/dist/features/tasks/list/taskForceFailActions.js +67 -0
- package/dist/features/tasks/list/taskForceFailActions.js.map +1 -0
- package/dist/features/tasks/list/taskSyncAction.d.ts.map +1 -1
- package/dist/features/tasks/list/taskSyncAction.js +30 -10
- package/dist/features/tasks/list/taskSyncAction.js.map +1 -1
- package/dist/infra/codex/client.d.ts.map +1 -1
- package/dist/infra/codex/client.js +7 -5
- package/dist/infra/codex/client.js.map +1 -1
- package/dist/infra/config/loaders/pieceParser.d.ts.map +1 -1
- package/dist/infra/config/loaders/pieceParser.js +30 -3
- package/dist/infra/config/loaders/pieceParser.js.map +1 -1
- package/dist/infra/config/providerModelCompatibility.d.ts +1 -6
- package/dist/infra/config/providerModelCompatibility.d.ts.map +1 -1
- package/dist/infra/config/providerModelCompatibility.js +1 -19
- package/dist/infra/config/providerModelCompatibility.js.map +1 -1
- package/dist/infra/task/autoCommit.js +3 -3
- package/dist/infra/task/autoCommit.js.map +1 -1
- package/dist/infra/task/clone.d.ts +1 -1
- package/dist/infra/task/clone.d.ts.map +1 -1
- package/dist/infra/task/clone.js +1 -1
- package/dist/infra/task/clone.js.map +1 -1
- package/dist/infra/task/git.d.ts +1 -0
- package/dist/infra/task/git.d.ts.map +1 -1
- package/dist/infra/task/git.js +7 -0
- package/dist/infra/task/git.js.map +1 -1
- package/dist/infra/task/index.d.ts +2 -2
- package/dist/infra/task/index.d.ts.map +1 -1
- package/dist/infra/task/index.js +2 -2
- package/dist/infra/task/index.js.map +1 -1
- package/dist/infra/task/mapper.d.ts.map +1 -1
- package/dist/infra/task/mapper.js +3 -0
- package/dist/infra/task/mapper.js.map +1 -1
- package/dist/infra/task/runner.d.ts +7 -1
- package/dist/infra/task/runner.d.ts.map +1 -1
- package/dist/infra/task/runner.js +6 -0
- package/dist/infra/task/runner.js.map +1 -1
- package/dist/infra/task/schema.d.ts +6 -0
- package/dist/infra/task/schema.d.ts.map +1 -1
- package/dist/infra/task/schema.js +1 -0
- package/dist/infra/task/schema.js.map +1 -1
- package/dist/infra/task/taskLifecycleService.d.ts +7 -1
- package/dist/infra/task/taskLifecycleService.d.ts.map +1 -1
- package/dist/infra/task/taskLifecycleService.js +45 -0
- package/dist/infra/task/taskLifecycleService.js.map +1 -1
- package/dist/infra/task/types.d.ts +3 -0
- package/dist/infra/task/types.d.ts.map +1 -1
- package/dist/shared/utils/providerModel.js +1 -1
- package/dist/shared/utils/providerModel.js.map +1 -1
- package/package.json +1 -1
|
@@ -4,9 +4,14 @@ import { detectDefaultBranch } from '../../../infra/task/index.js';
|
|
|
4
4
|
import { selectOption } from '../../../shared/prompt/index.js';
|
|
5
5
|
import { info, warn, header, blankLine } from '../../../shared/ui/index.js';
|
|
6
6
|
import { createLogger, getErrorMessage } from '../../../shared/utils/index.js';
|
|
7
|
-
import { resolveTargetBranch, resolveTargetInstruction } from './taskActionTarget.js';
|
|
7
|
+
import { ensureRootBranchReady, resolveTargetBranch, resolveTargetInstruction, } from './taskActionTarget.js';
|
|
8
8
|
const log = createLogger('list-tasks');
|
|
9
|
-
export function showFullDiff(cwd,
|
|
9
|
+
export function showFullDiff(cwd, target) {
|
|
10
|
+
if (!ensureRootBranchReady(cwd, target, 'full diff')) {
|
|
11
|
+
warn('Could not display diff');
|
|
12
|
+
return;
|
|
13
|
+
}
|
|
14
|
+
const branch = resolveTargetBranch(target);
|
|
10
15
|
const defaultBranch = detectDefaultBranch(cwd);
|
|
11
16
|
try {
|
|
12
17
|
const result = spawnSync('git', ['diff', '--color=always', `${defaultBranch}...${branch}`], {
|
|
@@ -27,15 +32,13 @@ export function showFullDiff(cwd, branch) {
|
|
|
27
32
|
});
|
|
28
33
|
}
|
|
29
34
|
}
|
|
30
|
-
export
|
|
35
|
+
export function showDiffStatForTask(cwd, target) {
|
|
36
|
+
if (!ensureRootBranchReady(cwd, target, 'diff stat')) {
|
|
37
|
+
warn('Could not generate diff stat');
|
|
38
|
+
return;
|
|
39
|
+
}
|
|
31
40
|
const branch = resolveTargetBranch(target);
|
|
32
|
-
const instruction = resolveTargetInstruction(target);
|
|
33
41
|
const defaultBranch = detectDefaultBranch(cwd);
|
|
34
|
-
header(branch);
|
|
35
|
-
if (instruction) {
|
|
36
|
-
info(chalk.dim(` ${instruction}`));
|
|
37
|
-
}
|
|
38
|
-
blankLine();
|
|
39
42
|
try {
|
|
40
43
|
const stat = execFileSync('git', ['diff', '--stat', `${defaultBranch}...${branch}`], { cwd, encoding: 'utf-8', stdio: 'pipe' });
|
|
41
44
|
info(stat);
|
|
@@ -48,6 +51,16 @@ export async function showDiffAndPromptActionForTask(cwd, target) {
|
|
|
48
51
|
error: getErrorMessage(err),
|
|
49
52
|
});
|
|
50
53
|
}
|
|
54
|
+
}
|
|
55
|
+
export async function showDiffAndPromptActionForTask(cwd, target) {
|
|
56
|
+
const branch = resolveTargetBranch(target);
|
|
57
|
+
const instruction = resolveTargetInstruction(target);
|
|
58
|
+
header(branch);
|
|
59
|
+
if (instruction) {
|
|
60
|
+
info(chalk.dim(` ${instruction}`));
|
|
61
|
+
}
|
|
62
|
+
blankLine();
|
|
63
|
+
showDiffStatForTask(cwd, target);
|
|
51
64
|
return await selectOption(`Action for ${branch}:`, [
|
|
52
65
|
{ label: 'View diff', value: 'diff', description: 'Show full diff in pager' },
|
|
53
66
|
{ label: 'Instruct', value: 'instruct', description: 'Craft additional instructions and requeue this task' },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"taskDiffActions.js","sourceRoot":"","sources":["../../../../src/features/tasks/list/taskDiffActions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAC/E,OAAO,
|
|
1
|
+
{"version":3,"file":"taskDiffActions.js","sourceRoot":"","sources":["../../../../src/features/tasks/list/taskDiffActions.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"taskForceFailActions.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/list/taskForceFailActions.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAgDjE,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,YAAY,EAClB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,OAAO,CAAC,CA2BlB"}
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import { resolve } from 'node:path';
|
|
2
|
+
import { findRunningStepByRunSlug } from '../../../core/piece/run/run-meta.js';
|
|
3
|
+
import { resolveCloneBaseDir } from '../../../infra/task/clone.js';
|
|
4
|
+
import { TaskRunner, isStaleRunningTask } from '../../../infra/task/index.js';
|
|
5
|
+
import { confirm } from '../../../shared/prompt/index.js';
|
|
6
|
+
import { success, error as logError } from '../../../shared/ui/index.js';
|
|
7
|
+
import { createLogger, getErrorMessage, isPathInside } from '../../../shared/utils/index.js';
|
|
8
|
+
const log = createLogger('list-tasks');
|
|
9
|
+
const FORCE_FAIL_ERROR = 'Manually marked as failed';
|
|
10
|
+
function resolveSafeWorktreePath(projectDir, worktreePath) {
|
|
11
|
+
if (!worktreePath) {
|
|
12
|
+
return undefined;
|
|
13
|
+
}
|
|
14
|
+
const cloneBaseDir = resolveCloneBaseDir(projectDir);
|
|
15
|
+
const fallbackCloneBaseDir = resolve(projectDir, '.takt', 'worktrees');
|
|
16
|
+
if (isPathInside(cloneBaseDir, worktreePath) || isPathInside(fallbackCloneBaseDir, worktreePath)) {
|
|
17
|
+
return worktreePath;
|
|
18
|
+
}
|
|
19
|
+
return undefined;
|
|
20
|
+
}
|
|
21
|
+
function resolveCurrentStep(projectDir, task) {
|
|
22
|
+
const runSlug = task.runSlug;
|
|
23
|
+
if (!runSlug) {
|
|
24
|
+
return undefined;
|
|
25
|
+
}
|
|
26
|
+
const worktreePath = resolveSafeWorktreePath(projectDir, task.worktreePath);
|
|
27
|
+
if (worktreePath) {
|
|
28
|
+
const worktreeStep = findRunningStepByRunSlug(worktreePath, runSlug);
|
|
29
|
+
if (worktreeStep) {
|
|
30
|
+
return worktreeStep;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
return findRunningStepByRunSlug(projectDir, runSlug);
|
|
34
|
+
}
|
|
35
|
+
function buildConfirmationMessage(task) {
|
|
36
|
+
if (isStaleRunningTask(task.ownerPid)) {
|
|
37
|
+
return `Mark running task "${task.name}" as failed?`;
|
|
38
|
+
}
|
|
39
|
+
return `Process ${task.ownerPid} may still be running. Mark "${task.name}" as failed anyway?`;
|
|
40
|
+
}
|
|
41
|
+
export async function forceFailRunningTask(task, projectDir) {
|
|
42
|
+
if (task.kind !== 'running') {
|
|
43
|
+
throw new Error(`forceFailRunningTask requires running task. received: ${task.kind}`);
|
|
44
|
+
}
|
|
45
|
+
const confirmed = await confirm(buildConfirmationMessage(task), false);
|
|
46
|
+
if (!confirmed) {
|
|
47
|
+
return false;
|
|
48
|
+
}
|
|
49
|
+
try {
|
|
50
|
+
const movement = resolveCurrentStep(projectDir, task);
|
|
51
|
+
const runner = new TaskRunner(projectDir);
|
|
52
|
+
runner.forceFailRunningTask(task.name, {
|
|
53
|
+
movement,
|
|
54
|
+
error: FORCE_FAIL_ERROR,
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
catch (err) {
|
|
58
|
+
const message = getErrorMessage(err);
|
|
59
|
+
logError(`Failed to mark running task "${task.name}" as failed: ${message}`);
|
|
60
|
+
log.error('Failed to force-fail running task', { name: task.name, filePath: task.filePath, error: message });
|
|
61
|
+
return false;
|
|
62
|
+
}
|
|
63
|
+
success(`Marked running task as failed: ${task.name}`);
|
|
64
|
+
log.info('Force-failed running task', { name: task.name, filePath: task.filePath });
|
|
65
|
+
return true;
|
|
66
|
+
}
|
|
67
|
+
//# sourceMappingURL=taskForceFailActions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"taskForceFailActions.js","sourceRoot":"","sources":["../../../../src/features/tasks/list/taskForceFailActions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"taskSyncAction.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/list/taskSyncAction.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"taskSyncAction.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/list/taskSyncAction.ts"],"names":[],"mappings":"AASA,OAAO,EACL,KAAK,kBAAkB,EAKxB,MAAM,uBAAuB,CAAC;AAuB/B,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,kBAAkB,GACzB,OAAO,CAAC,OAAO,CAAC,CAkFlB"}
|
|
@@ -3,11 +3,28 @@ import { success, error as logError, StreamDisplay } from '../../../shared/ui/in
|
|
|
3
3
|
import { createLogger, getErrorMessage } from '../../../shared/utils/index.js';
|
|
4
4
|
import { getProvider } from '../../../infra/providers/index.js';
|
|
5
5
|
import { resolveConfigValues } from '../../../infra/config/index.js';
|
|
6
|
+
import { resolveAssistantProviderModelFromConfig } from '../../../core/config/provider-resolution.js';
|
|
6
7
|
import { loadTemplate } from '../../../shared/prompts/index.js';
|
|
7
8
|
import { getLanguage } from '../../../infra/config/index.js';
|
|
9
|
+
import { resolveAssistantConfigLayers } from '../../interactive/assistantConfig.js';
|
|
8
10
|
import { resolveTargetBranch, resolveTargetInstruction, validateWorktreeTarget, pushWorktreeToOrigin, } from './taskActionTarget.js';
|
|
9
11
|
const log = createLogger('list-tasks');
|
|
10
12
|
const SYNC_REF = 'refs/remotes/root/sync-target';
|
|
13
|
+
function getGitCommandErrorDetail(err) {
|
|
14
|
+
if (typeof err === 'object' && err !== null && 'stderr' in err) {
|
|
15
|
+
const stderr = err.stderr;
|
|
16
|
+
if (typeof stderr === 'string' && stderr.trim()) {
|
|
17
|
+
return stderr.trim();
|
|
18
|
+
}
|
|
19
|
+
if (Buffer.isBuffer(stderr)) {
|
|
20
|
+
const text = stderr.toString('utf-8').trim();
|
|
21
|
+
if (text) {
|
|
22
|
+
return text;
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
return getErrorMessage(err);
|
|
27
|
+
}
|
|
11
28
|
export async function syncBranchWithRoot(projectDir, target) {
|
|
12
29
|
if (!validateWorktreeTarget(target, 'Sync')) {
|
|
13
30
|
return false;
|
|
@@ -23,7 +40,7 @@ export async function syncBranchWithRoot(projectDir, target) {
|
|
|
23
40
|
log.info('Fetched root HEAD into sync-target ref', { worktreePath, projectDir });
|
|
24
41
|
}
|
|
25
42
|
catch (err) {
|
|
26
|
-
const msg =
|
|
43
|
+
const msg = getGitCommandErrorDetail(err);
|
|
27
44
|
logError(`Failed to fetch from root: ${msg}`);
|
|
28
45
|
log.error('git fetch failed', { worktreePath, projectDir, error: msg });
|
|
29
46
|
return false;
|
|
@@ -40,7 +57,7 @@ export async function syncBranchWithRoot(projectDir, target) {
|
|
|
40
57
|
mergeConflict = true;
|
|
41
58
|
log.info('Merge conflict detected, attempting AI resolution', {
|
|
42
59
|
worktreePath,
|
|
43
|
-
error:
|
|
60
|
+
error: getGitCommandErrorDetail(err),
|
|
44
61
|
});
|
|
45
62
|
}
|
|
46
63
|
if (!mergeConflict) {
|
|
@@ -55,17 +72,18 @@ export async function syncBranchWithRoot(projectDir, target) {
|
|
|
55
72
|
const originalInstruction = resolveTargetInstruction(target);
|
|
56
73
|
const systemPrompt = loadTemplate('sync_conflict_resolver_system_prompt', lang);
|
|
57
74
|
const prompt = loadTemplate('sync_conflict_resolver_message', lang, { originalInstruction });
|
|
58
|
-
const config = resolveConfigValues(projectDir, ['
|
|
59
|
-
|
|
75
|
+
const config = resolveConfigValues(projectDir, ['syncConflictResolver']);
|
|
76
|
+
const resolvedProviderModel = resolveAssistantProviderModelFromConfig(resolveAssistantConfigLayers(projectDir));
|
|
77
|
+
if (!resolvedProviderModel.provider) {
|
|
60
78
|
throw new Error('No provider configured. Set "provider" in ~/.takt/config.yaml');
|
|
61
79
|
}
|
|
62
|
-
const providerType =
|
|
80
|
+
const providerType = resolvedProviderModel.provider;
|
|
63
81
|
const provider = getProvider(providerType);
|
|
64
82
|
const agent = provider.setup({ name: 'conflict-resolver', systemPrompt });
|
|
65
83
|
const onPermissionRequest = config.syncConflictResolver?.autoApproveTools ? autoApproveBash : undefined;
|
|
66
84
|
const response = await agent.call(prompt, {
|
|
67
85
|
cwd: worktreePath,
|
|
68
|
-
model:
|
|
86
|
+
model: resolvedProviderModel.model,
|
|
69
87
|
permissionMode: 'edit',
|
|
70
88
|
onPermissionRequest,
|
|
71
89
|
onStream: new StreamDisplay('conflict-resolver', false).createHandler(),
|
|
@@ -92,8 +110,9 @@ function pushSynced(worktreePath, projectDir, target) {
|
|
|
92
110
|
pushWorktreeToOrigin(worktreePath, projectDir, branch);
|
|
93
111
|
}
|
|
94
112
|
catch (err) {
|
|
95
|
-
|
|
96
|
-
|
|
113
|
+
const error = getGitCommandErrorDetail(err);
|
|
114
|
+
logError(`Push failed after sync: ${error}`);
|
|
115
|
+
log.error('pushWorktreeToOrigin failed', { worktreePath, projectDir, branch, error });
|
|
97
116
|
return false;
|
|
98
117
|
}
|
|
99
118
|
return true;
|
|
@@ -108,8 +127,9 @@ function abortMerge(worktreePath) {
|
|
|
108
127
|
log.info('git merge --abort completed', { worktreePath });
|
|
109
128
|
}
|
|
110
129
|
catch (err) {
|
|
111
|
-
|
|
112
|
-
|
|
130
|
+
const error = getGitCommandErrorDetail(err);
|
|
131
|
+
logError(`Failed to abort merge: ${error}`);
|
|
132
|
+
log.error('git merge --abort failed', { worktreePath, error });
|
|
113
133
|
}
|
|
114
134
|
}
|
|
115
135
|
//# sourceMappingURL=taskSyncAction.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"taskSyncAction.js","sourceRoot":"","sources":["../../../../src/features/tasks/list/taskSyncAction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,KAAK,IAAI,QAAQ,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACxF,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAqB,MAAM,mCAAmC,CAAC;AACnF,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAEL,mBAAmB,EACnB,wBAAwB,EACxB,sBAAsB,EACtB,oBAAoB,GACrB,MAAM,uBAAuB,CAAC;AAE/B,MAAM,GAAG,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;AAEvC,MAAM,QAAQ,GAAG,+BAA+B,CAAC;AAEjD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,UAAkB,EAClB,MAA0B;IAE1B,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;QAC5C,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;IAEzC,+EAA+E;IAC/E,IAAI,CAAC;QACH,YAAY,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,QAAQ,EAAE,CAAC,EAAE;YAC7D,GAAG,EAAE,YAAY;YACjB,QAAQ,EAAE,OAAO;YACjB,KAAK,EAAE,MAAM;SACd,CAAC,CAAC;QACH,GAAG,CAAC,IAAI,CAAC,wCAAwC,EAAE,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC,CAAC;IACnF,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,GAAG,GAAG,
|
|
1
|
+
{"version":3,"file":"taskSyncAction.js","sourceRoot":"","sources":["../../../../src/features/tasks/list/taskSyncAction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/infra/codex/client.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,aAAa,EAAyB,MAAM,4BAA4B,CAAC;AAEvF,OAAO,EAAyB,KAAK,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAa1E,YAAY,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/infra/codex/client.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,aAAa,EAAyB,MAAM,4BAA4B,CAAC;AAEvF,OAAO,EAAyB,KAAK,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAa1E,YAAY,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AA+DnD;;;;;GAKG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,gBAAgB;YASV,iBAAiB;IA4B/B,sCAAsC;IAChC,IAAI,CACR,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,aAAa,CAAC;IAgQzB,4EAA4E;IACtE,UAAU,CACd,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,aAAa,CAAC;CAM1B;AAID,wBAAsB,SAAS,CAC7B,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,aAAa,CAAC,CAExB;AAED,wBAAsB,eAAe,CACnC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,aAAa,CAAC,CAExB"}
|
|
@@ -11,8 +11,9 @@ import { createStreamTrackingState, extractThreadId, emitInit, emitResult, emitC
|
|
|
11
11
|
const log = createLogger('codex-sdk');
|
|
12
12
|
const CODEX_STREAM_IDLE_TIMEOUT_MS = 10 * 60 * 1000;
|
|
13
13
|
const CODEX_STREAM_ABORTED_MESSAGE = 'Codex execution aborted';
|
|
14
|
-
const
|
|
15
|
-
const
|
|
14
|
+
const CODEX_RETRY_MAX_RETRIES = 8;
|
|
15
|
+
const CODEX_RETRY_TOTAL_ATTEMPTS = CODEX_RETRY_MAX_RETRIES + 1;
|
|
16
|
+
const CODEX_RETRY_BASE_DELAY_MS = 1000;
|
|
16
17
|
const CODEX_RETRYABLE_ERROR_PATTERNS = [
|
|
17
18
|
'stream disconnected before completion',
|
|
18
19
|
'transport error',
|
|
@@ -22,6 +23,7 @@ const CODEX_RETRYABLE_ERROR_PATTERNS = [
|
|
|
22
23
|
'etimedout',
|
|
23
24
|
'eai_again',
|
|
24
25
|
'fetch failed',
|
|
26
|
+
'at capacity',
|
|
25
27
|
];
|
|
26
28
|
function toNumber(value) {
|
|
27
29
|
return typeof value === 'number' && Number.isFinite(value) ? value : undefined;
|
|
@@ -114,7 +116,7 @@ export class CodexClient {
|
|
|
114
116
|
const fullPrompt = options.systemPrompt
|
|
115
117
|
? `${options.systemPrompt}\n\n${prompt}`
|
|
116
118
|
: prompt;
|
|
117
|
-
for (let attempt = 1; attempt <=
|
|
119
|
+
for (let attempt = 1; attempt <= CODEX_RETRY_TOTAL_ATTEMPTS; attempt++) {
|
|
118
120
|
const codexClientOptions = {
|
|
119
121
|
...(options.openaiApiKey ? { apiKey: options.openaiApiKey } : {}),
|
|
120
122
|
...(options.codexPathOverride ? { codexPathOverride: options.codexPathOverride } : {}),
|
|
@@ -260,7 +262,7 @@ export class CodexClient {
|
|
|
260
262
|
if (!success) {
|
|
261
263
|
const message = failureMessage || 'Codex execution failed';
|
|
262
264
|
const retriable = this.isRetriableError(message, streamAbortController.signal.aborted, abortCause);
|
|
263
|
-
if (retriable && attempt
|
|
265
|
+
if (retriable && attempt <= CODEX_RETRY_MAX_RETRIES) {
|
|
264
266
|
log.info('Retrying Codex call after transient failure', { agentType, attempt, message });
|
|
265
267
|
threadId = currentThreadId;
|
|
266
268
|
await this.waitForRetryDelay(attempt, options.abortSignal);
|
|
@@ -301,7 +303,7 @@ export class CodexClient {
|
|
|
301
303
|
: message;
|
|
302
304
|
diagRef?.onCompleted(abortCause === 'timeout' ? 'timeout' : streamAbortController.signal.aborted ? 'abort' : 'error', errorMessage);
|
|
303
305
|
const retriable = this.isRetriableError(errorMessage, streamAbortController.signal.aborted, abortCause);
|
|
304
|
-
if (retriable && attempt
|
|
306
|
+
if (retriable && attempt <= CODEX_RETRY_MAX_RETRIES) {
|
|
305
307
|
log.info('Retrying Codex call after transient exception', { agentType, attempt, errorMessage });
|
|
306
308
|
threadId = currentThreadId;
|
|
307
309
|
await this.waitForRetryDelay(attempt, options.abortSignal);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/infra/codex/client.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/infra/codex/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pieceParser.d.ts","sourceRoot":"","sources":["../../../../src/infra/config/loaders/pieceParser.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAOH,OAAO,KAAK,EAAE,WAAW,EAAiL,MAAM,+BAA+B,CAAC;AAGhP,OAAO,EAEL,KAAK,sBAAsB,EAO5B,MAAM,wBAAwB,CAAC;AAMhC,OAAO,KAAK,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,cAAc,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;
|
|
1
|
+
{"version":3,"file":"pieceParser.d.ts","sourceRoot":"","sources":["../../../../src/infra/config/loaders/pieceParser.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAOH,OAAO,KAAK,EAAE,WAAW,EAAiL,MAAM,+BAA+B,CAAC;AAGhP,OAAO,EAEL,KAAK,sBAAsB,EAO5B,MAAM,wBAAwB,CAAC;AAMhC,OAAO,KAAK,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,cAAc,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;AA0ZlJ,wDAAwD;AACxD,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,sBAAsB,EAChC,gBAAgB,CAAC,EAAE,cAAc,EACjC,eAAe,CAAC,EAAE,cAAc,EAChC,yBAAyB,CAAC,EAAE,yBAAyB,EACrD,mBAAmB,CAAC,EAAE,mBAAmB,EACzC,qBAAqB,CAAC,EAAE,qBAAqB,GAC5C,WAAW,CA+Db;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,WAAW,CAqCnF"}
|
|
@@ -17,7 +17,9 @@ import { applyQualityGateOverrides } from './qualityGateOverrides.js';
|
|
|
17
17
|
import { loadProjectConfig } from '../project/projectConfig.js';
|
|
18
18
|
import { loadGlobalConfig } from '../global/globalConfig.js';
|
|
19
19
|
import { normalizeConfigProviderReferenceDetailed } from '../providerReference.js';
|
|
20
|
+
import { validateProviderModelCompatibility } from '../providerModelCompatibility.js';
|
|
20
21
|
import { mergeProviderOptions } from '../providerOptions.js';
|
|
22
|
+
import { resolveLoopMonitorJudgeProviderModel } from '../../../core/piece/provider-resolution.js';
|
|
21
23
|
import { warnLegacyWorkflowYamlKeysOncePerProcess, } from '../legacy-workflow-key-deprecation.js';
|
|
22
24
|
function normalizeProviderReference(provider, model, providerOptions) {
|
|
23
25
|
return normalizeConfigProviderReferenceDetailed(provider, model, providerOptions);
|
|
@@ -233,27 +235,52 @@ function normalizeStepFromRaw(step, pieceDir, sections, inheritedProvider, inher
|
|
|
233
235
|
/** Normalize a raw loop monitor judge from YAML into internal format. */
|
|
234
236
|
function normalizeLoopMonitorJudge(raw, pieceDir, sections, context) {
|
|
235
237
|
const { personaSpec, personaPath } = resolvePersona(raw.persona, sections, pieceDir, context);
|
|
238
|
+
const normalizedProvider = normalizeProviderReference(raw.provider, raw.model, undefined);
|
|
236
239
|
const resolvedInstruction = raw.instruction
|
|
237
240
|
? resolveRefToContent(raw.instruction, sections.resolvedInstructions, pieceDir, 'instructions', context)
|
|
238
241
|
: undefined;
|
|
239
242
|
return {
|
|
240
243
|
persona: personaSpec,
|
|
241
244
|
personaPath,
|
|
245
|
+
provider: normalizedProvider.provider,
|
|
246
|
+
model: normalizedProvider.model,
|
|
247
|
+
providerOptions: normalizedProvider.providerOptions,
|
|
242
248
|
instruction: resolvedInstruction,
|
|
243
249
|
rules: raw.rules.map((r) => ({ condition: r.condition, next: r.next })),
|
|
244
250
|
};
|
|
245
251
|
}
|
|
252
|
+
function validateLoopMonitorJudgeResolvedProviderModel(monitor, movements) {
|
|
253
|
+
const triggeringMovementName = monitor.cycle[monitor.cycle.length - 1];
|
|
254
|
+
if (!triggeringMovementName) {
|
|
255
|
+
throw new Error('Invalid loop_monitor: cycle must contain at least one movement');
|
|
256
|
+
}
|
|
257
|
+
const triggeringMovement = movements.find((movement) => movement.name === triggeringMovementName);
|
|
258
|
+
if (!triggeringMovement) {
|
|
259
|
+
throw new Error(`Invalid loop_monitor: cycle references unknown movement "${triggeringMovementName}"`);
|
|
260
|
+
}
|
|
261
|
+
const { provider: resolvedProvider, model: resolvedModel } = resolveLoopMonitorJudgeProviderModel({
|
|
262
|
+
judge: monitor.judge,
|
|
263
|
+
triggeringStep: triggeringMovement,
|
|
264
|
+
});
|
|
265
|
+
validateProviderModelCompatibility(resolvedProvider, resolvedModel, {
|
|
266
|
+
modelFieldName: 'Configuration error: loop_monitors.judge.model',
|
|
267
|
+
});
|
|
268
|
+
}
|
|
246
269
|
/**
|
|
247
270
|
* Normalize raw loop monitors from YAML into internal format.
|
|
248
271
|
*/
|
|
249
|
-
function normalizeLoopMonitors(raw, pieceDir, sections, context) {
|
|
272
|
+
function normalizeLoopMonitors(raw, movements, pieceDir, sections, context) {
|
|
250
273
|
if (!raw || raw.length === 0)
|
|
251
274
|
return undefined;
|
|
252
|
-
|
|
275
|
+
const monitors = raw.map((monitor) => ({
|
|
253
276
|
cycle: monitor.cycle,
|
|
254
277
|
threshold: monitor.threshold,
|
|
255
278
|
judge: normalizeLoopMonitorJudge(monitor.judge, pieceDir, sections, context),
|
|
256
279
|
}));
|
|
280
|
+
for (const monitor of monitors) {
|
|
281
|
+
validateLoopMonitorJudgeResolvedProviderModel(monitor, movements);
|
|
282
|
+
}
|
|
283
|
+
return monitors;
|
|
257
284
|
}
|
|
258
285
|
/** Convert raw YAML piece config to internal format. */
|
|
259
286
|
export function normalizePieceConfig(raw, pieceDir, context, projectOverrides, globalOverrides, pieceRuntimePreparePolicy, pieceArpeggioPolicy, pieceMcpServersPolicy) {
|
|
@@ -292,7 +319,7 @@ export function normalizePieceConfig(raw, pieceDir, context, projectOverrides, g
|
|
|
292
319
|
movements,
|
|
293
320
|
initialMovement,
|
|
294
321
|
maxMovements: parsed.max_movements,
|
|
295
|
-
loopMonitors: normalizeLoopMonitors(parsed.loop_monitors, pieceDir, sections, context),
|
|
322
|
+
loopMonitors: normalizeLoopMonitors(parsed.loop_monitors, movements, pieceDir, sections, context),
|
|
296
323
|
interactiveMode: parsed.interactive_mode,
|
|
297
324
|
};
|
|
298
325
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pieceParser.js","sourceRoot":"","sources":["../../../../src/infra/config/loaders/pieceParser.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,MAAM,CAAC;AAE1C,OAAO,EAAE,oBAAoB,EAA0B,MAAM,+BAA+B,CAAC;AAE7F,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAGL,mBAAmB,EACnB,cAAc,EACd,iBAAiB,EACjB,yBAAyB,EACzB,cAAc,EACd,cAAc,GACf,MAAM,wBAAwB,CAAC;AAIhC,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,wCAAwC,EAAgC,MAAM,yBAAyB,CAAC;AACjH,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EACL,wCAAwC,GACzC,MAAM,uCAAuC,CAAC;AAI/C,SAAS,0BAA0B,CACjC,QAA8B,EAC9B,KAAuB,EACvB,eAA4C;IAO5C,OAAO,wCAAwC,CAC7C,QAA2E,EAC3E,KAAK,EACL,eAAsD,CACvD,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;GAWG;AACH,SAAS,wBAAwB,CAC/B,GAA0G,EAC1G,QAAgB,EAChB,qBAA8C,EAC9C,OAAgC;IAEhC,IAAI,GAAG,EAAE,MAAM,IAAI,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAErE,MAAM,MAAM,GAAyB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAC5D,MAAM,cAAc,GAAG,mBAAmB,CAAC,KAAK,CAAC,MAAM,EAAE,qBAAqB,EAAE,QAAQ,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAC;QACvH,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,6CAA6C,KAAK,CAAC,MAAM,iBAAiB,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC;QAC3G,CAAC;QAED,IAAI,aAAiC,CAAC;QACtC,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;YAChB,aAAa,GAAG,mBAAmB,CAAC,KAAK,CAAC,KAAK,EAAE,qBAAqB,EAAE,QAAQ,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAC;YAC/G,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,MAAM,IAAI,KAAK,CAAC,4CAA4C,KAAK,CAAC,KAAK,iBAAiB,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC;YACzG,CAAC;QACH,CAAC;QAED,OAAO;YACL,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,QAAQ,EAAE,KAAK,CAAC,SAAS,IAAI,IAAI;YACjC,MAAM,EAAE,cAAc;YACtB,KAAK,EAAE,aAAa;SACrB,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;AAChD,CAAC;AAED,sDAAsD;AACtD,MAAM,kBAAkB,GAAG,gBAAgB,CAAC;AAE5C,4EAA4E;AAC5E,MAAM,yBAAyB,GAAG,qBAAqB,CAAC;AAExD;;;;GAIG;AACH,SAAS,wBAAwB,CAAC,QAAgB;IAChD,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,MAAM,KAAK,GAAG,YAAY,CAAC;IAC3B,IAAI,KAA6B,CAAC;IAElC,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QAC/C,IAAI,KAAK,CAAC,CAAC,CAAC;YAAE,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,CAAC;IAED,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,uCAAuC,QAAQ,EAAE,CAAC,CAAC;IACrE,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED;;GAEG;AACH,SAAS,aAAa,CAAC,CAMtB;IACC,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;IAC1B,MAAM,OAAO,GAAG,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACtD,IAAI,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACjB,OAAO;YACL,SAAS,EAAE,CAAC,CAAC,SAAS;YACtB,IAAI;YACJ,QAAQ,EAAE,CAAC,CAAC,QAAQ;YACpB,iBAAiB,EAAE,CAAC,CAAC,mBAAmB;YACxC,eAAe,EAAE,CAAC,CAAC,gBAAgB;YACnC,aAAa,EAAE,IAAI;YACnB,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC;SAC5B,CAAC;IACJ,CAAC;IAED,MAAM,QAAQ,GAAG,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC9D,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;QACjC,MAAM,UAAU,GAAG,wBAAwB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QACzD,6DAA6D;QAC7D,MAAM,sBAAsB,GAC1B,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAE,UAAU,CAAC,CAAC,CAAY,CAAC,CAAC,CAAC,UAAU,CAAC;QACnE,OAAO;YACL,SAAS,EAAE,CAAC,CAAC,SAAS;YACtB,IAAI;YACJ,QAAQ,EAAE,CAAC,CAAC,QAAQ;YACpB,iBAAiB,EAAE,CAAC,CAAC,mBAAmB;YACxC,eAAe,EAAE,CAAC,CAAC,gBAAgB;YACnC,oBAAoB,EAAE,IAAI;YAC1B,aAAa,EAAE,QAAQ,CAAC,CAAC,CAAkB;YAC3C,sBAAsB;SACvB,CAAC;IACJ,CAAC;IAED,OAAO;QACL,SAAS,EAAE,CAAC,CAAC,SAAS;QACtB,IAAI;QACJ,QAAQ,EAAE,CAAC,CAAC,QAAQ;QACpB,iBAAiB,EAAE,CAAC,CAAC,mBAAmB;QACxC,eAAe,EAAE,CAAC,CAAC,gBAAgB;KACpC,CAAC;AACJ,CAAC;AAED,oEAAoE;AACpE,SAAS,iBAAiB,CACxB,GAAwB,EACxB,QAAgB;IAEhB,IAAI,CAAC,GAAG;QAAE,OAAO,SAAS,CAAC;IAE3B,MAAM,KAAK,GAAgC,GAAG,CAAC,KAAK;QAClD,CAAC,CAAC;YACE,QAAQ,EAAE,GAAG,CAAC,KAAK,CAAC,QAAQ;YAC5B,SAAS,EAAE,GAAG,CAAC,KAAK,CAAC,SAAS;YAC9B,QAAQ,EAAE,GAAG,CAAC,KAAK,CAAC,SAAS;YAC7B,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;SACrE;QACH,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;IAE3B,OAAO;QACL,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,UAAU,EAAE,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,WAAW,CAAC;QAC9C,SAAS,EAAE,GAAG,CAAC,UAAU;QACzB,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,YAAY,EAAE,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC;QAC7C,KAAK;QACL,UAAU,EAAE,GAAG,CAAC,WAAW;QAC3B,YAAY,EAAE,GAAG,CAAC,cAAc;QAChC,UAAU,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS;KAC7E,CAAC;AACJ,CAAC;AAED,uEAAuE;AACvE,SAAS,mBAAmB,CAC1B,GAA2B,EAC3B,QAAgB,EAChB,QAAuB,EACvB,OAAgC;IAEhC,IAAI,CAAC,GAAG;QAAE,OAAO,SAAS,CAAC;IAE3B,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,cAAc,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC9F,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,eAAe,EAAE,GAAG,cAAc,CAAC,GAAG,CAAC,YAAY,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAEjI,OAAO;QACL,OAAO,EAAE,WAAW;QACpB,WAAW;QACX,QAAQ,EAAE,GAAG,CAAC,SAAS;QACvB,eAAe,EAAE,GAAG,CAAC,gBAAgB;QACrC,SAAS,EAAE,GAAG,CAAC,UAAU;QACzB,WAAW;QACX,eAAe;QACf,gBAAgB,EAAE,GAAG,CAAC,kBAAkB;QACxC,QAAQ,EAAE,GAAG,CAAC,SAAS;QACvB,kBAAkB,EAAE,GAAG,CAAC,oBAAoB;KAC7C,CAAC;AACJ,CAAC;AAED,+DAA+D;AAC/D,SAAS,oBAAoB,CAC3B,IAAa,EACb,QAAgB,EAChB,QAAuB,EACvB,iBAA6C,EAC7C,cAAuC,EACvC,wBAA2D,EAC3D,OAAgC,EAChC,gBAAiC,EACjC,eAAgC,EAChC,mBAAyC,EACzC,qBAA6C;IAE7C,MAAM,KAAK,GAA4B,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,aAAa,CAAC,CAAC;IAEtE,MAAM,UAAU,GAAI,IAAgC,CAAC,OAA6B,CAAC;IACnF,IAAI,UAAU,KAAK,SAAS,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/D,MAAM,IAAI,KAAK,CAAC,aAAa,IAAI,CAAC,IAAI,8BAA8B,CAAC,CAAC;IACxE,CAAC;IACD,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,cAAc,CAAC,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAE7F,MAAM,cAAc,GAAI,IAAgC,CAAC,YAAkC,CAAC;IAC5F,IAAI,cAAc,KAAK,SAAS,IAAI,cAAc,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvE,MAAM,IAAI,KAAK,CAAC,aAAa,IAAI,CAAC,IAAI,mCAAmC,CAAC,CAAC;IAC7E,CAAC;IACD,MAAM,WAAW,GAAG,cAAc,IAAI,SAAS,CAAC;IAChD,MAAM,kBAAkB,GAAG,WAAW,CAAC,CAAC,CAAC,yBAAyB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5F,MAAM,0BAA0B,GAAG,WAAW,IAAI,kBAAkB,IAAI,IAAI,CAAC,IAAI,CAAC;IAClF,MAAM,oBAAoB,GAAG,UAAU,EAAE,IAAI,EAAE,CAAC;IAChD,MAAM,kBAAkB,GAAG,oBAAoB;QAC7C,CAAC,CAAC,CAAC,cAAc,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,yBAAyB,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC;QACjH,CAAC,CAAC,SAAS,CAAC;IAEd,MAAM,SAAS,GAAI,IAAgC,CAAC,MAAuC,CAAC;IAC5F,MAAM,cAAc,GAAG,cAAc,CAAC,SAAS,EAAE,QAAQ,CAAC,gBAAgB,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IAE3G,MAAM,YAAY,GAAI,IAAgC,CAAC,SAA0C,CAAC;IAClG,MAAM,iBAAiB,GAAG,cAAc,CAAC,YAAY,EAAE,QAAQ,CAAC,iBAAiB,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IACnH,MAAM,kBAAkB,GAAG,0BAA0B,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAExG,MAAM,mBAAmB,GAAG,IAAI,CAAC,WAAW;QAC1C,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,oBAAoB,EAAE,QAAQ,EAAE,cAAc,EAAE,OAAO,CAAC;QACzG,CAAC,CAAC,SAAS,CAAC;IACd,qBAAqB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAC;IACrE,uBAAuB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE,qBAAqB,CAAC,CAAC;IAE5E,MAAM,MAAM,GAAkB;QAC5B,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,OAAO,EAAE,WAAW;QACpB,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,kBAAkB,EAAE,0BAA0B;QAC9C,WAAW;QACX,UAAU,EAAE,IAAI,CAAC,WAAW;QAC5B,QAAQ,EAAE,kBAAkB,CAAC,QAAQ,IAAI,iBAAiB;QAC1D,KAAK,EAAE,kBAAkB,CAAC,KAAK,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC;QACtG,sBAAsB,EAAE,IAAI,CAAC,wBAAwB;QACrD,eAAe,EAAE,oBAAoB,CAAC,wBAAwB,EAAE,kBAAkB,CAAC,eAAe,CAAC;QACnG,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,WAAW,EAAE,mBAAmB,IAAI,QAAQ;QAC5C,KAAK;QACL,eAAe,EAAE,wBAAwB,CAAC,IAAI,CAAC,gBAAgB,EAAE,QAAQ,EAAE,QAAQ,CAAC,qBAAqB,EAAE,OAAO,CAAC;QACnH,YAAY,EAAE,yBAAyB,CACrC,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,IAAI,EACT,kBAAkB,EAClB,gBAAgB,EAChB,eAAe,CAChB;QACD,oBAAoB,EAAE,IAAI,CAAC,sBAAsB,IAAI,IAAI;QACzD,cAAc;QACd,iBAAiB;KAClB,CAAC;IAEF,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9C,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAY,EAAE,EAAE,CACnD,oBAAoB,CAClB,GAAG,EACH,QAAQ,EACR,QAAQ,EACR,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,eAAe,EACtB,OAAO,EACP,gBAAgB,EAChB,eAAe,EACf,mBAAmB,EACnB,qBAAqB,CACtB,CACF,CAAC;QACF,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,EAAE,CAAC;YAC7B,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACxC,CAAC;IACH,CAAC;IAED,MAAM,cAAc,GAAG,iBAAiB,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAClE,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,CAAC,QAAQ,GAAG,cAAc,CAAC;IACnC,CAAC;IAED,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC5F,IAAI,gBAAgB,EAAE,CAAC;QACrB,MAAM,CAAC,UAAU,GAAG,gBAAgB,CAAC;IACvC,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,yEAAyE;AACzE,SAAS,yBAAyB,CAChC,GAAkG,EAClG,QAAgB,EAChB,QAAuB,EACvB,OAAgC;IAEhC,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,cAAc,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC9F,MAAM,mBAAmB,GAAG,GAAG,CAAC,WAAW;QACzC,CAAC,CAAC,mBAAmB,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,oBAAoB,EAAE,QAAQ,EAAE,cAAc,EAAE,OAAO,CAAC;QACxG,CAAC,CAAC,SAAS,CAAC;IAEd,OAAO;QACL,OAAO,EAAE,WAAW;QACpB,WAAW;QACX,WAAW,EAAE,mBAAmB;QAChC,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;KACxE,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAS,qBAAqB,CAC5B,GAAoK,EACpK,QAAgB,EAChB,QAAuB,EACvB,OAAgC;IAEhC,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAC/C,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAC3B,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,KAAK,EAAE,yBAAyB,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC;KAC7E,CAAC,CAAC,CAAC;AACN,CAAC;AAED,wDAAwD;AACxD,MAAM,UAAU,oBAAoB,CAClC,GAAY,EACZ,QAAgB,EAChB,OAAgC,EAChC,gBAAiC,EACjC,eAAgC,EAChC,yBAAqD,EACrD,mBAAyC,EACzC,qBAA6C;IAE7C,wCAAwC,CAAC,GAAG,CAAC,CAAC;IAC9C,MAAM,MAAM,GAAG,oBAAoB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAE/C,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACtE,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACxE,MAAM,oBAAoB,GAAG,iBAAiB,CAAC,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;IAC9E,MAAM,qBAAqB,GAAG,iBAAiB,CAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;IAEjF,MAAM,QAAQ,GAAkB;QAC9B,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,gBAAgB;QAChB,iBAAiB;QACjB,oBAAoB;QACpB,qBAAqB;KACtB,CAAC;IAEF,MAAM,uBAAuB,GAAG,0BAA0B,CACxD,MAAM,CAAC,YAAY,EAAE,QAAgC,EACrD,SAAS,EACT,MAAM,CAAC,YAAY,EAAE,gBAA+C,CACrE,CAAC;IACF,MAAM,aAAa,GAAG,uBAAuB,CAAC,QAAQ,CAAC;IACvD,MAAM,UAAU,GAAG,uBAAuB,CAAC,KAAK,CAAC;IACjD,MAAM,oBAAoB,GAAG,uBAAuB,CAAC,eAAe,CAAC;IACrE,MAAM,YAAY,GAAG,gBAAgB,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IACpE,2BAA2B,CAAC,YAAY,EAAE,yBAAyB,CAAC,CAAC;IAErE,MAAM,SAAS,GAAoB,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAC/D,oBAAoB,CAClB,IAAI,EACJ,QAAQ,EACR,QAAQ,EACR,aAAa,EACb,UAAU,EACV,oBAAoB,EACpB,OAAO,EACP,gBAAgB,EAChB,eAAe,EACf,mBAAmB,EACnB,qBAAqB,CACtB,CACF,CAAC;IAEF,qCAAqC;IACrC,MAAM,eAAe,GAAG,MAAM,CAAC,gBAAgB,IAAI,SAAS,CAAC,CAAC,CAAE,CAAC,IAAI,CAAC;IAEtE,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,eAAe,EAAE,oBAAoB;QACrC,OAAO,EAAE,YAAY;QACrB,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,QAAQ,EAAE,gBAAgB;QAC1B,SAAS,EAAE,iBAAiB;QAC5B,YAAY,EAAE,oBAAoB;QAClC,aAAa,EAAE,qBAAqB;QACpC,SAAS;QACT,eAAe;QACf,YAAY,EAAE,MAAM,CAAC,aAAa;QAClC,YAAY,EAAE,qBAAqB,CAAC,MAAM,CAAC,aAAa,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC;QACtF,eAAe,EAAE,MAAM,CAAC,gBAAgB;KACzC,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,QAAgB,EAAE,UAAkB;IACpE,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,4BAA4B,QAAQ,EAAE,CAAC,CAAC;IAC1D,CAAC;IACD,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAChD,MAAM,GAAG,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IAC/B,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAEnC,MAAM,OAAO,GAA2B;QACtC,IAAI,EAAE,uBAAuB,CAAC,UAAU,EAAE,UAAU,CAAC;QACrD,UAAU;QACV,QAAQ;QACR,aAAa,EAAE,gBAAgB,EAAE;KAClC,CAAC;IAEF,wDAAwD;IACxD,MAAM,aAAa,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC;IACpD,MAAM,YAAY,GAAG,gBAAgB,EAAE,CAAC;IACxC,MAAM,gBAAgB,GAAG,aAAa,CAAC,cAAc,CAAC;IACtD,MAAM,eAAe,GAAG,YAAY,CAAC,cAAc,CAAC;IACpD,MAAM,yBAAyB,GAAG,gCAAgC,CAChE,YAAY,CAAC,mBAAmB,EAChC,aAAa,CAAC,mBAAmB,CAClC,CAAC;IACF,MAAM,mBAAmB,GAAG,0BAA0B,CAAC,YAAY,CAAC,aAAa,EAAE,aAAa,CAAC,aAAa,CAAC,CAAC;IAChH,MAAM,qBAAqB,GAAG,4BAA4B,CAAC,YAAY,CAAC,eAAe,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;IAExH,OAAO,oBAAoB,CACzB,GAAG,EACH,QAAQ,EACR,OAAO,EACP,gBAAgB,EAChB,eAAe,EACf,yBAAyB,EACzB,mBAAmB,EACnB,qBAAqB,CACtB,CAAC;AACJ,CAAC;AAED,SAAS,gCAAgC,CACvC,YAAmD,EACnD,aAAoD;IAEpD,MAAM,MAAM,GAA8B,EAAE,CAAC;IAE7C,IAAI,YAAY,EAAE,aAAa,KAAK,SAAS,EAAE,CAAC;QAC9C,MAAM,CAAC,aAAa,GAAG,YAAY,CAAC,aAAa,CAAC;IACpD,CAAC;IACD,IAAI,aAAa,EAAE,aAAa,KAAK,SAAS,EAAE,CAAC;QAC/C,MAAM,CAAC,aAAa,GAAG,aAAa,CAAC,aAAa,CAAC;IACrD,CAAC;IAED,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7D,CAAC;AAED,SAAS,2BAA2B,CAClC,OAA+B,EAC/B,MAAkC;IAElC,MAAM,cAAc,GAAG,OAAO,EAAE,OAAO,IAAI,EAAE,CAAC;IAC9C,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAExC,KAAK,MAAM,KAAK,IAAI,cAAc,EAAE,CAAC;QACnC,IAAI,sBAAsB,CAAC,KAAK,CAAC;YAAE,SAAS;QAC5C,IAAI,MAAM,EAAE,aAAa,KAAK,IAAI;YAAE,SAAS;QAC7C,MAAM,IAAI,KAAK,CACb,wCAAwC,KAAK,4BAA4B;cACvE,sFAAsF,CACzF,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAS,0BAA0B,CACjC,YAA6C,EAC7C,aAA8C;IAE9C,MAAM,MAAM,GAAwB,EAAE,CAAC;IAEvC,IAAI,YAAY,EAAE,uBAAuB,KAAK,SAAS,EAAE,CAAC;QACxD,MAAM,CAAC,uBAAuB,GAAG,YAAY,CAAC,uBAAuB,CAAC;IACxE,CAAC;IACD,IAAI,YAAY,EAAE,mBAAmB,KAAK,SAAS,EAAE,CAAC;QACpD,MAAM,CAAC,mBAAmB,GAAG,YAAY,CAAC,mBAAmB,CAAC;IAChE,CAAC;IACD,IAAI,YAAY,EAAE,gBAAgB,KAAK,SAAS,EAAE,CAAC;QACjD,MAAM,CAAC,gBAAgB,GAAG,YAAY,CAAC,gBAAgB,CAAC;IAC1D,CAAC;IAED,IAAI,aAAa,EAAE,uBAAuB,KAAK,SAAS,EAAE,CAAC;QACzD,MAAM,CAAC,uBAAuB,GAAG,aAAa,CAAC,uBAAuB,CAAC;IACzE,CAAC;IACD,IAAI,aAAa,EAAE,mBAAmB,KAAK,SAAS,EAAE,CAAC;QACrD,MAAM,CAAC,mBAAmB,GAAG,aAAa,CAAC,mBAAmB,CAAC;IACjE,CAAC;IACD,IAAI,aAAa,EAAE,gBAAgB,KAAK,SAAS,EAAE,CAAC;QAClD,MAAM,CAAC,gBAAgB,GAAG,aAAa,CAAC,gBAAgB,CAAC;IAC3D,CAAC;IAED,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7D,CAAC;AAED,SAAS,qBAAqB,CAC5B,YAAoB,EACpB,GAAwB,EACxB,MAA4B;IAE5B,IAAI,CAAC,GAAG;QAAE,OAAO;IAEjB,IAAI,GAAG,CAAC,MAAM,KAAK,KAAK,IAAI,MAAM,EAAE,uBAAuB,KAAK,IAAI,EAAE,CAAC;QACrE,MAAM,IAAI,KAAK,CACb,aAAa,YAAY,2BAA2B,GAAG,CAAC,MAAM,8CAA8C;cAC1G,2FAA2F,CAC9F,CAAC;IACJ,CAAC;IAED,IAAI,GAAG,CAAC,KAAK,EAAE,SAAS,IAAI,MAAM,EAAE,mBAAmB,KAAK,IAAI,EAAE,CAAC;QACjE,MAAM,IAAI,KAAK,CACb,aAAa,YAAY,sEAAsE;cAC7F,uFAAuF,CAC1F,CAAC;IACJ,CAAC;IAED,IAAI,GAAG,CAAC,KAAK,EAAE,IAAI,IAAI,MAAM,EAAE,gBAAgB,KAAK,IAAI,EAAE,CAAC;QACzD,MAAM,IAAI,KAAK,CACb,aAAa,YAAY,uEAAuE;cAC9F,mFAAmF,CACtF,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAS,4BAA4B,CACnC,YAA+C,EAC/C,aAAgD;IAEhD,MAAM,MAAM,GAA0B,EAAE,CAAC;IAEzC,IAAI,YAAY,EAAE,KAAK,KAAK,SAAS;QAAE,MAAM,CAAC,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC;IACzE,IAAI,YAAY,EAAE,GAAG,KAAK,SAAS;QAAE,MAAM,CAAC,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC;IACnE,IAAI,YAAY,EAAE,IAAI,KAAK,SAAS;QAAE,MAAM,CAAC,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC;IAEtE,IAAI,aAAa,EAAE,KAAK,KAAK,SAAS;QAAE,MAAM,CAAC,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC;IAC3E,IAAI,aAAa,EAAE,GAAG,KAAK,SAAS;QAAE,MAAM,CAAC,GAAG,GAAG,aAAa,CAAC,GAAG,CAAC;IACrE,IAAI,aAAa,EAAE,IAAI,KAAK,SAAS;QAAE,MAAM,CAAC,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC;IAExE,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7D,CAAC;AAED,SAAS,0BAA0B,CACjC,MAAgE,EAChE,MAAyC;IAEzC,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,IAAI,OAAO,CAAC;IACzC,IAAI,SAAS,KAAK,OAAO;QAAE,OAAO,MAAM,EAAE,KAAK,IAAI,KAAK,CAAC;IACzD,IAAI,SAAS,KAAK,KAAK;QAAE,OAAO,MAAM,EAAE,GAAG,IAAI,KAAK,CAAC;IACrD,OAAO,MAAM,EAAE,IAAI,IAAI,KAAK,CAAC;AAC/B,CAAC;AAED,SAAS,uBAAuB,CAC9B,YAAoB,EACpB,UAAkC,EAClC,MAAyC;IAEzC,IAAI,CAAC,UAAU;QAAE,OAAO;IAExB,KAAK,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QAC9D,IAAI,0BAA0B,CAAC,MAAM,EAAE,MAAM,CAAC;YAAE,SAAS;QACzD,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,IAAI,OAAO,CAAC;QACzC,MAAM,IAAI,KAAK,CACb,aAAa,YAAY,sBAAsB,UAAU,qBAAqB,SAAS,KAAK;cAC1F,2CAA2C;cAC3C,mEAAmE,CACtE,CAAC;IACJ,CAAC;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"pieceParser.js","sourceRoot":"","sources":["../../../../src/infra/config/loaders/pieceParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,2 @@
|
|
|
1
|
-
|
|
2
|
-
modelFieldName?: string;
|
|
3
|
-
requireProviderQualifiedModelForOpencode?: boolean;
|
|
4
|
-
};
|
|
5
|
-
export declare function validateProviderModelCompatibility(provider: string | undefined, model: string | undefined, options?: ProviderModelCompatibilityOptions): void;
|
|
6
|
-
export {};
|
|
1
|
+
export { validateProviderModelCompatibility } from '../../core/piece/provider-model-compatibility.js';
|
|
7
2
|
//# sourceMappingURL=providerModelCompatibility.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"providerModelCompatibility.d.ts","sourceRoot":"","sources":["../../../src/infra/config/providerModelCompatibility.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"providerModelCompatibility.d.ts","sourceRoot":"","sources":["../../../src/infra/config/providerModelCompatibility.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kCAAkC,EAAE,MAAM,kDAAkD,CAAC"}
|
|
@@ -1,20 +1,2 @@
|
|
|
1
|
-
|
|
2
|
-
const CLAUDE_MODEL_ALIASES = new Set(['opus', 'sonnet', 'haiku']);
|
|
3
|
-
export function validateProviderModelCompatibility(provider, model, options = {}) {
|
|
4
|
-
const { modelFieldName = 'Configuration error: model', requireProviderQualifiedModelForOpencode = true, } = options;
|
|
5
|
-
if (!provider)
|
|
6
|
-
return;
|
|
7
|
-
if (provider === 'opencode' && !model) {
|
|
8
|
-
throw new Error("Configuration error: provider 'opencode' requires model in 'provider/model' format (e.g. 'opencode/big-pickle').");
|
|
9
|
-
}
|
|
10
|
-
if (!model)
|
|
11
|
-
return;
|
|
12
|
-
if ((provider === 'codex' || provider === 'opencode') && CLAUDE_MODEL_ALIASES.has(model)) {
|
|
13
|
-
throw new Error(`Configuration error: model '${model}' is a Claude model alias but provider is '${provider}'. ` +
|
|
14
|
-
`Either change the provider to 'claude-sdk' (or headless 'claude') or specify a ${provider}-compatible model.`);
|
|
15
|
-
}
|
|
16
|
-
if (provider === 'opencode' && requireProviderQualifiedModelForOpencode) {
|
|
17
|
-
parseProviderModel(model, modelFieldName);
|
|
18
|
-
}
|
|
19
|
-
}
|
|
1
|
+
export { validateProviderModelCompatibility } from '../../core/piece/provider-model-compatibility.js';
|
|
20
2
|
//# sourceMappingURL=providerModelCompatibility.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"providerModelCompatibility.js","sourceRoot":"","sources":["../../../src/infra/config/providerModelCompatibility.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"providerModelCompatibility.js","sourceRoot":"","sources":["../../../src/infra/config/providerModelCompatibility.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kCAAkC,EAAE,MAAM,kDAAkD,CAAC"}
|