@gowelle/stint-agent 1.2.0 → 1.2.2

package/dist/{StatusDashboard-7ZIGEOQ4.js → StatusDashboard-NTJAONDR.js}

@@ -2,10 +2,10 @@ import {
   gitService,
   projectService,
   validatePidFile
-} from "./chunk-FBQA4K5J.js";
+} from "./chunk-FY5S22C3.js";
 import {
   authService
-} from "./chunk-RHMTZK2J.js";
+} from "./chunk-2QJPWC56.js";
 
 // src/components/StatusDashboard.tsx
 import { useState, useEffect } from "react";

package/dist/api-XYDQ3I2Y.js

@@ -0,0 +1,7 @@
+import {
+  apiService
+} from "./chunk-GG6LVSVC.js";
+import "./chunk-2QJPWC56.js";
+export {
+  apiService
+};

package/dist/{chunk-RHMTZK2J.js → chunk-2QJPWC56.js}

@@ -271,7 +271,7 @@ var AuthServiceImpl = class {
       return null;
     }
     try {
-      const { apiService } = await import("./api-HLTR2LTF.js");
+      const { apiService } = await import("./api-XYDQ3I2Y.js");
       const user = await apiService.getCurrentUser();
       logger.info("auth", `Token validated for user: ${user.email}`);
       return user;

package/dist/{chunk-FBQA4K5J.js → chunk-FY5S22C3.js}

@@ -1,7 +1,7 @@
 import {
   config,
   logger
-} from "./chunk-RHMTZK2J.js";
+} from "./chunk-2QJPWC56.js";
 
 // src/services/git.ts
 import simpleGit from "simple-git";
@@ -150,6 +150,26 @@ var GitServiceImpl = class {
       throw new Error(`Failed to get git status: ${error.message}`);
     }
   }
