@akiojin/gwt 3.1.2 → 4.0.0
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.ja.md +4 -4
- package/README.md +4 -4
- package/dist/cli/ui/components/screens/BranchListScreen.js +1 -1
- package/dist/cli/ui/components/screens/BranchListScreen.js.map +1 -1
- package/dist/cli/ui/components/screens/BranchQuickStartScreen.d.ts.map +1 -1
- package/dist/cli/ui/components/screens/BranchQuickStartScreen.js +26 -11
- package/dist/cli/ui/components/screens/BranchQuickStartScreen.js.map +1 -1
- package/dist/cli/ui/components/screens/ModelSelectorScreen.d.ts.map +1 -1
- package/dist/cli/ui/components/screens/ModelSelectorScreen.js +0 -5
- package/dist/cli/ui/components/screens/ModelSelectorScreen.js.map +1 -1
- package/dist/cli/ui/utils/modelOptions.d.ts.map +1 -1
- package/dist/cli/ui/utils/modelOptions.js +25 -16
- package/dist/cli/ui/utils/modelOptions.js.map +1 -1
- package/dist/config/builtin-tools.d.ts +2 -0
- package/dist/config/builtin-tools.d.ts.map +1 -1
- package/dist/config/builtin-tools.js +2 -0
- package/dist/config/builtin-tools.js.map +1 -1
- package/dist/config/tools.d.ts.map +1 -1
- package/dist/config/tools.js +4 -1
- package/dist/config/tools.js.map +1 -1
- package/dist/gemini.d.ts.map +1 -1
- package/dist/gemini.js +22 -40
- package/dist/gemini.js.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -20
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
- package/src/cli/ui/components/screens/BranchListScreen.tsx +1 -1
- package/src/cli/ui/components/screens/BranchQuickStartScreen.tsx +40 -22
- package/src/cli/ui/components/screens/ModelSelectorScreen.tsx +0 -8
- package/src/cli/ui/utils/modelOptions.test.ts +9 -6
- package/src/cli/ui/utils/modelOptions.ts +25 -18
- package/src/config/builtin-tools.ts +2 -0
- package/src/config/tools.ts +5 -1
- package/src/gemini.ts +22 -47
- package/src/index.ts +6 -26
package/dist/gemini.js
CHANGED
|
@@ -96,66 +96,50 @@ export async function launchGeminiCLI(worktreePath, options = {}) {
|
|
|
96
96
|
const childStdio = createChildStdio();
|
|
97
97
|
// Auto-detect locally installed gemini command
|
|
98
98
|
const hasLocalGemini = await isGeminiCommandAvailable();
|
|
99
|
-
//
|
|
99
|
+
// Preserve TTY for interactive UI (colors/width) by inheriting stdout/stderr.
|
|
100
|
+
// Session ID is determined via file-based detection after exit.
|
|
100
101
|
let capturedSessionId = null;
|
|
101
|
-
const extractSessionId = (output) => {
|
|
102
|
-
if (!output)
|
|
103
|
-
return;
|
|
104
|
-
// Gemini outputs "Session ID: <uuid>" in exit summary
|
|
105
|
-
// UUID may be split across lines due to terminal width
|
|
106
|
-
// First, find "Session ID:" and extract following hex characters
|
|
107
|
-
const sessionIdIndex = output.indexOf("Session ID:");
|
|
108
|
-
if (sessionIdIndex === -1)
|
|
109
|
-
return;
|
|
110
|
-
// Extract text after "Session ID:" until we have enough hex chars for UUID
|
|
111
|
-
const afterLabel = output.slice(sessionIdIndex + "Session ID:".length);
|
|
112
|
-
// Remove all non-hex characters except dash, then extract UUID pattern
|
|
113
|
-
const hexOnly = afterLabel.replace(/[^0-9a-fA-F-]/g, "");
|
|
114
|
-
// UUID format: 8-4-4-4-12 = 32 hex chars + 4 dashes
|
|
115
|
-
const uuidMatch = hexOnly.match(/^([0-9a-f]{8})-?([0-9a-f]{4})-?([0-9a-f]{4})-?([0-9a-f]{4})-?([0-9a-f]{12})/i);
|
|
116
|
-
if (uuidMatch) {
|
|
117
|
-
capturedSessionId = `${uuidMatch[1]}-${uuidMatch[2]}-${uuidMatch[3]}-${uuidMatch[4]}-${uuidMatch[5]}`;
|
|
118
|
-
}
|
|
119
|
-
};
|
|
120
102
|
const runGemini = async (runArgs) => {
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
103
|
+
const execChild = async (child) => {
|
|
104
|
+
try {
|
|
105
|
+
await child;
|
|
106
|
+
}
|
|
107
|
+
catch (execError) {
|
|
108
|
+
// Treat SIGINT/SIGTERM as normal exit (user pressed Ctrl+C)
|
|
109
|
+
const signal = execError?.signal;
|
|
110
|
+
if (signal === "SIGINT" || signal === "SIGTERM") {
|
|
111
|
+
return;
|
|
112
|
+
}
|
|
113
|
+
throw execError;
|
|
114
|
+
}
|
|
115
|
+
};
|
|
116
|
+
const run = async (cmd, args) => {
|
|
125
117
|
const child = execa(cmd, args, {
|
|
126
118
|
cwd: worktreePath,
|
|
127
119
|
shell: true,
|
|
128
120
|
stdin: childStdio.stdin,
|
|
129
|
-
stdout:
|
|
121
|
+
stdout: childStdio.stdout,
|
|
130
122
|
stderr: childStdio.stderr,
|
|
131
123
|
env: baseEnv,
|
|
132
124
|
});
|
|
133
|
-
|
|
134
|
-
child.stdout?.on("data", (chunk) => {
|
|
135
|
-
const text = chunk.toString("utf8");
|
|
136
|
-
outputChunks.push(text);
|
|
137
|
-
terminal.stdout.write(chunk);
|
|
138
|
-
});
|
|
139
|
-
await child;
|
|
140
|
-
return outputChunks.join("");
|
|
125
|
+
await execChild(child);
|
|
141
126
|
};
|
|
142
127
|
if (hasLocalGemini) {
|
|
143
128
|
console.log(chalk.green(" ✨ Using locally installed gemini command"));
|
|
144
|
-
return await
|
|
129
|
+
return await run("gemini", runArgs);
|
|
145
130
|
}
|
|
146
131
|
console.log(chalk.cyan(" 🔄 Falling back to bunx @google/gemini-cli@latest"));
|
|
147
132
|
console.log(chalk.yellow(" 💡 Recommended: Install Gemini CLI globally for faster startup"));
|
|
148
133
|
console.log(chalk.yellow(" npm install -g @google/gemini-cli"));
|
|
149
134
|
console.log("");
|
|
150
135
|
await new Promise((resolve) => setTimeout(resolve, 2000));
|
|
151
|
-
return await
|
|
136
|
+
return await run("bunx", [GEMINI_CLI_PACKAGE, ...runArgs]);
|
|
152
137
|
};
|
|
153
|
-
let output;
|
|
154
138
|
let fellBackToLatest = false;
|
|
155
139
|
try {
|
|
156
140
|
// Try with explicit session ID first (if any), then fallback to --resume (latest) once
|
|
157
141
|
try {
|
|
158
|
-
|
|
142
|
+
await runGemini(argsPrimary);
|
|
159
143
|
}
|
|
160
144
|
catch (err) {
|
|
161
145
|
const shouldRetry = (options.mode === "resume" || options.mode === "continue") &&
|
|
@@ -163,7 +147,7 @@ export async function launchGeminiCLI(worktreePath, options = {}) {
|
|
|
163
147
|
if (shouldRetry) {
|
|
164
148
|
fellBackToLatest = true;
|
|
165
149
|
console.log(chalk.yellow(` ⚠️ Failed to resume session ${resumeSessionId}. Retrying with latest session...`));
|
|
166
|
-
|
|
150
|
+
await runGemini(argsFallback);
|
|
167
151
|
}
|
|
168
152
|
else {
|
|
169
153
|
throw err;
|
|
@@ -173,8 +157,6 @@ export async function launchGeminiCLI(worktreePath, options = {}) {
|
|
|
173
157
|
finally {
|
|
174
158
|
childStdio.cleanup();
|
|
175
159
|
}
|
|
176
|
-
// Extract session ID from Gemini's exit summary output
|
|
177
|
-
extractSessionId(output);
|
|
178
160
|
const explicitResumeSucceeded = usedExplicitSessionId && !fellBackToLatest;
|
|
179
161
|
// If we explicitly resumed a specific session (and did not fall back), keep that ID.
|
|
180
162
|
if (explicitResumeSucceeded) {
|
package/dist/gemini.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gemini.js","sourceRoot":"","sources":["../src/gemini.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"gemini.js","sourceRoot":"","sources":["../src/gemini.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAuBA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAkQlE;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,IAAI,CAAC,CAmef;AAED,KAAK,SAAS,GAAG,MAAM,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC,CAAC;AAC5D,KAAK,eAAe,GAAG,CAAC,SAAS,EAAE,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAWrE,wBAAsB,kBAAkB,CACtC,SAAS,GAAE,SAAqB,EAChC,eAAe,GAAE,eAAsC,GACtD,OAAO,CAAC,IAAI,CAAC,CA0Bf;AAED;;GAEG;AACH,wBAAsB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CA6C1C"}
|
package/dist/index.js
CHANGED
|
@@ -3,7 +3,6 @@ import { isGitRepository, getRepositoryRoot, branchExists, fetchAllRemotes, pull
|
|
|
3
3
|
import { launchClaudeCode } from "./claude.js";
|
|
4
4
|
import { launchCodexCLI, CodexError, } from "./codex.js";
|
|
5
5
|
import { launchGeminiCLI, GeminiError } from "./gemini.js";
|
|
6
|
-
import { launchQwenCLI, QwenError } from "./qwen.js";
|
|
7
6
|
import { WorktreeOrchestrator, } from "./services/WorktreeOrchestrator.js";
|
|
8
7
|
import chalk from "chalk";
|
|
9
8
|
import { worktreeExists, isProtectedBranchName, switchToProtectedBranch, WorktreeError, } from "./worktree.js";
|
|
@@ -64,7 +63,6 @@ function isRecoverableError(error) {
|
|
|
64
63
|
error instanceof WorktreeError ||
|
|
65
64
|
error instanceof CodexError ||
|
|
66
65
|
error instanceof GeminiError ||
|
|
67
|
-
error instanceof QwenError ||
|
|
68
66
|
error instanceof DependencyInstallError) {
|
|
69
67
|
return true;
|
|
70
68
|
}
|
|
@@ -73,7 +71,6 @@ function isRecoverableError(error) {
|
|
|
73
71
|
error.name === "WorktreeError" ||
|
|
74
72
|
error.name === "CodexError" ||
|
|
75
73
|
error.name === "GeminiError" ||
|
|
76
|
-
error.name === "QwenError" ||
|
|
77
74
|
error.name === "DependencyInstallError");
|
|
78
75
|
}
|
|
79
76
|
if (typeof error === "object" &&
|
|
@@ -83,7 +80,6 @@ function isRecoverableError(error) {
|
|
|
83
80
|
name === "WorktreeError" ||
|
|
84
81
|
name === "CodexError" ||
|
|
85
82
|
name === "GeminiError" ||
|
|
86
|
-
name === "QwenError" ||
|
|
87
83
|
name === "DependencyInstallError");
|
|
88
84
|
}
|
|
89
85
|
return false;
|
|
@@ -211,6 +207,11 @@ export async function handleAIToolWorkflow(selectionResult) {
|
|
|
211
207
|
? `, model=${model ?? "default"}${inferenceLevel ? `/${inferenceLevel}` : ""}`
|
|
212
208
|
: "";
|
|
213
209
|
printInfo(`Selected: ${branchLabel} with ${tool} (${mode} mode${modelInfo}, skipPermissions: ${skipPermissions})`);
|
|
210
|
+
if (tool === "qwen-cli") {
|
|
211
|
+
printError("Qwen CLI is currently unsupported.");
|
|
212
|
+
await waitForErrorAcknowledgement();
|
|
213
|
+
return;
|
|
214
|
+
}
|
|
214
215
|
try {
|
|
215
216
|
// Get repository root
|
|
216
217
|
const repoRootResult = await runGitStep("retrieve repository root", () => getRepositoryRoot());
|
|
@@ -464,22 +465,6 @@ export async function handleAIToolWorkflow(selectionResult) {
|
|
|
464
465
|
}
|
|
465
466
|
launchResult = await launchGeminiCLI(worktreePath, launchOptions);
|
|
466
467
|
}
|
|
467
|
-
else if (tool === "qwen-cli") {
|
|
468
|
-
const launchOptions = {
|
|
469
|
-
mode: mode === "resume"
|
|
470
|
-
? "resume"
|
|
471
|
-
: mode === "continue"
|
|
472
|
-
? "continue"
|
|
473
|
-
: "normal",
|
|
474
|
-
skipPermissions,
|
|
475
|
-
envOverrides: sharedEnv,
|
|
476
|
-
sessionId: resumeSessionId,
|
|
477
|
-
};
|
|
478
|
-
if (model) {
|
|
479
|
-
launchOptions.model = model;
|
|
480
|
-
}
|
|
481
|
-
launchResult = await launchQwenCLI(worktreePath, launchOptions);
|
|
482
|
-
}
|
|
483
468
|
else {
|
|
484
469
|
// Custom tool
|
|
485
470
|
printInfo(`Launching custom tool: ${toolConfig.displayName}`);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAEA,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,YAAY,EACZ,eAAe,EACf,eAAe,EACf,2BAA2B,EAC3B,QAAQ,GACT,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EACL,cAAc,EACd,UAAU,GAEX,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACrD,OAAO,EACL,oBAAoB,GAErB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EACL,cAAc,EACd,qBAAqB,EACrB,uBAAuB,EACvB,aAAa,GACd,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,kBAAkB,EAClB,0BAA0B,GAC3B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EACL,sBAAsB,EACtB,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EACL,8BAA8B,EAC9B,sBAAsB,GAEvB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,CAC/B,yDAAyD,CAC1D,CAAC;AAEF,gBAAgB;AAChB,MAAM,SAAS,GAAG,YAAY,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;AAEpD,KAAK,UAAU,2BAA2B;IACxC,MAAM,0BAA0B,CAAC,YAAY,CAAC,CAAC;AACjD,CAAC;AAED;;GAEG;AACH,SAAS,UAAU,CAAC,OAAe;IACjC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,OAAO,EAAE,CAAC,CAAC,CAAC;IACzC,SAAS,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;AAC/B,CAAC;AAED,SAAS,SAAS,CAAC,OAAe;IAChC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,OAAO,EAAE,CAAC,CAAC,CAAC;IAC1C,SAAS,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;AAC9B,CAAC;AAED,SAAS,YAAY,CAAC,OAAe;IACnC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,OAAO,EAAE,CAAC,CAAC,CAAC;IAC7C,SAAS,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;AAC9B,CAAC;AAID,SAAS,iBAAiB,CAAC,KAAc;IACvC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,KAAK,YAAY,QAAQ,IAAI,KAAK,YAAY,aAAa,EAAE,CAAC;QAChE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;QAC3B,OAAO,KAAK,CAAC,IAAI,KAAK,UAAU,IAAI,KAAK,CAAC,IAAI,KAAK,eAAe,CAAC;IACrE,CAAC;IAED,IACE,OAAO,KAAK,KAAK,QAAQ;QACzB,MAAM,IAAK,KAAiC,EAC5C,CAAC;QACD,MAAM,IAAI,GAAI,KAA2B,CAAC,IAAI,CAAC;QAC/C,OAAO,IAAI,KAAK,UAAU,IAAI,IAAI,KAAK,eAAe,CAAC;IACzD,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAc;IACxC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IACE,KAAK,YAAY,QAAQ;QACzB,KAAK,YAAY,aAAa;QAC9B,KAAK,YAAY,UAAU;QAC3B,KAAK,YAAY,WAAW;QAC5B,KAAK,YAAY,SAAS;QAC1B,KAAK,YAAY,sBAAsB,EACvC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;QAC3B,OAAO,CACL,KAAK,CAAC,IAAI,KAAK,UAAU;YACzB,KAAK,CAAC,IAAI,KAAK,eAAe;YAC9B,KAAK,CAAC,IAAI,KAAK,YAAY;YAC3B,KAAK,CAAC,IAAI,KAAK,aAAa;YAC5B,KAAK,CAAC,IAAI,KAAK,WAAW;YAC1B,KAAK,CAAC,IAAI,KAAK,wBAAwB,CACxC,CAAC;IACJ,CAAC;IAED,IACE,OAAO,KAAK,KAAK,QAAQ;QACzB,MAAM,IAAK,KAAiC,EAC5C,CAAC;QACD,MAAM,IAAI,GAAI,KAA2B,CAAC,IAAI,CAAC;QAC/C,OAAO,CACL,IAAI,KAAK,UAAU;YACnB,IAAI,KAAK,eAAe;YACxB,IAAI,KAAK,YAAY;YACrB,IAAI,KAAK,aAAa;YACtB,IAAI,KAAK,WAAW;YACpB,IAAI,KAAK,wBAAwB,CAClC,CAAC;IACJ,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,KAAK,UAAU,UAAU,CACvB,WAAmB,EACnB,IAAsB;IAEtB,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,IAAI,EAAE,CAAC;QAC3B,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IAC7B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;YAC7B,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACvE,YAAY,CAAC,yBAAyB,WAAW,aAAa,OAAO,EAAE,CAAC,CAAC;YACzE,MAAM,2BAA2B,EAAE,CAAC;YACpC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC;QACvB,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,KAAK,UAAU,wBAAwB,CACrC,WAAmB,EACnB,IAAsB;IAEtB,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,IAAI,EAAE,CAAC;QAC3B,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IAC7B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,sBAAsB,EAAE,CAAC;YAC5C,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC;YACpC,+BAA+B;YAC/B,UAAU,CAAC,sBAAsB,WAAW,KAAK,OAAO,EAAE,CAAC,CAAC;YAC5D,MAAM,2BAA2B,EAAE,CAAC;YAEpC,MAAM,cAAc,GAAG;gBACrB,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,IAAI;gBACb,QAAQ,EAAE,IAAI;gBACd,MAAM,EAAE,eAAe;gBACvB,OAAO,EAAE,OAAO;aACZ,CAAC;YAEP,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC;QAC7C,CAAC;QAED,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,QAAQ;IACf,OAAO,CAAC,GAAG,CAAC;;;;;;;;;;;;;;;;CAgBb,CAAC,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,WAAW;IACxB,MAAM,OAAO,GAAG,MAAM,iBAAiB,EAAE,CAAC;IAC1C,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACvB,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAC;QAC/D,MAAM,2BAA2B,EAAE,CAAC;QACpC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,KAAK,UAAU,SAAS;IACtB,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,CAAC;IACvC,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,CAAC;IACpC,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,MAAM,CAAC,4BAA4B,CAAC,CAAC;IAC3D,MAAM,QAAQ,GAAG,kBAAkB,EAAE,CAAC;IAEtC,IAAI,eAA4C,CAAC;IAEjD,+CAA+C;IAC/C,IAAI,OAAO,QAAQ,CAAC,KAAK,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;QAChD,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;IAC1B,CAAC;IAED,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,MAAM,CACvC,KAAK,CAAC,aAAa,CAAC,GAAG,EAAE;QACvB,MAAM,EAAE,CAAC,MAAwB,EAAE,EAAE;YACnC,eAAe,GAAG,MAAM,CAAC;QAC3B,CAAC;KACF,CAAC,EACF;QACE,KAAK,EAAE,QAAQ,CAAC,KAAK;QACrB,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,MAAM,EAAE,QAAQ,CAAC,MAAM;KACxB,CACF,CAAC;IAEF,wBAAwB;IACxB,IAAI,CAAC;QACH,MAAM,aAAa,EAAE,CAAC;IACxB,CAAC;YAAS,CAAC;QACT,QAAQ,CAAC,WAAW,EAAE,CAAC;QACvB,IAAI,OAAO,QAAQ,CAAC,KAAK,CAAC,KAAK,KAAK,UAAU,EAAE,CAAC;YAC/C,QAAQ,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACzB,CAAC;QACD,0CAA0C;QAC1C,QAAQ,CAAC,KAAK,CAAC,kBAAkB,EAAE,CAAC,MAAM,CAAC,CAAC;QAC5C,QAAQ,CAAC,KAAK,CAAC,kBAAkB,EAAE,CAAC,UAAU,CAAC,CAAC;QAChD,QAAQ,CAAC,KAAK,CAAC,kBAAkB,EAAE,CAAC,UAAU,CAAC,CAAC;QAChD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO,eAAe,CAAC;AACzB,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,eAAgC;IAEhC,MAAM,EACJ,MAAM,EACN,WAAW,EACX,UAAU,EACV,YAAY,EACZ,IAAI,EACJ,IAAI,EACJ,eAAe,EACf,KAAK,EACL,cAAc,EACd,SAAS,EAAE,iBAAiB,GAC7B,GAAG,eAAe,CAAC;IAEpB,MAAM,WAAW,GAAG,WAAW,IAAI,MAAM,CAAC;IAC1C,MAAM,SAAS,GACb,KAAK,IAAI,cAAc;QACrB,CAAC,CAAC,WAAW,KAAK,IAAI,SAAS,GAAG,cAAc,CAAC,CAAC,CAAC,IAAI,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE;QAC9E,CAAC,CAAC,EAAE,CAAC;IACT,SAAS,CACP,aAAa,WAAW,SAAS,IAAI,KAAK,IAAI,QAAQ,SAAS,sBAAsB,eAAe,GAAG,CACxG,CAAC;IAEF,IAAI,CAAC;QACH,sBAAsB;QACtB,MAAM,cAAc,GAAG,MAAM,UAAU,CAAC,0BAA0B,EAAE,GAAG,EAAE,CACvE,iBAAiB,EAAE,CACpB,CAAC;QACF,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC;YACvB,OAAO;QACT,CAAC;QACD,MAAM,QAAQ,GAAG,cAAc,CAAC,KAAK,CAAC;QAEtC,oDAAoD;QACpD,MAAM,aAAa,GAA0B,EAAE,CAAC;QAEhD,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;YAC5B,MAAM,SAAS,GAAG,YAAY,IAAI,MAAM,CAAC;YACzC,MAAM,WAAW,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,CAAC;YAE/C,aAAa,CAAC,UAAU,GAAG,SAAS,CAAC;YACrC,aAAa,CAAC,WAAW,GAAG,CAAC,WAAW,CAAC;QAC3C,CAAC;QAED,MAAM,gBAAgB,GAAG,MAAM,cAAc,CAAC,MAAM,CAAC,CAAC;QAEtD,MAAM,iBAAiB,GACrB,qBAAqB,CAAC,MAAM,CAAC;YAC7B,CAAC,YAAY,CAAC,CAAC,CAAC,qBAAqB,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAE/D,IAAI,uBAAuB,GAAgC,MAAM,CAAC;QAClE,IAAI,iBAAiB,EAAE,CAAC;YACtB,MAAM,kBAAkB,GACtB,YAAY;gBACZ,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAC7D,MAAM,YAAY,GAAG,MAAM,UAAU,CACnC,+BAA+B,MAAM,GAAG,EACxC,GAAG,EAAE,CACH,uBAAuB,CAAC;gBACtB,UAAU,EAAE,MAAM;gBAClB,QAAQ;gBACR,SAAS,EAAE,kBAAkB,IAAI,IAAI;aACtC,CAAC,CACL,CAAC;YACF,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC;gBACrB,OAAO;YACT,CAAC;YACD,uBAAuB,GAAG,YAAY,CAAC,KAAK,CAAC;YAC7C,aAAa,CAAC,WAAW,GAAG,KAAK,CAAC;QACpC,CAAC;QAED,MAAM,kBAAkB,GAAG,CAAC,gBAAgB,IAAI,CAAC,iBAAiB,CAAC;QAEnE,MAAM,YAAY,GAAG,IAAI,oBAAoB,EAAE,CAAC;QAEhD,8CAA8C;QAC9C,IAAI,kBAAkB,EAAE,CAAC;YACvB,MAAM,WAAW,GAAG,aAAa,CAAC,WAAW;gBAC3C,CAAC,CAAC,QAAQ,aAAa,CAAC,UAAU,IAAI,MAAM,EAAE;gBAC9C,CAAC,CAAC,UAAU,MAAM,EAAE,CAAC;YACvB,SAAS,CACP,yBAAyB,WAAW,iCAAiC,CACtE,CAAC;QACJ,CAAC;QAED,MAAM,cAAc,GAAG,MAAM,UAAU,CACrC,qBAAqB,MAAM,GAAG,EAC9B,GAAG,EAAE,CAAC,YAAY,CAAC,cAAc,CAAC,MAAM,EAAE,QAAQ,EAAE,aAAa,CAAC,CACnE,CAAC;QACF,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC;YACvB,OAAO;QACT,CAAC;QACD,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAAC;QAE1C,IAAI,iBAAiB,EAAE,CAAC;YACtB,IAAI,uBAAuB,KAAK,QAAQ,IAAI,YAAY,EAAE,CAAC;gBACzD,SAAS,CACP,kCAAkC,MAAM,UAAU,YAAY,sBAAsB,CACrF,CAAC;YACJ,CAAC;iBAAM,IAAI,uBAAuB,KAAK,OAAO,EAAE,CAAC;gBAC/C,SAAS,CACP,iCAAiC,MAAM,uBAAuB,CAC/D,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,SAAS,CAAC,+CAA+C,MAAM,IAAI,CAAC,CAAC;YACvE,CAAC;QACH,CAAC;aAAM,IAAI,gBAAgB,EAAE,CAAC;YAC5B,SAAS,CAAC,8BAA8B,gBAAgB,EAAE,CAAC,CAAC;QAC9D,CAAC;aAAM,IAAI,aAAa,CAAC,WAAW,EAAE,CAAC;YACrC,MAAM,IAAI,GAAG,aAAa,CAAC,UAAU,IAAI,EAAE,CAAC;YAC5C,SAAS,CAAC,6BAA6B,IAAI,KAAK,YAAY,EAAE,CAAC,CAAC;QAClE,CAAC;aAAM,IAAI,kBAAkB,EAAE,CAAC;YAC9B,SAAS,CAAC,qBAAqB,YAAY,EAAE,CAAC,CAAC;QACjD,CAAC;QAED,SAAS,CAAC,mBAAmB,YAAY,EAAE,CAAC,CAAC;QAE7C,MAAM,gBAAgB,GAAG,MAAM,wBAAwB,CACrD,4BAA4B,MAAM,GAAG,EACrC,GAAG,EAAE,CAAC,8BAA8B,CAAC,YAAY,CAAC,CACnD,CAAC;QACF,IAAI,CAAC,gBAAgB,CAAC,EAAE,EAAE,CAAC;YACzB,OAAO;QACT,CAAC;QACD,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,KAAK,CAAC;QAEhD,IAAI,gBAAgB,CAAC,OAAO,EAAE,CAAC;YAC7B,IAAI,cAAsB,CAAC;YAC3B,QAAQ,gBAAgB,CAAC,MAAM,EAAE,CAAC;gBAChC,KAAK,kBAAkB;oBACrB,cAAc;wBACZ,qMAAqM,CAAC;oBACxM,MAAM;gBACR,KAAK,gBAAgB;oBACnB,cAAc,GAAG,oBAAoB,gBAAgB,CAAC,OAAO,IAAI,SAAS,qEAAqE,CAAC;oBAChJ,MAAM;gBACR,KAAK,gBAAgB;oBACnB,cAAc,GAAG,sCAAsC,gBAAgB,CAAC,OAAO,IAAI,SAAS,iCAAiC,CAAC;oBAC9H,MAAM;gBACR,KAAK,uBAAuB;oBAC1B,cAAc;wBACZ,8FAA8F,CAAC;oBACjG,MAAM;gBACR;oBACE,cAAc;wBACZ,iGAAiG,CAAC;YACxG,CAAC;YAED,IAAI,gBAAgB,CAAC,OAAO,EAAE,CAAC;gBAC7B,cAAc,GAAG,GAAG,cAAc,cAAc,gBAAgB,CAAC,OAAO,EAAE,CAAC;YAC7E,CAAC;YAED,YAAY,CAAC,cAAc,CAAC,CAAC;QAC/B,CAAC;aAAM,CAAC;YACN,SAAS,CAAC,2BAA2B,gBAAgB,CAAC,OAAO,GAAG,CAAC,CAAC;QACpE,CAAC;QAED,+CAA+C;QAC/C,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,eAAe,EAAE,GAAG,EAAE,CACzD,eAAe,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CACnC,CAAC;QACF,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;QAED,IAAI,gBAAgB,GAAiB,IAAI,CAAC;QAC1C,IAAI,CAAC;YACH,MAAM,eAAe,CAAC,YAAY,CAAC,CAAC;YACpC,SAAS,CAAC,kCAAkC,MAAM,GAAG,CAAC,CAAC;QACzD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,gBAAgB;gBACd,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YAC5D,YAAY,CACV,gCAAgC,MAAM,gDAAgD,CACvF,CAAC;QACJ,CAAC;QAED,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAU,CAAC;QAC7C,MAAM,kBAAkB,GAAG,CAAC,KAAgC,EAAE,EAAE;YAC9D,IAAI,CAAC,KAAK;gBAAE,OAAO,IAAI,CAAC;YACxB,OAAO,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QACxC,CAAC,CAAC;QAEF,MAAM,eAAe,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;QACnD,IAAI,eAAe,EAAE,CAAC;YACpB,kBAAkB,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QAC1C,CAAC;QAED,MAAM,qBAAqB,GAAG,kBAAkB,CAAC,YAAY,CAAC,CAAC;QAC/D,IAAI,qBAAqB,EAAE,CAAC;YAC1B,kBAAkB,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;QAChD,CAAC;QAED,MAAM,gBAAgB,GAAG,MAAM,UAAU,CAAC,yBAAyB,EAAE,GAAG,EAAE,CACxE,2BAA2B,CAAC;YAC1B,GAAG,EAAE,QAAQ;YACb,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC;SACzC,CAAC,CACH,CAAC;QACF,IAAI,CAAC,gBAAgB,CAAC,EAAE,EAAE,CAAC;YACzB,OAAO;QACT,CAAC;QACD,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,KAAK,CAAC;QAClD,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,MAAM,CAChD,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,GAAG,CAAC,IAAI,MAAM,CAAC,UAAU,GAAG,CAAC,CAC5D,CAAC;QAEF,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChC,YAAY,CACV,+EAA+E,CAChF,CAAC;YAEF,gBAAgB,CAAC,OAAO,CACtB,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,EAAE;gBACtD,MAAM,SAAS,GACb,cAAc,KAAK,MAAM,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAC;gBACxD,OAAO,CAAC,IAAI,CACV,KAAK,CAAC,MAAM,CACV,QAAQ,cAAc,GAAG,SAAS,aAAa,WAAW,YAAY,UAAU,EAAE,CACnF,CACF,CAAC;YACJ,CAAC,CACF,CAAC;YAEF,YAAY,CACV,wFAAwF,CACzF,CAAC;YACF,MAAM,YAAY,CAChB,2EAA2E,CAC5E,CAAC;YACF,YAAY,CACV,mEAAmE,CACpE,CAAC;YACF,OAAO;QACT,CAAC;aAAM,IAAI,gBAAgB,EAAE,CAAC;YAC5B,YAAY,CACV,yCAAyC,gBAAgB,CAAC,OAAO,iCAAiC,CACnG,CAAC;QACJ,CAAC;QAED,uDAAuD;QACvD,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAChD,WAAW,CAAC,IAAI,CAAC;YACjB,oBAAoB,EAAE;SACvB,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,mBAAmB,IAAI,EAAE,CAAC,CAAC;QAC7C,CAAC;QAED,0EAA0E;QAC1E,mDAAmD;QACnD,MAAM,WAAW,CACf;YACE,gBAAgB,EAAE,YAAY;YAC9B,UAAU,EAAE,MAAM;YAClB,YAAY,EAAE,IAAI;YAClB,SAAS,EAAE,UAAU,CAAC,WAAW,IAAI,IAAI;YACzC,IAAI;YACJ,KAAK,EAAE,KAAK,IAAI,IAAI;YACpB,cAAc,EAAE,cAAc,IAAI,IAAI;YACtC,eAAe,EAAE,eAAe,IAAI,IAAI;YACxC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,cAAc,EAAE,QAAQ;SACzB,EACD,EAAE,WAAW,EAAE,IAAI,EAAE,CACtB,CAAC;QAEF,qDAAqD;QACrD,IAAI,eAAe,GACjB,iBAAiB,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC;YAC/C,CAAC,CAAC,iBAAiB;YACnB,CAAC,CAAC,IAAI,CAAC;QACX,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;YACxB,MAAM,eAAe,GAAG,MAAM,WAAW,CAAC,QAAQ,CAAC,CAAC;YACpD,MAAM,OAAO,GAAG,eAAe,EAAE,OAAO,IAAI,EAAE,CAAC;YAE/C,eAAe;gBACb,eAAe;oBACf,CAAC,MAAM,wBAAwB,CAAC;wBAC9B,OAAO;wBACP,WAAW,EAAE,eAAe;wBAC5B,MAAM;wBACN,MAAM,EAAE,IAAI;wBACZ,QAAQ;qBACT,CAAC,CAAC,CAAC;YAEN,IAAI,CAAC,eAAe,EAAE,CAAC;gBACrB,YAAY,CACV,+EAA+E,CAChF,CAAC;YACJ,CAAC;QACH,CAAC;QAED,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEnC,0BAA0B;QAC1B,qDAAqD;QACrD,2DAA2D;QAC3D,IAAI,YAAkD,CAAC;QACvD,IAAI,IAAI,KAAK,aAAa,EAAE,CAAC;YAC3B,MAAM,aAAa,GAMf;gBACF,IAAI,EACF,IAAI,KAAK,QAAQ;oBACf,CAAC,CAAC,QAAQ;oBACV,CAAC,CAAC,IAAI,KAAK,UAAU;wBACnB,CAAC,CAAC,UAAU;wBACZ,CAAC,CAAC,QAAQ;gBAChB,eAAe;gBACf,YAAY,EAAE,SAAS;gBACvB,SAAS,EAAE,eAAe;aAC3B,CAAC;YACF,IAAI,KAAK,EAAE,CAAC;gBACV,aAAa,CAAC,KAAK,GAAG,KAAK,CAAC;YAC9B,CAAC;YACD,YAAY,GAAG,MAAM,gBAAgB,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;QACrE,CAAC;aAAM,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;YAChC,MAAM,aAAa,GAOf;gBACF,IAAI,EACF,IAAI,KAAK,QAAQ;oBACf,CAAC,CAAC,QAAQ;oBACV,CAAC,CAAC,IAAI,KAAK,UAAU;wBACnB,CAAC,CAAC,UAAU;wBACZ,CAAC,CAAC,QAAQ;gBAChB,eAAe,EAAE,eAAe;gBAChC,YAAY,EAAE,SAAS;gBACvB,SAAS,EAAE,eAAe;aAC3B,CAAC;YACF,IAAI,KAAK,EAAE,CAAC;gBACV,aAAa,CAAC,KAAK,GAAG,KAAK,CAAC;YAC9B,CAAC;YACD,IAAI,cAAc,EAAE,CAAC;gBACnB,aAAa,CAAC,eAAe,GAAG,cAAsC,CAAC;YACzE,CAAC;YACD,YAAY,GAAG,MAAM,cAAc,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;QACnE,CAAC;aAAM,IAAI,IAAI,KAAK,YAAY,EAAE,CAAC;YACjC,MAAM,aAAa,GAMf;gBACF,IAAI,EACF,IAAI,KAAK,QAAQ;oBACf,CAAC,CAAC,QAAQ;oBACV,CAAC,CAAC,IAAI,KAAK,UAAU;wBACnB,CAAC,CAAC,UAAU;wBACZ,CAAC,CAAC,QAAQ;gBAChB,eAAe;gBACf,YAAY,EAAE,SAAS;gBACvB,SAAS,EAAE,eAAe;aAC3B,CAAC;YACF,IAAI,KAAK,EAAE,CAAC;gBACV,aAAa,CAAC,KAAK,GAAG,KAAK,CAAC;YAC9B,CAAC;YACD,YAAY,GAAG,MAAM,eAAe,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;QACpE,CAAC;aAAM,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;YAC/B,MAAM,aAAa,GAMf;gBACF,IAAI,EACF,IAAI,KAAK,QAAQ;oBACf,CAAC,CAAC,QAAQ;oBACV,CAAC,CAAC,IAAI,KAAK,UAAU;wBACnB,CAAC,CAAC,UAAU;wBACZ,CAAC,CAAC,QAAQ;gBAChB,eAAe;gBACf,YAAY,EAAE,SAAS;gBACvB,SAAS,EAAE,eAAe;aAC3B,CAAC;YACF,IAAI,KAAK,EAAE,CAAC;gBACV,aAAa,CAAC,KAAK,GAAG,KAAK,CAAC;YAC9B,CAAC;YACD,YAAY,GAAG,MAAM,aAAa,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;QAClE,CAAC;aAAM,CAAC;YACN,cAAc;YACd,SAAS,CAAC,0BAA0B,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC;YAC9D,YAAY,GAAG,MAAM,kBAAkB,CAAC,UAAU,EAAE;gBAClD,IAAI,EACF,IAAI,KAAK,QAAQ;oBACf,CAAC,CAAC,QAAQ;oBACV,CAAC,CAAC,IAAI,KAAK,UAAU;wBACnB,CAAC,CAAC,UAAU;wBACZ,CAAC,CAAC,QAAQ;gBAChB,eAAe;gBACf,GAAG,EAAE,YAAY;gBACjB,SAAS;aACV,CAAC,CAAC;QACL,CAAC;QAED,oDAAoD;QACpD,IAAI,cAAc,GACf,YAA0D,EAAE,SAAS;YACtE,eAAe;YACf,IAAI,CAAC;QAEP,IAAI,CAAC,cAAc,IAAI,IAAI,KAAK,aAAa,EAAE,CAAC;YAC9C,IAAI,CAAC;gBACH,cAAc;oBACZ,CAAC,MAAM,yBAAyB,CAAC,YAAY,CAAC,CAAC,IAAI,IAAI,CAAC;YAC5D,CAAC;YAAC,MAAM,CAAC;gBACP,cAAc,GAAG,IAAI,CAAC;YACxB,CAAC;QACH,CAAC;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAE9B,IAAI,CAAC,cAAc,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;YAC5C,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC;oBAC1C,KAAK,EAAE,eAAe,GAAG,MAAM;oBAC/B,KAAK,EAAE,UAAU,GAAG,MAAM;oBAC1B,eAAe,EAAE,UAAU;oBAC3B,QAAQ,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI;oBACxB,GAAG,EAAE,YAAY;iBAClB,CAAC,CAAC;gBACH,IAAI,MAAM,EAAE,CAAC;oBACX,cAAc,GAAG,MAAM,CAAC,EAAE,CAAC;gBAC7B,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,0BAA0B;YAC5B,CAAC;QACH,CAAC;aAAM,IAAI,CAAC,cAAc,IAAI,IAAI,KAAK,aAAa,EAAE,CAAC;YACrD,IAAI,CAAC;gBACH,MAAM,YAAY,GAAG,MAAM,uBAAuB,CAAC,YAAY,EAAE;oBAC/D,KAAK,EAAE,eAAe,GAAG,MAAM;oBAC/B,KAAK,EAAE,UAAU,GAAG,MAAM;oBAC1B,eAAe,EAAE,UAAU;oBAC3B,QAAQ,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI;iBACzB,CAAC,CAAC;gBACH,IAAI,YAAY,EAAE,CAAC;oBACjB,cAAc,GAAG,YAAY,CAAC,EAAE,CAAC;gBACnC,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,SAAS;YACX,CAAC;QACH,CAAC;aAAM,IAAI,CAAC,cAAc,IAAI,IAAI,KAAK,YAAY,EAAE,CAAC;YACpD,IAAI,CAAC;gBACH,MAAM,YAAY,GAAG,MAAM,uBAAuB,CAAC;oBACjD,KAAK,EAAE,eAAe,GAAG,MAAM;oBAC/B,KAAK,EAAE,UAAU,GAAG,MAAM;oBAC1B,eAAe,EAAE,UAAU;oBAC3B,QAAQ,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI;oBACxB,GAAG,EAAE,YAAY;iBAClB,CAAC,CAAC;gBACH,IAAI,YAAY,EAAE,CAAC;oBACjB,cAAc,GAAG,YAAY,CAAC,EAAE,CAAC;gBACnC,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,SAAS;YACX,CAAC;QACH,CAAC;QAED,MAAM,WAAW,CAAC;YAChB,gBAAgB,EAAE,YAAY;YAC9B,UAAU,EAAE,MAAM;YAClB,YAAY,EAAE,IAAI;YAClB,SAAS,EAAE,UAAU,CAAC,WAAW,IAAI,IAAI;YACzC,IAAI;YACJ,KAAK,EAAE,KAAK,IAAI,IAAI;YACpB,cAAc,EAAE,cAAc,IAAI,IAAI;YACtC,eAAe,EAAE,eAAe,IAAI,IAAI;YACxC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,cAAc,EAAE,QAAQ;YACxB,aAAa,EAAE,cAAc;SAC9B,CAAC,CAAC;QAEH,2EAA2E;QAC3E,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;QAC1D,SAAS,CAAC,2DAA2D,CAAC,CAAC;QACvE,OAAO;IACT,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,0DAA0D;QAC1D,IAAI,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC;YAC9B,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACvE,UAAU,CAAC,0BAA0B,OAAO,EAAE,CAAC,CAAC;YAChD,MAAM,2BAA2B,EAAE,CAAC;YACpC,OAAO;QACT,CAAC;QACD,kCAAkC;QAClC,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAKD,SAAS,YAAY,CAAC,KAAc,EAAE,OAA0B;IAC9D,MAAM,KAAK,GAAG,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC;IACnD,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;QAC3B,UAAU,CAAC,GAAG,KAAK,WAAW,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;IACjD,CAAC;SAAM,CAAC;QACN,UAAU,CAAC,GAAG,KAAK,WAAW,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACjD,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,YAAuB,SAAS,EAChC,kBAAmC,oBAAoB;IAEvD,uCAAuC;IACvC,OAAO,IAAI,EAAE,CAAC;QACZ,IAAI,eAA4C,CAAC;QAEjD,IAAI,CAAC;YACH,eAAe,GAAG,MAAM,SAAS,EAAE,CAAC;QACtC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,YAAY,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YAC1B,MAAM,2BAA2B,EAAE,CAAC;YACpC,SAAS;QACX,CAAC;QAED,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,kDAAkD;YAClD,SAAS,CAAC,UAAU,CAAC,CAAC;YACtB,MAAM;QACR,CAAC;QAED,IAAI,CAAC;YACH,MAAM,eAAe,CAAC,eAAe,CAAC,CAAC;QACzC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,YAAY,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;YAChC,MAAM,2BAA2B,EAAE,CAAC;QACtC,CAAC;IACH,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,IAAI;IACxB,+BAA+B;IAC/B,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAC1E,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACpE,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAE5C,6CAA6C;IAC7C,IAAI,eAAe,EAAE,CAAC;QACpB,MAAM,WAAW,EAAE,CAAC;QACpB,OAAO;IACT,CAAC;IAED,IAAI,YAAY,EAAE,CAAC;QACjB,QAAQ,EAAE,CAAC;QACX,OAAO;IACT,CAAC;IAED,qDAAqD;IACrD,IAAI,YAAY,EAAE,CAAC;QACjB,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,MAAM,CAAC,uBAAuB,CAAC,CAAC;QACjE,MAAM,cAAc,EAAE,CAAC;QACvB,OAAO;IACT,CAAC;IAED,iDAAiD;IACjD,IAAI,CAAC,CAAC,MAAM,eAAe,EAAE,CAAC,EAAE,CAAC;QAC/B,UAAU,CAAC,8CAA8C,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAC1E,SAAS,CACP,6EAA6E,CAC9E,CAAC;QAEF,oCAAoC;QACpC,SAAS,CACP,+EAA+E,CAChF,CAAC;QACF,SAAS,CAAC,gDAAgD,CAAC,CAAC;QAC5D,SAAS,CAAC,8CAA8C,CAAC,CAAC;QAC1D,SAAS,CAAC,yBAAyB,CAAC,CAAC;QAErC,MAAM,2BAA2B,EAAE,CAAC;QACpC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,kBAAkB,EAAE,CAAC;AAC7B,CAAC;AAED,0DAA0D;AAC1D,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,UAAU,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IACpD,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QAC3B,OAAO,CAAC,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;QACrC,MAAM,2BAA2B,EAAE,CAAC;QACpC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -327,7 +327,7 @@ export function BranchListScreen({
|
|
|
327
327
|
case "gemini-cli":
|
|
328
328
|
return chalk.magenta(label);
|
|
329
329
|
case "qwen-cli":
|
|
330
|
-
return chalk.
|
|
330
|
+
return chalk.gray(label);
|
|
331
331
|
default: {
|
|
332
332
|
const trimmed = label.trim().toLowerCase();
|
|
333
333
|
if (!toolId || trimmed === "unknown") {
|
|
@@ -32,6 +32,10 @@ const formatSkip = (skip?: boolean | null) =>
|
|
|
32
32
|
|
|
33
33
|
const supportsReasoning = (toolId?: string | null) => toolId === "codex-cli";
|
|
34
34
|
|
|
35
|
+
const UNSUPPORTED_TOOL_ID = "qwen-cli";
|
|
36
|
+
const UNSUPPORTED_TOOL_MESSAGE = "Unsupported tool (Qwen CLI). ";
|
|
37
|
+
const UNSUPPORTED_TOOL_CATEGORY_LABEL = "Qwen (unsupported)";
|
|
38
|
+
|
|
35
39
|
const describe = (opt: BranchQuickStartOption, includeSessionId = true) => {
|
|
36
40
|
const parts = [`Model: ${opt.model ?? "default"}`];
|
|
37
41
|
if (supportsReasoning(opt.toolId)) {
|
|
@@ -111,6 +115,7 @@ export function BranchQuickStartScreen({
|
|
|
111
115
|
const flat: QuickStartItem[] = [];
|
|
112
116
|
sorted.forEach((opt, idx) => {
|
|
113
117
|
const cat = resolveCategory(opt.toolId);
|
|
118
|
+
const isUnsupportedTool = opt.toolId === UNSUPPORTED_TOOL_ID;
|
|
114
119
|
const prevCat =
|
|
115
120
|
idx > 0 ? resolveCategory(sorted[idx - 1]?.toolId).label : null;
|
|
116
121
|
const isNewCategory = prevCat !== cat.label;
|
|
@@ -121,7 +126,10 @@ export function BranchQuickStartScreen({
|
|
|
121
126
|
value: `reuse-continue:${opt.toolId ?? "unknown"}:${idx}`,
|
|
122
127
|
action: "reuse-continue",
|
|
123
128
|
toolId: opt.toolId ?? null,
|
|
124
|
-
description:
|
|
129
|
+
description: isUnsupportedTool
|
|
130
|
+
? `${UNSUPPORTED_TOOL_MESSAGE}${describe(opt, true)}`
|
|
131
|
+
: describe(opt, true),
|
|
132
|
+
...(isUnsupportedTool ? { disabled: true } : {}),
|
|
125
133
|
groupStart: isNewCategory && flat.length > 0,
|
|
126
134
|
category: cat.label,
|
|
127
135
|
categoryColor: cat.color,
|
|
@@ -131,7 +139,10 @@ export function BranchQuickStartScreen({
|
|
|
131
139
|
value: `reuse-new:${opt.toolId ?? "unknown"}:${idx}`,
|
|
132
140
|
action: "reuse-new",
|
|
133
141
|
toolId: opt.toolId ?? null,
|
|
134
|
-
description:
|
|
142
|
+
description: isUnsupportedTool
|
|
143
|
+
? `${UNSUPPORTED_TOOL_MESSAGE}${describe(opt, false)}`
|
|
144
|
+
: describe(opt, false),
|
|
145
|
+
...(isUnsupportedTool ? { disabled: true } : {}),
|
|
135
146
|
groupStart: false,
|
|
136
147
|
category: cat.label,
|
|
137
148
|
categoryColor: cat.color,
|
|
@@ -197,27 +208,34 @@ export function BranchQuickStartScreen({
|
|
|
197
208
|
if (item.disabled) return;
|
|
198
209
|
onSelect(item.action, item.toolId ?? null);
|
|
199
210
|
}}
|
|
200
|
-
renderItem={(item: QuickStartItem, isSelected) =>
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
<
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
211
|
+
renderItem={(item: QuickStartItem, isSelected) => {
|
|
212
|
+
const categoryLabel =
|
|
213
|
+
item.toolId === UNSUPPORTED_TOOL_ID
|
|
214
|
+
? UNSUPPORTED_TOOL_CATEGORY_LABEL
|
|
215
|
+
: item.category;
|
|
216
|
+
|
|
217
|
+
return (
|
|
218
|
+
<Box
|
|
219
|
+
flexDirection="column"
|
|
220
|
+
marginTop={
|
|
221
|
+
item.groupStart ? 1 : item.category === "Other" ? 1 : 0
|
|
222
|
+
}
|
|
223
|
+
>
|
|
224
|
+
<Text>
|
|
225
|
+
<Text color={item.categoryColor} inverse={isSelected}>
|
|
226
|
+
{`[${categoryLabel}] `}
|
|
227
|
+
</Text>
|
|
228
|
+
<Text inverse={isSelected}>
|
|
229
|
+
{item.label}
|
|
230
|
+
{item.disabled ? " (disabled)" : ""}
|
|
231
|
+
</Text>
|
|
214
232
|
</Text>
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
233
|
+
{item.description && (
|
|
234
|
+
<Text color="gray"> {item.description}</Text>
|
|
235
|
+
)}
|
|
236
|
+
</Box>
|
|
237
|
+
);
|
|
238
|
+
}}
|
|
221
239
|
/>
|
|
222
240
|
</Box>
|
|
223
241
|
|
|
@@ -37,7 +37,6 @@ const TOOL_LABELS: Record<string, string> = {
|
|
|
37
37
|
"claude-code": "Claude Code",
|
|
38
38
|
"codex-cli": "Codex",
|
|
39
39
|
"gemini-cli": "Gemini",
|
|
40
|
-
"qwen-cli": "Qwen",
|
|
41
40
|
};
|
|
42
41
|
|
|
43
42
|
const INFERENCE_LABELS: Record<InferenceLevel, string> = {
|
|
@@ -255,13 +254,6 @@ export function ModelSelectorScreen({
|
|
|
255
254
|
{modelOptions.length === 0 ? " (no options)" : ""}
|
|
256
255
|
</Text>
|
|
257
256
|
</Box>
|
|
258
|
-
{tool === "qwen-cli" ? (
|
|
259
|
-
<Box marginBottom={1} flexDirection="column">
|
|
260
|
-
<Text>Latest Qwen models from Alibaba Cloud ModelStudio:</Text>
|
|
261
|
-
<Text>• coder-model (qwen3-coder-plus-2025-09-23)</Text>
|
|
262
|
-
<Text>• vision-model (qwen3-vl-plus-2025-09-23)</Text>
|
|
263
|
-
</Box>
|
|
264
|
-
) : null}
|
|
265
257
|
|
|
266
258
|
{modelItems.length === 0 ? (
|
|
267
259
|
<Select
|
|
@@ -8,13 +8,13 @@ import {
|
|
|
8
8
|
const byId = (tool: string) => getModelOptions(tool).map((m) => m.id);
|
|
9
9
|
|
|
10
10
|
describe("modelOptions", () => {
|
|
11
|
-
it("lists Claude official aliases and sets
|
|
11
|
+
it("lists Claude official aliases and sets Default as default", () => {
|
|
12
12
|
const options = getModelOptions("claude-code");
|
|
13
13
|
const ids = options.map((m) => m.id);
|
|
14
|
-
expect(ids).toEqual(["opus", "sonnet", "haiku"]);
|
|
14
|
+
expect(ids).toEqual(["", "opus", "sonnet", "haiku"]);
|
|
15
15
|
const defaultModel = getDefaultModelOption("claude-code");
|
|
16
|
-
expect(defaultModel?.id).toBe("
|
|
17
|
-
expect(defaultModel?.label).toBe("
|
|
16
|
+
expect(defaultModel?.id).toBe("");
|
|
17
|
+
expect(defaultModel?.label).toBe("Default (Auto)");
|
|
18
18
|
});
|
|
19
19
|
|
|
20
20
|
it("has unique Codex models", () => {
|
|
@@ -22,6 +22,7 @@ describe("modelOptions", () => {
|
|
|
22
22
|
const unique = new Set(ids);
|
|
23
23
|
expect(unique.size).toBe(ids.length);
|
|
24
24
|
expect(ids).toEqual([
|
|
25
|
+
"",
|
|
25
26
|
"gpt-5.1-codex",
|
|
26
27
|
"gpt-5.2",
|
|
27
28
|
"gpt-5.1-codex-max",
|
|
@@ -52,14 +53,16 @@ describe("modelOptions", () => {
|
|
|
52
53
|
|
|
53
54
|
it("lists expected Gemini models", () => {
|
|
54
55
|
expect(byId("gemini-cli")).toEqual([
|
|
56
|
+
"",
|
|
55
57
|
"gemini-3-pro-preview",
|
|
58
|
+
"gemini-3-flash-preview",
|
|
56
59
|
"gemini-2.5-pro",
|
|
57
60
|
"gemini-2.5-flash",
|
|
58
61
|
"gemini-2.5-flash-lite",
|
|
59
62
|
]);
|
|
60
63
|
});
|
|
61
64
|
|
|
62
|
-
it("
|
|
63
|
-
expect(byId("qwen-cli")).toEqual([
|
|
65
|
+
it("returns no models for unsupported tools", () => {
|
|
66
|
+
expect(byId("qwen-cli")).toEqual([]);
|
|
64
67
|
});
|
|
65
68
|
});
|
|
@@ -5,12 +5,17 @@ const CODEX_MAX_LEVELS: InferenceLevel[] = ["xhigh", "high", "medium", "low"];
|
|
|
5
5
|
|
|
6
6
|
const MODEL_OPTIONS: Record<string, ModelOption[]> = {
|
|
7
7
|
"claude-code": [
|
|
8
|
+
{
|
|
9
|
+
id: "",
|
|
10
|
+
label: "Default (Auto)",
|
|
11
|
+
description: "Use Claude Code default behavior",
|
|
12
|
+
isDefault: true,
|
|
13
|
+
},
|
|
8
14
|
{
|
|
9
15
|
id: "opus",
|
|
10
16
|
label: "Opus 4.5",
|
|
11
17
|
description:
|
|
12
18
|
"Official Opus alias for Claude Code (non-custom, matches /model option).",
|
|
13
|
-
isDefault: true,
|
|
14
19
|
},
|
|
15
20
|
{
|
|
16
21
|
id: "sonnet",
|
|
@@ -25,13 +30,20 @@ const MODEL_OPTIONS: Record<string, ModelOption[]> = {
|
|
|
25
30
|
},
|
|
26
31
|
],
|
|
27
32
|
"codex-cli": [
|
|
33
|
+
{
|
|
34
|
+
id: "",
|
|
35
|
+
label: "Default (Auto)",
|
|
36
|
+
description: "Use Codex default model",
|
|
37
|
+
isDefault: true,
|
|
38
|
+
inferenceLevels: CODEX_BASE_LEVELS,
|
|
39
|
+
defaultInference: "high",
|
|
40
|
+
},
|
|
28
41
|
{
|
|
29
42
|
id: "gpt-5.1-codex",
|
|
30
43
|
label: "gpt-5.1-codex",
|
|
31
44
|
description: "Standard Codex model",
|
|
32
45
|
inferenceLevels: CODEX_BASE_LEVELS,
|
|
33
46
|
defaultInference: "high",
|
|
34
|
-
isDefault: true,
|
|
35
47
|
},
|
|
36
48
|
{
|
|
37
49
|
id: "gpt-5.2",
|
|
@@ -63,12 +75,22 @@ const MODEL_OPTIONS: Record<string, ModelOption[]> = {
|
|
|
63
75
|
},
|
|
64
76
|
],
|
|
65
77
|
"gemini-cli": [
|
|
78
|
+
{
|
|
79
|
+
id: "",
|
|
80
|
+
label: "Default (Auto)",
|
|
81
|
+
description: "Use Gemini CLI default model",
|
|
82
|
+
isDefault: true,
|
|
83
|
+
},
|
|
66
84
|
{
|
|
67
85
|
id: "gemini-3-pro-preview",
|
|
68
86
|
label: "Pro (gemini-3-pro-preview)",
|
|
69
87
|
description:
|
|
70
88
|
"Default Pro. Falls back to gemini-2.5-pro when preview is unavailable.",
|
|
71
|
-
|
|
89
|
+
},
|
|
90
|
+
{
|
|
91
|
+
id: "gemini-3-flash-preview",
|
|
92
|
+
label: "Flash (gemini-3-flash-preview)",
|
|
93
|
+
description: "Next-generation high-speed model",
|
|
72
94
|
},
|
|
73
95
|
{
|
|
74
96
|
id: "gemini-2.5-pro",
|
|
@@ -86,21 +108,6 @@ const MODEL_OPTIONS: Record<string, ModelOption[]> = {
|
|
|
86
108
|
description: "Fastest for simple tasks",
|
|
87
109
|
},
|
|
88
110
|
],
|
|
89
|
-
"qwen-cli": [
|
|
90
|
-
{
|
|
91
|
-
id: "coder-model",
|
|
92
|
-
label: "Coder Model",
|
|
93
|
-
description:
|
|
94
|
-
"Latest Qwen Coder model (qwen3-coder-plus-2025-09-23) from Alibaba Cloud ModelStudio",
|
|
95
|
-
isDefault: true,
|
|
96
|
-
},
|
|
97
|
-
{
|
|
98
|
-
id: "vision-model",
|
|
99
|
-
label: "Vision Model",
|
|
100
|
-
description:
|
|
101
|
-
"Latest Qwen Vision model (qwen3-vl-plus-2025-09-23) from Alibaba Cloud ModelStudio",
|
|
102
|
-
},
|
|
103
|
-
],
|
|
104
111
|
};
|
|
105
112
|
|
|
106
113
|
export function getModelOptions(tool: AITool): ModelOption[] {
|
package/src/config/tools.ts
CHANGED
|
@@ -299,13 +299,17 @@ export async function getToolById(
|
|
|
299
299
|
export async function getAllTools(): Promise<AIToolConfig[]> {
|
|
300
300
|
const config = await loadToolsConfig();
|
|
301
301
|
|
|
302
|
+
// Builtin tools that are reserved but not exposed in selectors.
|
|
303
|
+
// These IDs remain blocked from customTools to avoid ambiguity.
|
|
304
|
+
const UNSUPPORTED_BUILTIN_TOOL_IDS = new Set<string>(["qwen-cli"]);
|
|
305
|
+
|
|
302
306
|
// ビルトインツールをAIToolConfig形式に変換
|
|
303
307
|
const builtinConfigs: AIToolConfig[] = BUILTIN_TOOLS.map((tool) => ({
|
|
304
308
|
id: tool.id,
|
|
305
309
|
displayName: tool.displayName,
|
|
306
310
|
...(tool.icon ? { icon: tool.icon } : {}),
|
|
307
311
|
isBuiltin: true,
|
|
308
|
-
}));
|
|
312
|
+
})).filter((tool) => !UNSUPPORTED_BUILTIN_TOOL_IDS.has(tool.id));
|
|
309
313
|
|
|
310
314
|
// カスタムツールをAIToolConfig形式に変換
|
|
311
315
|
const customConfigs: AIToolConfig[] = config.customTools.map((tool) => ({
|