@akiojin/gwt 2.2.0 → 2.4.0

package/src/qwen.ts

@@ -0,0 +1,213 @@
+import { execa } from "execa";
+import chalk from "chalk";
+import { existsSync } from "fs";
+import { createChildStdio, getTerminalStreams } from "./utils/terminal.js";
+
+const QWEN_CLI_PACKAGE = "@qwen-code/qwen-code@latest";
+
+export class QwenError extends Error {
+  constructor(
+    message: string,
+    public cause?: unknown,
+  ) {
+    super(message);
+    this.name = "QwenError";
+  }
+}
+
+export async function launchQwenCLI(
+  worktreePath: string,
+  options: {
+    skipPermissions?: boolean;
+    mode?: "normal" | "continue" | "resume";
+    extraArgs?: string[];
+    envOverrides?: Record<string, string>;
+    model?: string;
+  } = {},
+): Promise<void> {
+  const terminal = getTerminalStreams();
+
+  try {
+    // Check if the worktree path exists
+    if (!existsSync(worktreePath)) {
+      throw new Error(`Worktree path does not exist: ${worktreePath}`);
+    }
+
+    console.log(chalk.blue("🚀 Launching Qwen CLI..."));
+    console.log(chalk.gray(`   Working directory: ${worktreePath}`));
+
+    const args: string[] = ["--checkpointing"];
+
+    if (options.model) {
+      args.push("--model", options.model);
+      console.log(chalk.green(`   🎯 Model: ${options.model}`));
+    }
+
+    // Handle execution mode
+    // Note: Qwen CLI doesn't have explicit continue/resume CLI options at startup.
+    // Session management is done via /chat commands during interactive sessions.
+    switch (options.mode) {
+      case "continue":
+        console.log(
+          chalk.cyan(
+            "   ⏭️  Starting session (use /chat resume in the CLI to continue)",
+          ),
+        );
+        break;
+      case "resume":
+        console.log(
+          chalk.cyan(
+            "   🔄 Starting session (use /chat resume in the CLI to continue)",
+          ),
+        );
+        break;
+      case "normal":
+      default:
+        console.log(chalk.green("   ✨ Starting new session"));
+        break;
+    }
+
+    // Handle skip permissions (YOLO mode)
+    if (options.skipPermissions) {
+      args.push("--yolo");
+      console.log(
+        chalk.yellow("   ⚠️  Auto-approving all actions (YOLO mode)"),
+      );
+    }
+
+    // Append any pass-through arguments after our flags
+    if (options.extraArgs && options.extraArgs.length > 0) {
+      args.push(...options.extraArgs);
+    }
+
+    terminal.exitRawMode();
+
+    const baseEnv = {
+      ...process.env,
+      ...(options.envOverrides ?? {}),
+    };
+
+    const childStdio = createChildStdio();
+
+    // Auto-detect locally installed qwen command
+    const hasLocalQwen = await isQwenCommandAvailable();
+
+    try {
+      if (hasLocalQwen) {
+        // Use locally installed qwen command
+        console.log(chalk.green("   ✨ Using locally installed qwen command"));
+        await execa("qwen", args, {
+          cwd: worktreePath,
+          shell: true,
+          stdin: childStdio.stdin,
+          stdout: childStdio.stdout,
+          stderr: childStdio.stderr,
+          env: baseEnv,
+        } as any);
+      } else {
+        // Fallback to bunx
+        console.log(
+          chalk.cyan("   🔄 Falling back to bunx @qwen-code/qwen-code@latest"),
+        );
+        console.log(
+          chalk.yellow(
+            "   💡 Recommended: Install Qwen CLI globally for faster startup",
+          ),
+        );
+        console.log(chalk.yellow("      npm install -g @qwen-code/qwen-code"));
+        console.log("");
+        // Wait 2 seconds to let user read the message
+        await new Promise((resolve) => setTimeout(resolve, 2000));
+        await execa("bunx", [QWEN_CLI_PACKAGE, ...args], {
+          cwd: worktreePath,
+          shell: true,
+          stdin: childStdio.stdin,
+          stdout: childStdio.stdout,
+          stderr: childStdio.stderr,
+          env: baseEnv,
+        } as any);
+      }
+    } finally {
+      childStdio.cleanup();
+    }
+  } catch (error: any) {
+    const hasLocalQwen = await isQwenCommandAvailable();
+    let errorMessage: string;
+
+    if (error.code === "ENOENT") {
+      if (hasLocalQwen) {
+        errorMessage =
+          "qwen command not found. Please ensure Qwen CLI is properly installed.";
+      } else {
+        errorMessage =
+          "bunx command not found. Please ensure Bun is installed so Qwen CLI can run via bunx.";
+      }
+    } else {
+      errorMessage = `Failed to launch Qwen CLI: ${error.message || "Unknown error"}`;
+    }
+
+    if (process.platform === "win32") {
+      console.error(chalk.red("\n💡 Windows troubleshooting tips:"));
+      if (hasLocalQwen) {
+        console.error(
+          chalk.yellow(
+            "   1. Confirm that Qwen CLI is installed and the 'qwen' command is on PATH",
+          ),
+        );
+        console.error(
+          chalk.yellow('   2. Run "qwen --version" to verify the setup'),
+        );
+      } else {
+        console.error(
+          chalk.yellow(
+            "   1. Confirm that Bun is installed and bunx is available",
+          ),
+        );
+        console.error(
+          chalk.yellow(
+            '   2. Run "bunx @qwen-code/qwen-code@latest -- --version" to verify the setup',
+          ),
+        );
+      }
+      console.error(
+        chalk.yellow("   3. Restart your terminal or IDE to refresh PATH"),
+      );
+    }
+
+    throw new QwenError(errorMessage, error);
+  } finally {
+    terminal.exitRawMode();
+  }
+}
+
+/**
+ * Check if locally installed `qwen` command is available
+ * @returns true if `qwen` command exists in PATH, false otherwise
+ */
+async function isQwenCommandAvailable(): Promise<boolean> {
+  try {
+    const command = process.platform === "win32" ? "where" : "which";
+    await execa(command, ["qwen"], { shell: true });
+    return true;
+  } catch {
+    // qwen command not found in PATH
+    return false;
+  }
+}
+
+export async function isQwenCLIAvailable(): Promise<boolean> {
+  try {
+    await execa("bunx", [QWEN_CLI_PACKAGE, "--version"], { shell: true });
+    return true;
+  } catch (error: any) {
+    if (error.code === "ENOENT") {
+      console.error(chalk.yellow("\n⚠️  bunx command not found"));
+      console.error(
+        chalk.gray(
+          "   Install Bun and confirm that bunx is available before continuing",
+        ),
+      );
+    }
+    return false;
+  }
+}

