@snelusha/noto 1.1.1 → 1.1.2

package/README.md

@@ -109,13 +109,13 @@ noto checkout
 To copy the selected branch to your clipboard immediately after choosing it, use the new `-c` flag:
 
 ```bash
-noto checkout -c
+noto branch
 ```
 
-To list all branches, including remote branches, use the -r flag (note: while remote branches are listed, you currently cannot checkout to remote branches):
+To list all branches, including remote branches, use the -r flag
 
 ```bash
-noto checkout -r
+noto branch -r
 ```
 
 ## Pro Tips

package/dist/index.js

@@ -1,6 +1,6 @@
 // src/index.ts
-import * as p7 from "@clack/prompts";
-import color8 from "picocolors";
+import * as p8 from "@clack/prompts";
+import color9 from "picocolors";
 
 // src/utils/parser.ts
 import arg from "arg";
@@ -12,21 +12,21 @@ var parse = (schema, raw) => {
   };
 };
 var safeParse = (schema, raw) => {
-  let current = { ...schema };
+  let current2 = { ...schema };
   let iterations = 0;
-  const maxIterations = Object.keys(current).filter(
-    (key2) => current[key2] === String
+  const maxIterations = Object.keys(current2).filter(
+    (key2) => current2[key2] === String
   ).length;
   while (iterations++ < maxIterations) {
     try {
-      return parse(current, raw);
+      return parse(current2, raw);
     } catch (error) {
       if (error.code === "ARG_MISSING_REQUIRED_LONGARG") {
         const match = error.message.match(/(--\w[\w-]*)/);
         if (match) {
           const missingFlag = match[0];
-          if (current[missingFlag] === String) {
-            current[missingFlag] = Boolean;
+          if (current2[missingFlag] === String) {
+            current2[missingFlag] = Boolean;
             continue;
           }
         }
@@ -34,7 +34,7 @@ var safeParse = (schema, raw) => {
       throw error;
     }
   }
-  return parse(current, raw);
+  return parse(current2, raw);
 };
 
 // src/commands/noto.ts
@@ -62,9 +62,7 @@ var AvailableModelsSchema = z.enum([
   "gemini-1.5-flash-8b-latest",
   "gemini-1.5-pro",
   "gemini-1.5-pro-latest",
-  "gemini-2.0-flash-lite-preview-02-05",
-  "gemini-2.0-flash-exp",
-  "gemini-2.0-pro-exp-02-05",
+  "gemini-2.0-flash-001",
   "gemini-2.5-pro-exp-03-25"
 ]);
 
@@ -274,7 +272,7 @@ var NotoError = class _NotoError extends Error {
 var google = createGoogleGenerativeAI({
   apiKey: (await StorageManager.get()).llm?.apiKey ?? "api-key"
 });
-var defaultModel = "gemini-2.0-pro-exp-02-05";
+var defaultModel = "gemini-2.0-flash-001";
 var models = {
   "gemini-1.5-flash": google("gemini-1.5-flash"),
   "gemini-1.5-flash-latest": google("gemini-1.5-flash-latest"),
@@ -282,22 +280,18 @@ var models = {
   "gemini-1.5-flash-8b-latest": google("gemini-1.5-flash-8b-latest"),
   "gemini-1.5-pro": google("gemini-1.5-pro"),
   "gemini-1.5-pro-latest": google("gemini-1.5-pro-latest"),
-  "gemini-2.0-flash-lite-preview-02-05": google(
-    "gemini-2.0-flash-lite-preview-02-05"
-  ),
-  "gemini-2.0-flash-exp": google("gemini-2.0-flash-exp"),
-  "gemini-2.0-pro-exp-02-05": google("gemini-2.0-pro-exp-02-05"),
+  "gemini-2.0-flash-001": google("gemini-2.0-flash-001"),
   "gemini-2.5-pro-exp-03-25": google("gemini-2.5-pro-exp-03-25")
 };
 var availableModels = Object.keys(models);
 var getModel = async () => {
   let model2 = (await StorageManager.get()).llm?.model;
-  if (!model2) {
+  if (!model2 || model2 === "gemini-2.0-pro-exp-02-05") {
     model2 = defaultModel;
-    await StorageManager.update((current) => ({
-      ...current,
+    await StorageManager.update((current2) => ({
+      ...current2,
       llm: {
-        ...current.llm,
+        ...current2.llm,
         model: model2
       }
     }));
@@ -441,8 +435,8 @@ var command = {
           message = editedMessage;
           p3.log.step(color3.green(message));
         }
-        await StorageManager.update((current) => ({
-          ...current,
+        await StorageManager.update((current2) => ({
+          ...current2,
           lastGeneratedMessage: message
         }));
         if (options["--copy"]) {
@@ -539,8 +533,8 @@ var command2 = {
             return await exit(1);
           }
           lastGeneratedMessage = editedMessage;
-          await StorageManager.update((current) => ({
-            ...current,
+          await StorageManager.update((current2) => ({
+            ...current2,
             lastGeneratedMessage: editedMessage
           }));
           p4.log.step(color4.green(lastGeneratedMessage));
@@ -581,22 +575,52 @@ var command2 = {
 };
 var prev_default = command2;
 
-// src/commands/checkout.ts
+// src/commands/branch.ts
 import * as p5 from "@clack/prompts";
 import color5 from "picocolors";
 import clipboard3 from "clipboardy";
 import dedent5 from "dedent";
-var command3 = {
-  name: "checkout",
-  description: "checkout a branch",
-  usage: "checkout [options]",
+var current = {
+  name: "current",
+  description: "get current branch",
+  usage: "branch current",
   options: [
     {
       type: Boolean,
       flag: "--copy",
       alias: "-c",
       description: "copy the selected branch to clipboard"
+    }
+  ],
+  execute: withRepository(
+    async (options) => {
+      if (!options.isRepo) {
+        p5.log.error(
+          dedent5`${color5.red("no git repository found in cwd.")}
+            ${color5.dim(`run ${color5.cyan("`git init`")} to initialize a new repository.`)}`
+        );
+        return await exit(1);
+      }
+      const branch = await getCurrentBranch();
+      if (!branch) {
+        p5.log.error("failed to fetch current branch");
+        return await exit(1);
+      }
+      p5.log.success(`current branch: ${color5.bold(branch)}`);
+      if (options["--copy"]) {
+        clipboard3.writeSync(branch);
+        p5.log.success(`${color5.green("copied to clipboard!")}`);
+      }
+      await exit(0);
     },
+    { enabled: false }
+  )
+};
+var command3 = {
+  name: "branch",
+  description: "list branches",
+  usage: "branch [options]",
+  options: [
     {
       type: Boolean,
       flag: "--remote",
@@ -621,7 +645,7 @@ var command3 = {
       }
       const currentBranch = await getCurrentBranch();
       const branch = await p5.select({
-        message: "select a branch to checkout",
+        message: "select a branch",
         options: branches.map((branch2) => ({
           value: branch2,
           label: color5.bold(
@@ -639,68 +663,125 @@ var command3 = {
         p5.log.error("no branch selected");
         return await exit(1);
       }
-      if (options["--copy"]) {
-        clipboard3.writeSync(branch);
-        p5.log.success(`copied ${color5.green(branch)} to clipboard`);
-        return await exit(0);
+      clipboard3.writeSync(branch);
+      p5.log.success(`${color5.green("copied to clipboard!")}`);
+      await exit(0);
+    },
+    { enabled: false }
+  ),
+  subCommands: [current]
+};
+var branch_default = command3;
+
+// src/commands/checkout.ts
+import * as p6 from "@clack/prompts";
+import color6 from "picocolors";
+import clipboard4 from "clipboardy";
+import dedent6 from "dedent";
+var command4 = {
+  name: "checkout",
+  description: "checkout a branch",
+  usage: "checkout [options]",
+  options: [
+    {
+      type: Boolean,
+      flag: "--copy",
+      alias: "-c",
+      description: "copy the selected branch to clipboard"
+    }
+  ],
+  execute: withRepository(
+    async (options) => {
+      if (!options.isRepo) {
+        p6.log.error(
+          dedent6`${color6.red("no git repository found in cwd.")}
+            ${color6.dim(`run ${color6.cyan("`git init`")} to initialize a new repository.`)}`
+        );
+        return await exit(1);
       }
-      if (remote && branch.startsWith("remotes/")) {
-        p5.log.error(color5.red("cannot checkout remote branch"));
+      const branches = await getBranches();
+      if (!branches) {
+        p6.log.error("failed to fetch branches");
         return await exit(1);
       }
+      const currentBranch = await getCurrentBranch();
+      const branch = await p6.select({
+        message: "select a branch to checkout",
+        options: branches.map((branch2) => ({
+          value: branch2,
+          label: color6.bold(
+            branch2 === currentBranch ? color6.green(branch2) : branch2
+          ),
+          hint: branch2 === currentBranch ? "current branch" : void 0
+        })),
+        initialValue: currentBranch
+      });
+      if (p6.isCancel(branch)) {
+        p6.log.error("nothing selected!");
+        return await exit(1);
+      }
+      if (!branch) {
+        p6.log.error("no branch selected");
+        return await exit(1);
+      }
+      if (options["--copy"]) {
+        clipboard4.writeSync(branch);
+        p6.log.success(`copied ${color6.green(branch)} to clipboard`);
+        return await exit(0);
+      }
       if (branch === currentBranch) {
-        p5.log.error(`${color5.red("already on branch")}`);
+        p6.log.error(`${color6.red("already on branch")}`);
         return await exit(1);
       }
       const result = await checkout(branch);
       if (!result) {
-        p5.log.error(`failed to checkout ${color5.bold(branch)}`);
+        p6.log.error(`failed to checkout ${color6.bold(branch)}`);
         return await exit(1);
       }
-      p5.log.success(`checked out ${color5.green(branch)}`);
+      p6.log.success(`checked out ${color6.green(branch)}`);
       await exit(0);
     },
     { enabled: false }
   )
 };
-var checkout_default = command3;
+var checkout_default = command4;
 
 // src/commands/config.ts
-import * as p6 from "@clack/prompts";
-import color6 from "picocolors";
+import * as p7 from "@clack/prompts";
+import color7 from "picocolors";
 var key = {
   name: "key",
   description: "configure api key",
   usage: "noto config key [options]",
   execute: async (options) => {
     if ((await StorageManager.get()).llm?.apiKey) {
-      const confirm2 = await p6.confirm({
+      const confirm2 = await p7.confirm({
         message: "noto api key already configured, do you want to update it?"
       });
-      if (p6.isCancel(confirm2) || !confirm2) {
-        p6.log.error(color6.red("nothing changed!"));
+      if (p7.isCancel(confirm2) || !confirm2) {
+        p7.log.error(color7.red("nothing changed!"));
         return await exit(1);
       }
     }
     let apiKey = options._[0];
     if (!apiKey) {
-      const result = await p6.text({
+      const result = await p7.text({
         message: "enter your noto api key"
       });
-      if (p6.isCancel(result)) {
-        p6.log.error(color6.red("nothing changed!"));
+      if (p7.isCancel(result)) {
+        p7.log.error(color7.red("nothing changed!"));
         return await exit(1);
       }
       apiKey = result;
     }
-    await StorageManager.update((current) => ({
-      ...current,
+    await StorageManager.update((current2) => ({
+      ...current2,
       llm: {
-        ...current.llm,
+        ...current2.llm,
         apiKey
       }
     }));
-    p6.log.success(color6.green("noto api key configured!"));
+    p7.log.success(color7.green("noto api key configured!"));
     console.log();
   }
 };
@@ -709,7 +790,7 @@ var model = {
   description: "configure model",
   usage: "noto config model [options]",
   execute: async () => {
-    const model2 = await p6.select({
+    const model2 = await p7.select({
       message: "select a model",
       initialValue: (await StorageManager.get()).llm?.model,
       options: Object.keys(models).map((model3) => ({
@@ -717,27 +798,27 @@ var model = {
         value: model3
       }))
     });
-    if (p6.isCancel(model2)) {
-      p6.log.error(color6.red("nothing changed!"));
+    if (p7.isCancel(model2)) {
+      p7.log.error(color7.red("nothing changed!"));
       return await exit(1);
     }
     if (model2 === "gemini-2.5-pro-exp-03-25") {
-      const confirm2 = await p6.confirm({
+      const confirm2 = await p7.confirm({
         message: "this model has a rate limit of 5 RPM (requests per minute) 50 requests per day, do you want to continue?"
       });
-      if (p6.isCancel(confirm2) || !confirm2) {
-        p6.log.error(color6.red("nothing changed!"));
+      if (p7.isCancel(confirm2) || !confirm2) {
+        p7.log.error(color7.red("nothing changed!"));
         return await exit(1);
       }
     }
-    await StorageManager.update((current) => ({
-      ...current,
+    await StorageManager.update((current2) => ({
+      ...current2,
       llm: {
-        ...current.llm,
+        ...current2.llm,
         model: model2
       }
     }));
-    p6.log.success(color6.green("model configured!"));
+    p7.log.success(color7.green("model configured!"));
     console.log();
   }
 };
@@ -746,37 +827,37 @@ var reset = {
   description: "reset configuration",
   usage: "noto config reset",
   execute: async () => {
-    const confirm2 = await p6.confirm({
+    const confirm2 = await p7.confirm({
       message: "are you sure you want to reset the configuration?"
     });
-    if (p6.isCancel(confirm2) || !confirm2) {
-      p6.log.error(color6.red("nothing changed!"));
+    if (p7.isCancel(confirm2) || !confirm2) {
+      p7.log.error(color7.red("nothing changed!"));
       return await exit(1);
     }
     await StorageManager.clear();
-    p6.log.success(color6.green("configuration reset!"));
+    p7.log.success(color7.green("configuration reset!"));
     console.log();
   }
 };
 var subCommands = [key, model, reset];
-var command4 = {
+var command5 = {
   name: "config",
   description: "configure noto",
   usage: "noto config [subcommand]",
   execute: async (options) => {
-    const command5 = await p6.select({
+    const command6 = await p7.select({
       message: "Select a subcommand",
       options: subCommands.map((cmd2) => ({
         label: cmd2.description,
         value: cmd2.name
       }))
     });
-    if (p6.isCancel(command5)) {
+    if (p7.isCancel(command6)) {
       return await exit(1);
     }
-    const cmd = getCommand(command5, subCommands);
+    const cmd = getCommand(command6, subCommands);
     if (!cmd) {
-      p6.log.error(color6.red("unknown config command"));
+      p7.log.error(color7.red("unknown config command"));
       return await exit(1);
     }
     options._ = options._.slice(1);
@@ -784,34 +865,34 @@ var command4 = {
   },
   subCommands
 };
-var config_default = command4;
+var config_default = command5;
 
 // src/commands/help.ts
-import color7 from "picocolors";
+import color8 from "picocolors";
 var help = {
   name: "help",
   description: "show help",
   usage: "noto help [command]",
   execute: async (options) => {
-    const command5 = getCommand(options._[0]);
-    if (command5) {
+    const command6 = getCommand(options._[0]);
+    if (command6 && command6.name !== "help") {
       console.log();
-      console.log(color7.bold("Usage"));
-      console.log(`  ${command5.usage}`);
+      console.log(color8.bold("Usage"));
+      console.log(`  ${command6.usage}`);
       console.log();
-      console.log(color7.bold("Description"));
-      console.log(`  ${command5.description}`);
+      console.log(color8.bold("Description"));
+      console.log(`  ${command6.description}`);
       console.log();
     } else {
       const commands2 = listCommand();
       console.log();
-      console.log(color7.bold("Usage"));
+      console.log(color8.bold("Usage"));
       console.log(`  noto [command] [options]`);
       console.log();
-      console.log(color7.bold("Commands"));
-      commands2.forEach((command6) => {
+      console.log(color8.bold("Commands"));
+      commands2.forEach((command7) => {
         console.log(
-          `  ${color7.bold(command6.name)}   ${color7.dim(command6.description)}`
+          `  ${color8.bold(command7.name)}   ${color8.dim(command7.description)}`
         );
       });
       console.log();
@@ -821,7 +902,7 @@ var help = {
 var help_default = help;
 
 // src/commands/index.ts
-var commands = [noto_default, prev_default, checkout_default, config_default, help_default];
+var commands = [noto_default, prev_default, branch_default, checkout_default, config_default, help_default];
 var getCommand = (name, cmds = commands) => {
   return cmds.find((cmd) => cmd.name === name);
 };
@@ -830,7 +911,7 @@ var listCommand = () => {
 };
 
 // package.json
-var version = "1.1.1";
+var version = "1.1.2";
 
 // src/index.ts
 var globalSpec = {
@@ -841,15 +922,15 @@ var globalSpec = {
 };
 function main() {
   const args = process.argv.slice(2);
-  const { command: command5, options: globalOptions } = parse(globalSpec, args);
+  const { command: command6, options: globalOptions } = parse(globalSpec, args);
   console.log();
-  p7.intro(`${color8.bgCyan(color8.black(" @snelusha/noto "))}`);
-  if (globalOptions["--version"]) return p7.outro(version);
+  p8.intro(`${color9.bgCyan(color9.black(" @snelusha/noto "))}`);
+  if (globalOptions["--version"]) return p8.outro(version);
   if (globalOptions["--help"]) {
     getCommand("help")?.execute(globalOptions);
     return;
   }
-  const cmd = getCommand(command5) ?? getCommand("noto");
+  const cmd = getCommand(command6) ?? getCommand("noto");
   if (!cmd) return getCommand("noto")?.execute(globalOptions);
   let commandArgs = args;
   let selectedCommand = cmd;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snelusha/noto",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Generate clean commit messages in a snap! ✨",
   "license": "MIT",
   "type": "module",
@@ -48,9 +48,9 @@
     "vitest": "^3.1.1"
   },
   "dependencies": {
-    "@ai-sdk/google": "^1.2.7",
-    "@clack/prompts": "^0.10.0",
-    "ai": "^4.3.2",
+    "@ai-sdk/google": "^1.2.10",
+    "@clack/prompts": "^0.10.1",
+    "ai": "^4.3.4",
     "arg": "^5.0.2",
     "clipboardy": "^4.0.0",
     "dedent": "^1.5.3",