@iloom/cli 0.1.18 → 0.2.0

package/dist/index.js

@@ -231,7 +231,11 @@ var init_SettingsManager = __esm({
         github: z.object({
           remote: z.string().min(1, "Remote name cannot be empty").describe("Git remote name to use for GitHub operations")
         }).optional()
-      }).optional().describe("Issue management configuration")
+      }).optional().describe("Issue management configuration"),
+      mergeBehavior: z.object({
+        mode: z.enum(["local", "github-pr"]).default("local"),
+        remote: z.string().optional()
+      }).optional().describe("Merge behavior configuration: local (merge locally) or github-pr (create PR)")
     });
     SettingsManager = class {
       /**
@@ -413,10 +417,13 @@ async function openTerminalWindow(options) {
       `Terminal window launching not yet supported on ${platform}. Currently only macOS is supported.`
     );
   }
-  const applescript = buildAppleScript(options);
+  const hasITerm2 = await detectITerm2();
+  const applescript = hasITerm2 ? buildITerm2SingleTabScript(options) : buildAppleScript(options);
   try {
     await execa2("osascript", ["-e", applescript]);
-    await execa2("osascript", ["-e", 'tell application "Terminal" to activate']);
+    if (!hasITerm2) {
+      await execa2("osascript", ["-e", 'tell application "Terminal" to activate']);
+    }
   } catch (error) {
     throw new Error(
       `Failed to open terminal window: ${error instanceof Error ? error.message : "Unknown error"}`
@@ -465,6 +472,28 @@ function escapePathForAppleScript(path5) {
 function escapeForAppleScript(command) {
   return command.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
 }
+function buildITerm2SingleTabScript(options) {
+  const command = buildCommandSequence(options);
+  let script = 'tell application id "com.googlecode.iterm2"\n';
+  script += "  create window with default profile\n";
+  script += "  set s1 to current session of current window\n\n";
+  if (options.backgroundColor) {
+    const { r, g, b } = options.backgroundColor;
+    script += `  set background color of s1 to {${Math.round(r * 257)}, ${Math.round(g * 257)}, ${Math.round(b * 257)}}
+`;
+  }
+  script += `  tell s1 to write text "${escapeForAppleScript(command)}"
+
+`;
+  if (options.title) {
+    script += `  set name of s1 to "${escapeForAppleScript(options.title)}"
+
+`;
+  }
+  script += "  activate\n";
+  script += "end tell";
+  return script;
+}
 function buildCommandSequence(options) {
   const {
     workspacePath,
@@ -1826,12 +1855,39 @@ async function checkGhAuth() {
   var _a, _b;
   try {
     const output = await executeGhCommand(["auth", "status"]);
-    const scopeMatch = output.match(/Token scopes: (.+)/);
-    const userMatch = output.match(/Logged in to github\.com as ([^\s]+)/);
-    const username = userMatch == null ? void 0 : userMatch[1];
+    const lines = output.split("\n");
+    let username;
+    let scopes = [];
+    for (let i = 0; i < lines.length; i++) {
+      const line = lines[i];
+      const newFormatMatch = line == null ? void 0 : line.match(/Logged in to github\.com account ([^\s(]+)/);
+      if (newFormatMatch) {
+        const accountName = newFormatMatch[1];
+        const nextFewLines = lines.slice(i + 1, i + 5).join("\n");
+        const isActive = nextFewLines.includes("Active account: true");
+        if (isActive || !username && !output.includes("Active account:")) {
+          username = accountName;
+          const scopeMatch = nextFewLines.match(/Token scopes: (.+)/);
+          if (scopeMatch == null ? void 0 : scopeMatch[1]) {
+            scopes = scopeMatch[1].split(", ").map((scope) => scope.replace(/^'|'$/g, ""));
+          }
+          if (isActive) break;
+        }
+      }
+      if (!username) {
+        const oldFormatMatch = line == null ? void 0 : line.match(/Logged in to github\.com as ([^\s]+)/);
+        if (oldFormatMatch) {
+          username = oldFormatMatch[1];
+        }
+      }
+    }
+    if (scopes.length === 0) {
+      const scopeMatch = output.match(/Token scopes: (.+)/);
+      scopes = ((_a = scopeMatch == null ? void 0 : scopeMatch[1]) == null ? void 0 : _a.split(", ").map((scope) => scope.replace(/^'|'$/g, ""))) ?? [];
+    }
     return {
       hasAuth: true,
-      scopes: ((_a = scopeMatch == null ? void 0 : scopeMatch[1]) == null ? void 0 : _a.split(", ").map((scope) => scope.replace(/^'|'$/g, ""))) ?? [],
+      scopes,
       ...username && { username }
     };
   } catch (error) {
@@ -2875,6 +2931,12 @@ var PromptTemplateManager = class {
     if (variables.NO_REMOTES !== void 0) {
       result = result.replace(/NO_REMOTES/g, variables.NO_REMOTES);
     }
+    if (variables.README_CONTENT !== void 0) {
+      result = result.replace(/README_CONTENT/g, variables.README_CONTENT);
+    }
+    if (variables.SETTINGS_SCHEMA_CONTENT !== void 0) {
+      result = result.replace(/SETTINGS_SCHEMA_CONTENT/g, variables.SETTINGS_SCHEMA_CONTENT);
+    }
     return result;
   }
   /**
@@ -2921,6 +2983,12 @@ var PromptTemplateManager = class {
     } else {
       result = result.replace(noRemotesRegex, "");
     }
+    const firstTimeUserRegex = /\{\{#IF FIRST_TIME_USER\}\}(.*?)\{\{\/IF FIRST_TIME_USER\}\}/gs;
+    if (variables.FIRST_TIME_USER === true) {
+      result = result.replace(firstTimeUserRegex, "$1");
+    } else {
+      result = result.replace(firstTimeUserRegex, "");
+    }
     return result;
   }
   /**