package/src/services/git.service.ts

@@ -52,7 +52,8 @@ export class GitService {
 
   private getBranchType(branchName: string): BranchInfo["branchType"] {
     if (branchName.startsWith("feature/")) return "feature";
-    if (branchName.startsWith("bugfix/") || branchName.startsWith("bug/")) return "bugfix";
+    if (branchName.startsWith("bugfix/") || branchName.startsWith("bug/"))
+      return "bugfix";
     if (branchName.startsWith("hotfix/")) return "hotfix";
     if (branchName.startsWith("release/")) return "release";
     if (branchName === "main" || branchName === "master") return "main";

package/src/web/client/src/components/BranchGraph.tsx

@@ -61,7 +61,7 @@ export function BranchGraph({ branches }: BranchGraphProps) {
 
       if (!laneMap.has(base)) {
         const baseNode =
-          base !== UNKNOWN_BASE ? branchMap.get(base) ?? null : null;
+          base !== UNKNOWN_BASE ? (branchMap.get(base) ?? null) : null;
         laneMap.set(base, {
           id: base,
           baseLabel: base === UNKNOWN_BASE ? "ベース不明" : base,
@@ -103,7 +103,8 @@ export function BranchGraph({ branches }: BranchGraphProps) {
           <p className="branch-graph-panel__eyebrow">BRANCH GRAPH</p>
           <h2>ベースブランチの関係をグラフィカルに把握</h2>
           <p>
-            baseRef、Git upstream、merge-baseヒューリスティクスを用いて推定したベースブランチ単位で
+            baseRef、Git
+            upstream、merge-baseヒューリスティクスを用いて推定したベースブランチ単位で
             派生ノードをレーン表示します。
           </p>
         </div>

package/src/web/client/src/components/EnvEditor.tsx

@@ -21,7 +21,9 @@ const KEY_PATTERN = /^[A-Z0-9_]+$/;
 
 export function createEnvRow(variable?: Partial<EnvRow>): EnvRow {
   const row: EnvRow = {
-    id: variable?.id ?? `env-${Date.now()}-${Math.random().toString(36).slice(2)}`,
+    id:
+      variable?.id ??
+      `env-${Date.now()}-${Math.random().toString(36).slice(2)}`,
     key: variable?.key ?? "",
     value: variable?.value ?? "",
   };
@@ -49,13 +51,20 @@ export function EnvEditor({
   allowAdd = true,
   emptyLabel = "環境変数はまだありません",
 }: EnvEditorProps) {
-  const handleFieldChange = (id: string, field: "key" | "value", value: string) => {
+  const handleFieldChange = (
+    id: string,
+    field: "key" | "value",
+    value: string,
+  ) => {
     onChange(
       rows.map((row) =>
         row.id === id
           ? {
               ...row,
-              [field]: field === "key" ? value.toUpperCase().replace(/[^A-Z0-9_]/g, "_") : value,
+              [field]:
+                field === "key"
+                  ? value.toUpperCase().replace(/[^A-Z0-9_]/g, "_")
+                  : value,
             }
           : row,
       ),
@@ -75,10 +84,16 @@ export function EnvEditor({
       <header className="env-editor__header">
         <div>
           <h3>{title}</h3>
-          {description && <p className="env-editor__description">{description}</p>}
+          {description && (
+            <p className="env-editor__description">{description}</p>
+          )}
         </div>
         {allowAdd && (
-          <button type="button" className="button button--secondary" onClick={handleAdd}>
+          <button
+            type="button"
+            className="button button--secondary"
+            onClick={handleAdd}
+          >
             変数を追加
           </button>
         )}
@@ -99,29 +114,47 @@ export function EnvEditor({
             {rows.map((row) => {
               const keyInvalid = isInvalidKey(row);
               return (
-                <tr key={row.id} className={keyInvalid ? "env-editor__row--invalid" : undefined}>
+                <tr
+                  key={row.id}
+                  className={
+                    keyInvalid ? "env-editor__row--invalid" : undefined
+                  }
+                >
                   <td>
                     <input
                       type="text"
                       value={row.key}
-                      onChange={(event) => handleFieldChange(row.id, "key", event.target.value)}
+                      onChange={(event) =>
+                        handleFieldChange(row.id, "key", event.target.value)
+                      }
                       placeholder="EXAMPLE_KEY"
                     />
                     {row.importedFromOs && (
-                      <span className="pill pill--info" style={{ marginLeft: "0.5rem" }}>
+                      <span
+                        className="pill pill--info"
+                        style={{ marginLeft: "0.5rem" }}
+                      >
                         OSから取り込み
                       </span>
                     )}
                     {row.lastUpdated && (
-                      <span className="env-editor__meta">更新: {new Date(row.lastUpdated).toLocaleString()}</span>
+                      <span className="env-editor__meta">
+                        更新: {new Date(row.lastUpdated).toLocaleString()}
+                      </span>
+                    )}
+                    {keyInvalid && (
+                      <p className="env-editor__error">
+                        A-Z,0-9,_ のみ使用できます
+                      </p>
                     )}
-                    {keyInvalid && <p className="env-editor__error">A-Z,0-9,_ のみ使用できます</p>}
                   </td>
                   <td>
                     <input
                       type="text"
                       value={row.value}
-                      onChange={(event) => handleFieldChange(row.id, "value", event.target.value)}
+                      onChange={(event) =>
+                        handleFieldChange(row.id, "value", event.target.value)
+                      }
                       placeholder="値"
                     />
                   </td>