@f5xc-salesdemos/xcsh 17.4.2 → 17.4.3

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@f5xc-salesdemos/xcsh",
-	"version": "17.4.2",
+	"version": "17.4.3",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/f5xc-salesdemos/xcsh",
 	"author": "Can Boluk",
@@ -46,12 +46,12 @@
 	"dependencies": {
 		"@agentclientprotocol/sdk": "0.16.1",
 		"@mozilla/readability": "^0.6",
-		"@f5xc-salesdemos/xcsh-stats": "17.4.2",
-		"@f5xc-salesdemos/pi-agent-core": "17.4.2",
-		"@f5xc-salesdemos/pi-ai": "17.4.2",
-		"@f5xc-salesdemos/pi-natives": "17.4.2",
-		"@f5xc-salesdemos/pi-tui": "17.4.2",
-		"@f5xc-salesdemos/pi-utils": "17.4.2",
+		"@f5xc-salesdemos/xcsh-stats": "17.4.3",
+		"@f5xc-salesdemos/pi-agent-core": "17.4.3",
+		"@f5xc-salesdemos/pi-ai": "17.4.3",
+		"@f5xc-salesdemos/pi-natives": "17.4.3",
+		"@f5xc-salesdemos/pi-tui": "17.4.3",
+		"@f5xc-salesdemos/pi-utils": "17.4.3",
 		"@sinclair/typebox": "^0.34",
 		"@xterm/headless": "^6.0",
 		"ajv": "^8.18",

package/src/modes/components/status-line/segments.ts

@@ -2,7 +2,7 @@ import * as os from "node:os";
 import * as path from "node:path";
 import { ThinkingLevel } from "@f5xc-salesdemos/pi-agent-core";
 import { TERMINAL } from "@f5xc-salesdemos/pi-tui";
-import { formatDuration, formatNumber, getProjectDir, relativePathWithinRoot } from "@f5xc-salesdemos/pi-utils";
+import { formatDuration, formatNumber, relativePathWithinRoot } from "@f5xc-salesdemos/pi-utils";
 import { theme } from "../../../modes/theme/theme";
 import { shortenPath } from "../../../tools/render-utils";
 import { getSessionAccentAnsi, getSessionAccentHex } from "../../../utils/session-color";
@@ -115,7 +115,7 @@ const pathSegment: StatusLineSegment = {
 	render(ctx) {
 		const opts = ctx.options.path ?? {};
 
-		let pwd = getProjectDir();
+		let pwd = ctx.cwd;
 
 		if (opts.stripWorkPrefix !== false) {
 			pwd = stripDisplayRoot(pwd);

package/src/modes/components/status-line/types.ts

@@ -19,6 +19,7 @@ export type RGB = readonly [number, number, number];
 export interface SegmentContext {
 	session: AgentSession;
 	width: number;
+	cwd: string;
 	options: StatusLineSegmentOptions;
 	planMode: {
 		enabled: boolean;

package/src/modes/components/status-line.ts

@@ -1,13 +1,14 @@
 import * as fs from "node:fs";
 import type { AssistantMessage } from "@f5xc-salesdemos/pi-ai";
 import { type Component, truncateToWidth, visibleWidth } from "@f5xc-salesdemos/pi-tui";
-import { formatCount, getProjectDir } from "@f5xc-salesdemos/pi-utils";
+import { formatCount, getShellPwd } from "@f5xc-salesdemos/pi-utils";
 import { $ } from "bun";
 import { settings } from "../../config/settings";
 import type { StatusLinePreset, StatusLineSegmentId, StatusLineSeparatorStyle } from "../../config/settings-schema";
 import { theme } from "../../modes/theme/theme";
 import type { AgentSession } from "../../session/agent-session";
 import { calculatePromptTokens } from "../../session/compaction/compaction";
+import type { EventBus } from "../../utils/event-bus";
 import * as git from "../../utils/git";
 import { queryGitStatus } from "../../utils/gitstatus";
 import { sanitizeStatusText } from "../shared";
@@ -52,6 +53,7 @@ export class StatusLineComponent implements Component {
 	#cachedBranch: string | null | undefined = undefined;
 	#cachedBranchRepoId: string | null | undefined = undefined;
 	#gitWatcher: fs.FSWatcher | null = null;
+	#cwdUnsubscribe: (() => void) | null = null;
 	#onBranchChange: (() => void) | null = null;
 	#onStatusChanged: (() => void) | null = null;
 	#autoCompactEnabled: boolean = true;
@@ -130,13 +132,22 @@ export class StatusLineComponent implements Component {
 		this.#setupGitWatcher();
 	}
 
+	watchCwd(eventBus: EventBus): void {
+		this.#cwdUnsubscribe?.();
+		this.#cwdUnsubscribe = eventBus.on("cwd:changed", () => {
+			this.#invalidateGitCaches();
+			this.#setupGitWatcher();
+			this.#onStatusChanged?.();
+		});
+	}
+
 	#setupGitWatcher(): void {
 		if (this.#gitWatcher) {
 			this.#gitWatcher.close();
 			this.#gitWatcher = null;
 		}
 
-		const gitHeadPath = git.repo.resolveSync(getProjectDir())?.headPath ?? null;
+		const gitHeadPath = git.repo.resolveSync(getShellPwd())?.headPath ?? null;
 		if (!gitHeadPath) return;
 
 		try {
@@ -156,6 +167,10 @@ export class StatusLineComponent implements Component {
 			this.#gitWatcher.close();
 			this.#gitWatcher = null;
 		}
+		if (this.#cwdUnsubscribe) {
+			this.#cwdUnsubscribe();
+			this.#cwdUnsubscribe = null;
+		}
 	}
 
 	invalidate(): void {
@@ -168,7 +183,7 @@ export class StatusLineComponent implements Component {
 		this.#cachedPrContext = undefined;
 	}
 	#getCurrentBranch(): string | null {
-		const head = git.head.resolveSync(getProjectDir());
+		const head = git.head.resolveSync(getShellPwd());
 		const gitHeadPath = head?.headPath ?? null;
 		if (this.#cachedBranch !== undefined && this.#cachedBranchRepoId === gitHeadPath) {
 			return this.#cachedBranch;
@@ -189,7 +204,7 @@ export class StatusLineComponent implements Component {
 		if (this.#defaultBranch === undefined) {
 			this.#defaultBranch = "main";
 			(async () => {
-				const resolved = await git.branch.default(getProjectDir());
+				const resolved = await git.branch.default(getShellPwd());
 				if (resolved) {
 					this.#defaultBranch = resolved;
 					if (this.#onBranchChange) {
@@ -220,7 +235,7 @@ export class StatusLineComponent implements Component {
 		(async () => {
 			try {
 				// Prefer gitstatusd daemon (10x faster than git CLI)
-				const gsResult = await queryGitStatus(getProjectDir());
+				const gsResult = await queryGitStatus(getShellPwd());
 				if (gsResult) {
 					this.#cachedGitStatus = {
 						staged: gsResult.staged,
@@ -234,7 +249,7 @@ export class StatusLineComponent implements Component {
 					};
 				} else {
 					// Fallback to git CLI
-					const summary = await git.status.summary(getProjectDir());
+					const summary = await git.status.summary(getShellPwd());
 					this.#cachedGitStatus = summary
 						? { ...summary, conflicted: 0, ahead: 0, behind: 0, stashes: 0, action: "" }
 						: null;
@@ -284,7 +299,7 @@ export class StatusLineComponent implements Component {
 			};
 			try {
 				// Requires `gh repo set-default` to be configured; fails gracefully if not
-				const result = await $`gh pr view --json number,url`.quiet().nothrow();
+				const result = await $`gh pr view --json number,url`.cwd(getShellPwd()).quiet().nothrow();
 				if (result.exitCode !== 0) {
 					setCachedPr(null);
 					return;
@@ -368,6 +383,7 @@ export class StatusLineComponent implements Component {
 		return {
 			session: this.session,
 			width,
+			cwd: getShellPwd(),
 			options: this.#resolveSettings().segmentOptions ?? {},
 			planMode: this.#planModeStatus,
 			usageStats,

package/src/modes/interactive-mode.ts

@@ -408,6 +408,10 @@ export class InteractiveMode implements InteractiveModeContext {
 			this.ui.requestRender();
 		});
 
+		if (this.#eventBus) {
+			this.statusLine.watchCwd(this.#eventBus);
+		}
+
 		// Initial top border update
 		this.updateEditorTopBorder();
 	}