@staff0rd/assist 0.302.1 → 0.303.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.302.1",
+  version: "0.303.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -425,7 +425,7 @@ function stageAndCommit(files, message) {
 function execCommit(files, message, config) {
   try {
     if (config.commit?.pull) {
-      execSync("git pull", { stdio: "inherit" });
+      execSync("git pull --autostash", { stdio: "inherit" });
     }
     const sha = files.length > 0 ? stageAndCommit(files, message) : commitStaged(message);
     console.log(`Committed: ${sha}`);
@@ -1738,7 +1738,8 @@ var MACHINE_DIRECTIVES = [
   "prettier-ignore",
   "istanbul ignore",
   "v8 ignore",
-  "c8 ignore"
+  "c8 ignore",
+  "@vitest-environment"
 ];
 function isCommentExempt(text5, markers) {
   const lower = text5.toLowerCase();
@@ -2889,7 +2890,11 @@ function spawnClaude(prompt, options2 = {}) {
   if (permissionMode) {
     args.push("--permission-mode", permissionMode);
   }
-  const { ASSIST_ACTIVITY_ID: _activityId, ...env } = process.env;
+  const {
+    ASSIST_ACTIVITY_ID: _activityId,
+    CLAUDE_CODE_CHILD_SESSION: _childSession,
+    ...env
+  } = process.env;
   const child = spawn3("claude", args, {
     stdio: "inherit",
     env
@@ -18763,13 +18768,14 @@ function spawnPty(args, cwd, sessionId) {
   ensureSpawnHelperExecutable();
   const shell = process.platform === "win32" ? "cmd.exe" : process.env.SHELL ?? "bash";
   const shellArgs = process.platform === "win32" ? ["/c", ...args] : ["-c", `exec ${args.map(shellEscape).join(" ")}`];
+  const { CLAUDE_CODE_CHILD_SESSION: _childSession, ...parentEnv } = process.env;
   return pty.spawn(shell, shellArgs, {
     name: "xterm-256color",
     cols: 120,
     rows: 30,
     cwd: cwd ?? process.cwd(),
     env: {
-      ...process.env,
+      ...parentEnv,
       ...sessionId && {
         ASSIST_SESSION_ID: sessionId,
         ASSIST_ACTIVITY_ID: sessionId
@@ -18863,7 +18869,11 @@ function greetClient(client, sessions, windowsProxy) {
 // src/commands/sessions/daemon/shouldAutoDismiss.ts
 function shouldAutoDismiss(session, exitCode) {
   const args = session.assistArgs;
-  return session.status === "done" && exitCode === 0 && args !== void 0 && args.includes("--once") && args[0] !== "next";
+  if (session.status !== "done" || exitCode !== 0 || args === void 0) {
+    return false;
+  }
+  if (args[0] === "update") return true;
+  return args.includes("--once") && args[0] !== "next";
 }
 
 // src/commands/sessions/daemon/shouldAutoRun.ts

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@staff0rd/assist",
-	"version": "0.302.1",
+	"version": "0.303.0",
 	"type": "module",
 	"main": "dist/index.js",
 	"bin": {