@staff0rd/assist 0.302.0 → 0.302.2

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.302.0",
+  version: "0.302.2",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -2717,6 +2717,14 @@ import chalk26 from "chalk";
 function pullIfConfigured() {
   const config = loadConfig();
   if (!config.commit?.pull) return;
+  if (hasLocalChanges()) {
+    console.warn(
+      chalk26.yellow(
+        "git pull skipped: working copy has local changes. Continuing."
+      )
+    );
+    return;
+  }
   try {
     execSync16("git pull --ff-only", { stdio: "inherit" });
   } catch {
@@ -2724,6 +2732,16 @@ function pullIfConfigured() {
     process.exit(1);
   }
 }
+function hasLocalChanges() {
+  try {
+    const status2 = execSync16("git status --porcelain", {
+      encoding: "utf8"
+    });
+    return status2.trim().length > 0;
+  } catch {
+    return false;
+  }
+}
 
 // src/commands/backlog/acquireLock.ts
 import {
@@ -2871,7 +2889,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
@@ -18745,13 +18767,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

package/package.json

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