+  /**
+   * Push commits to remote repository
+   * @param path - Repository path
+   * @param remote - Remote name (default: 'origin')
+   * @param branch - Branch name (optional, uses current branch if not specified)
+   */
+  async push(path3, remote = "origin", branch) {
+    try {
+      const git = this.getGit(path3);
+      if (branch) {
+        await git.push(remote, branch);
+      } else {
+        await git.push(remote);
+      }
+      logger.success("git", `Pushed to ${remote} in ${path3}`);
+    } catch (error) {
+      logger.error("git", `Failed to push in ${path3}`, error);
+      throw new Error(`Failed to push: ${error.message}`);
+    }
+  }
   async getRepoRoot(path3) {
     try {
       const git = this.getGit(path3);

package/dist/{chunk-W4JGOGR7.js → chunk-GG6LVSVC.js}

@@ -2,7 +2,7 @@ import {
   authService,
   config,
   logger
-} from "./chunk-RHMTZK2J.js";
+} from "./chunk-2QJPWC56.js";
 
 // src/utils/circuit-breaker.ts
 var CircuitBreaker = class {
@@ -98,7 +98,7 @@ var CircuitBreaker = class {
 };
 
 // src/services/api.ts
-var AGENT_VERSION = "1.2.0";
+var AGENT_VERSION = "1.2.2";
 var ApiServiceImpl = class {
   sessionId = null;
   circuitBreaker = new CircuitBreaker({
@@ -275,16 +275,18 @@ var ApiServiceImpl = class {
    * Mark a commit as successfully executed
    * @param commitId - Commit ID
    * @param sha - Git commit SHA
+   * @param pushed - Whether the commit was pushed to remote (default: true)
+   * @param pushError - Error message if push failed
    * @returns Updated commit data
    */
-  async markCommitExecuted(commitId, sha) {
-    logger.info("api", `Marking commit ${commitId} as executed (SHA: ${sha})`);
+  async markCommitExecuted(commitId, sha, pushed = true, pushError) {
+    logger.info("api", `Marking commit ${commitId} as executed (SHA: ${sha}, pushed: ${pushed})`);
     return this.withRetry(async () => {
       const response = await this.request(
         `/api/agent/commits/${commitId}/executed`,
         {
           method: "POST",
-          body: JSON.stringify({ sha })
+          body: JSON.stringify({ sha, pushed, push_error: pushError })
         }
       );
       const data = response.data;
@@ -302,7 +304,8 @@ var ApiServiceImpl = class {
         status: data.status,
         createdAt,
         executedAt,
-        error: data.error
+        error: data.error,
+        pushError: data.push_error || data.pushError
       };
       logger.success("api", `Commit ${commitId} marked as executed`);
       return commit;

package/dist/{chunk-IJUJ6NEL.js → chunk-XLTOQPAD.js}

@@ -1,15 +1,37 @@
 import {
   apiService
-} from "./chunk-W4JGOGR7.js";
+} from "./chunk-GG6LVSVC.js";
 import {
   gitService,
   projectService
-} from "./chunk-FBQA4K5J.js";
+} from "./chunk-FY5S22C3.js";
 import {
   authService,
   config,
   logger
-} from "./chunk-RHMTZK2J.js";
+} from "./chunk-2QJPWC56.js";
+
+// src/utils/notify.ts
+import notifier from "node-notifier";
+function notify(options) {
+  try {
+    notifier.notify({
+      title: options.title,
+      message: options.message,
+      open: options.open,
+      sound: true,
+      wait: false,
+      appID: "Stint Agent"
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    }, (error) => {
+      if (error) {
+        logger.error("notify", "Failed to send notification", error);
+      }
+    });
+  } catch (error) {
+    logger.error("notify", "Failed to send notification", error);
+  }
+}
 
 // src/daemon/queue.ts
 var CommitQueueProcessor = class {
@@ -47,7 +69,7 @@ var CommitQueueProcessor = class {
   /**
    * Execute a single commit
    */
-  async executeCommit(commit, project, onProgress) {
+  async executeCommit(commit, project, onProgress, options) {
     logger.info("queue", `Processing commit: ${commit.id} - ${commit.message}`);
     try {
       onProgress?.("Finding project directory...");
@@ -62,18 +84,59 @@ var CommitQueueProcessor = class {
         throw new Error(`Directory ${projectPath} is not a git repository`);
       }
       onProgress?.("Checking repository status...");
-      const status = await gitService.getStatus(projectPath);
-      const hasStagedChanges = status.staged.length > 0;
-      if (!hasStagedChanges) {
-        throw new Error('No staged changes to commit. Please stage files using "git add" before committing.');
+      let status = await gitService.getStatus(projectPath);
+      if (commit.files && commit.files.length > 0) {
+        onProgress?.(`Staging ${commit.files.length} specified files...`);
+        await gitService.stageFiles(projectPath, commit.files);
+        status = await gitService.getStatus(projectPath);
+        logger.info("queue", `Auto-staged files: ${commit.files.join(", ")}`);
+      } else if (status.staged.length === 0) {
+        const hasChanges = status.unstaged.length > 0 || status.untracked.length > 0;
+        if (hasChanges) {
+          onProgress?.("Staging all changes...");
+          await gitService.stageAll(projectPath);
+          status = await gitService.getStatus(projectPath);
+          logger.info("queue", `Auto-staged all changes`);
+        }
+      }
+      if (status.staged.length === 0) {
+        throw new Error("No changes to commit. The working directory is clean.");
       }
       logger.info("queue", `Committing ${status.staged.length} staged files.`);
       onProgress?.("Creating commit...");
       logger.info("queue", `Creating commit with message: "${commit.message}"`);
       const sha = await gitService.commit(projectPath, commit.message);
       logger.success("queue", `Commit created successfully: ${sha}`);
+      let pushed = false;
+      let pushError;
+      const shouldPush = options?.push !== false;
+      if (shouldPush) {
+        try {
+          onProgress?.("Pushing to remote...");
+          await gitService.push(projectPath);
+          pushed = true;
+          logger.success("queue", `Pushed commit ${sha} to remote`);
+        } catch (error) {
+          pushError = error.message;
+          const isConflict = pushError.includes("rejected") || pushError.includes("non-fast-forward") || pushError.includes("failed to push") || pushError.includes("Updates were rejected");
+          if (isConflict) {
+            logger.warn("queue", `Push failed due to remote conflict: ${pushError}`);
+            notify({
+              title: "\u26A0\uFE0F Push Failed - Manual Action Required",
+              message: `Commit "${commit.message}" created but push failed.
+Run "git pull --rebase && git push" to resolve.`
+            });
+          } else {
+            logger.error("queue", `Push failed: ${pushError}`);
+            notify({
+              title: "\u274C Push Failed",
+              message: `Commit created but push failed: ${pushError}`
+            });
+          }
+        }
+      }
       onProgress?.("Reporting to server...");
-      await this.reportSuccess(commit.id, sha);
+      await this.reportSuccess(commit.id, sha, pushed, pushError);
       return sha;
     } catch (error) {
       const errorMessage = error.message;
@@ -84,11 +147,16 @@ var CommitQueueProcessor = class {
   }
   /**
    * Report successful execution to API
+   * @param commitId - Commit ID
+   * @param sha - Git commit SHA
+   * @param pushed - Whether the commit was pushed to remote
+   * @param pushError - Error message if push failed
    */
-  async reportSuccess(commitId, sha) {
+  async reportSuccess(commitId, sha, pushed = true, pushError) {
     try {
-      await apiService.markCommitExecuted(commitId, sha);
-      logger.success("queue", `Reported commit execution to API: ${commitId} -> ${sha}`);
+      await apiService.markCommitExecuted(commitId, sha, pushed, pushError);
+      const status = pushed ? "executed" : "committed (push failed)";
+      logger.success("queue", `Reported commit ${status} to API: ${commitId} -> ${sha}`);
     } catch (error) {
       logger.error("queue", "Failed to report commit success to API", error);
     }
@@ -364,6 +432,7 @@ var WebSocketServiceImpl = class {
 var websocketService = new WebSocketServiceImpl();
 
 export {
+  notify,
   commitQueue,
   websocketService
 };

package/dist/daemon/runner.js

@@ -1,21 +1,22 @@
 #!/usr/bin/env node
 import {
   commitQueue,
+  notify,
   websocketService
-} from "../chunk-IJUJ6NEL.js";
+} from "../chunk-XLTOQPAD.js";
 import {
   apiService
-} from "../chunk-W4JGOGR7.js";
+} from "../chunk-GG6LVSVC.js";
 import {
   gitService,
   projectService,
   removePidFile,
   writePidFile
-} from "../chunk-FBQA4K5J.js";
+} from "../chunk-FY5S22C3.js";
 import {
   authService,
   logger
-} from "../chunk-RHMTZK2J.js";
+} from "../chunk-2QJPWC56.js";
 
 // src/daemon/runner.ts
 import "dotenv/config";
@@ -223,28 +224,6 @@ var FileWatcher = class {
   }
 };
 
-// src/utils/notify.ts
-import notifier from "node-notifier";
-function notify(options) {
-  try {
-    notifier.notify({
-      title: options.title,
-      message: options.message,
-      open: options.open,
-      sound: true,
-      wait: false,
-      appID: "Stint Agent"
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    }, (error) => {
-      if (error) {
-        logger.error("notify", "Failed to send notification", error);
-      }
-    });
-  } catch (error) {
-    logger.error("notify", "Failed to send notification", error);
-  }
-}
-
 // src/daemon/index.ts
 var heartbeatInterval = null;
 var isShuttingDown = false;

package/dist/index.js

@@ -2,10 +2,10 @@
 import {
   commitQueue,
   websocketService
-} from "./chunk-IJUJ6NEL.js";
+} from "./chunk-XLTOQPAD.js";
 import {
   apiService
-} from "./chunk-W4JGOGR7.js";
+} from "./chunk-GG6LVSVC.js";
 import {
   getPidFilePath,
   gitService,
@@ -14,12 +14,12 @@ import {
   projectService,
   spawnDetached,
   validatePidFile
-} from "./chunk-FBQA4K5J.js";
+} from "./chunk-FY5S22C3.js";
 import {
   authService,
   config,
   logger
-} from "./chunk-RHMTZK2J.js";
+} from "./chunk-2QJPWC56.js";
 
 // src/index.ts
 import "dotenv/config";
@@ -620,7 +620,7 @@ function registerStatusCommand(program2) {
       try {
         const { render } = await import("ink");
         const { createElement } = await import("react");
-        const { StatusDashboard } = await import("./StatusDashboard-7ZIGEOQ4.js");
+        const { StatusDashboard } = await import("./StatusDashboard-NTJAONDR.js");
         render(createElement(StatusDashboard, { cwd }));
         return;
       } catch (error) {
@@ -1244,37 +1244,90 @@ function registerCommitCommands(program2) {
       process6.exit(1);
     }
   });
-  program2.command("commit <id>").description("Execute a specific pending commit").action(async (id) => {
-    const spinner = ora9("Checking repository status...").start();
+  program2.command("commit <id>").description("Execute a specific pending commit").option("--auto-stage", "Automatically stage files specified in the pending commit").option("--push", "Push changes to remote after committing").option("--force", "Skip file validation warnings").action(async (id, options) => {
+    let activeSpinner = null;
     try {
+      activeSpinner = ora9("Checking repository status...").start();
       const cwd = process6.cwd();
       const linkedProject = await projectService.getLinkedProject(cwd);
       if (!linkedProject) {
-        spinner.fail("Not linked");
+        activeSpinner.fail("Not linked");
         console.log(chalk9.yellow("\n\u26A0 This directory is not linked to any project."));
         console.log(chalk9.gray('Run "stint link" first to link this directory.\n'));
         process6.exit(1);
       }
-      const status = await gitService.getStatus(cwd);
-      if (status.staged.length === 0) {
-        spinner.fail("No staged changes");
-        console.log(chalk9.yellow("\n\u26A0 No staged changes detected."));
-        console.log(chalk9.gray("Please stage the files you want to commit first."));
-        console.log(chalk9.gray("  git add <files>\n"));
-        process6.exit(1);
-      }
-      spinner.text = "Fetching commit details...";
+      activeSpinner.text = "Fetching commit details...";
       const commits = await apiService.getPendingCommits(linkedProject.projectId);
-      const commit = commits.find((c) => c.id.startsWith(id));
-      if (!commit) {
-        spinner.fail("Commit not found");
+      const matchingCommits = commits.filter((c) => c.id.startsWith(id));
+      if (matchingCommits.length === 0) {
+        activeSpinner.fail("Commit not found");
         console.log(chalk9.red(`
 \u2716 Commit ${id} not found in pending commits.
 `));
         console.log(chalk9.gray('Run "stint commits" to see available commits.\n'));
         process6.exit(1);
       }
-      spinner.stop();
+      if (matchingCommits.length > 1) {
+        activeSpinner.fail("Ambiguous commit ID");
+        console.log(chalk9.yellow(`
+\u26A0 Multiple commits match "${id}":
+`));
+        matchingCommits.forEach((c) => {
+          const shortId = c.id.substring(0, 12);
+          console.log(`  ${chalk9.cyan(shortId)}  ${c.message}`);
+        });
+        console.log(chalk9.gray("\nPlease use a longer ID to be more specific.\n"));
+        process6.exit(1);
+      }
+      const commit = matchingCommits[0];
+      let status = await gitService.getStatus(cwd);
+      if (options.autoStage && commit.files && commit.files.length > 0) {
+        activeSpinner.text = `Staging ${commit.files.length} files...`;
+        await gitService.stageFiles(cwd, commit.files);
+        status = await gitService.getStatus(cwd);
+        logger.info("commit", `Auto-staged files: ${commit.files.join(", ")}`);
+      }
+      if (status.staged.length === 0) {
+        activeSpinner.fail("No staged changes");
+        console.log(chalk9.yellow("\n\u26A0 No staged changes detected."));
+        if (commit.files && commit.files.length > 0) {
+          console.log(chalk9.gray("Expected files: " + commit.files.join(", ")));
+          console.log(chalk9.gray("\nUse --auto-stage to automatically stage expected files."));
+        } else {
+          console.log(chalk9.gray("Please stage the files you want to commit first."));
+          console.log(chalk9.gray("  git add <files>\n"));
+        }
+        process6.exit(1);
+      }
+      if (commit.files && commit.files.length > 0 && !options.force && !options.autoStage) {
+        const stagedSet = new Set(status.staged);
+        const expectedSet = new Set(commit.files);
+        const missing = commit.files.filter((f) => !stagedSet.has(f));
+        const extra = status.staged.filter((f) => !expectedSet.has(f));
+        if (missing.length > 0 || extra.length > 0) {
+          activeSpinner.stop();
+          console.log(chalk9.yellow("\n\u26A0 Staged files do not match expected files:\n"));
+          if (missing.length > 0) {
+            console.log(chalk9.red("  Missing (expected but not staged):"));
+            missing.forEach((f) => console.log(chalk9.red(`    - ${f}`)));
+          }
+          if (extra.length > 0) {
+            console.log(chalk9.yellow("\n  Extra (staged but not expected):"));
+            extra.forEach((f) => console.log(chalk9.yellow(`    + ${f}`)));
+          }
+          console.log();
+          const proceed = await confirm2({
+            message: "Do you want to proceed anyway?",
+            default: false
+          });
+          if (!proceed) {
+            console.log(chalk9.gray("\nCommit cancelled. Use --auto-stage to stage expected files.\n"));
+            return;
+          }
+          activeSpinner = ora9("Continuing...").start();
+        }
+      }
+      activeSpinner.stop();
       console.log(chalk9.blue("\n\u{1F4CB} Staged changes to commit:"));
       console.log(chalk9.gray("\u2500".repeat(40)));
       status.staged.forEach((file) => {
@@ -1282,6 +1335,9 @@ function registerCommitCommands(program2) {
       });
       console.log();
       console.log(`${chalk9.bold("Message:")}    ${commit.message}`);
+      if (options.push) {
+        console.log(`${chalk9.bold("Push:")}       ${chalk9.cyan("Yes (will push after commit)")}`);
+      }
       console.log();
       const confirmed = await confirm2({
         message: "Are you sure you want to commit these changes?",
@@ -1291,24 +1347,26 @@ function registerCommitCommands(program2) {
         console.log(chalk9.yellow("\nCommit cancelled.\n"));
         return;
       }
-      const execSpinner = ora9("Preparing commit...").start();
+      activeSpinner = ora9("Preparing commit...").start();
       const project = {
         id: linkedProject.projectId,
         name: "Current Project",
-        // We don't have the name, but it's not critical
         createdAt: "",
         updatedAt: ""
       };
       const sha = await commitQueue.executeCommit(commit, project, (stage) => {
-        execSpinner.text = stage;
-      });
-      execSpinner.succeed("Commit executed successfully!");
+        if (activeSpinner) activeSpinner.text = stage;
+      }, { push: options.push ?? false });
+      activeSpinner.succeed("Commit executed successfully!");
       console.log(chalk9.green("\n\u2713 Commit executed"));
       console.log(chalk9.gray("\u2500".repeat(50)));
       console.log(`${chalk9.bold("Commit ID:")}  ${commit.id}`);
       console.log(`${chalk9.bold("Message:")}    ${commit.message}`);
       console.log(`${chalk9.bold("SHA:")}        ${sha}`);
       console.log(`${chalk9.bold("Files:")}      ${status.staged.length} files committed`);
+      if (options.push) {
+        console.log(`${chalk9.bold("Pushed:")}     ${chalk9.green("Yes")}`);
+      }
       console.log();
       if (status.staged.length > 0) {
         console.log(chalk9.gray("Committed files:"));
@@ -1319,9 +1377,7 @@ function registerCommitCommands(program2) {
       }
       logger.success("commit", `Executed commit ${commit.id} -> ${sha}`);
     } catch (error) {
-      if (ora9().isSpinning) {
-        ora9().fail("Commit execution failed");
-      }
+      activeSpinner?.fail("Commit execution failed");
       logger.error("commit", "Failed to execute commit", error);
       console.error(chalk9.red(`
 \u2716 Error: ${error.message}
@@ -1595,12 +1651,12 @@ async function getLatestVersionForChannel(channel) {
   return channelVersions[0];
 }
 function registerUpdateCommand(program2) {
-  program2.command("update").description("Update stint agent to the latest version").option("-c, --channel <channel>", "Release channel (stable, beta, nightly)").action(async (command) => {
+  program2.command("update").description("Update stint agent to the latest version").option("-c, --channel <channel>", "Release channel (stable, beta, nightly)").action(async (options) => {
     const spinner = ora11("Checking for updates...").start();
     try {
       const currentVersion = program2.version();
       const config2 = getChannelConfig();
-      const channel = (command.opts().channel || config2.defaultChannel).toLowerCase();
+      const channel = (options.channel || config2.defaultChannel).toLowerCase();
       if (!config2.channels[channel]) {
         spinner.fail(`Invalid channel: ${channel}`);
         console.log(chalk11.gray("\nAvailable channels:"));
@@ -1834,7 +1890,7 @@ function registerDoctorCommand(program2) {
 }
 
 // src/index.ts
-var AGENT_VERSION = "1.2.0";
+var AGENT_VERSION = "1.2.2";
 var program = new Command();
 program.name("stint").description("Stint Agent - Local daemon for Stint Project Assistant").version(AGENT_VERSION, "-v, --version", "output the current version").addHelpText("after", `
 ${chalk13.bold("Examples:")}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gowelle/stint-agent",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Local agent for Stint - Project Assistant",
   "author": "Gowelle John <gowelle.john@icloud.com>",
   "license": "MIT",

package/dist/api-HLTR2LTF.js

@@ -1,7 +0,0 @@
-import {
-  apiService
-} from "./chunk-W4JGOGR7.js";
-import "./chunk-RHMTZK2J.js";
-export {
-  apiService
-};