@gajae-code/coding-agent 0.4.5 → 0.5.0

package/src/gjc-runtime/team-runtime.ts

@@ -5,7 +5,7 @@ import type { WorkflowHudSummary } from "../skill-state/active-state";
 import { buildTeamHudSummary as buildWorkflowTeamHudSummary } from "../skill-state/workflow-hud";
 import { WORKFLOW_STATE_VERSION } from "../skill-state/workflow-state-contract";
 
-import { applyGjcTmuxProfile } from "./launch-tmux";
+import { applyGjcTmuxProfile, GJC_TMUX_LAUNCHED_ENV } from "./launch-tmux";
 import {
 	AlreadyExistsError,
 	appendJsonl as appendJsonlAudited,
@@ -17,7 +17,12 @@ import {
 	writeReport,
 	writeWorkflowEnvelopeAtomic,
 } from "./state-writer";
-import { GJC_TMUX_PROFILE_OPTION, GJC_TMUX_PROFILE_VALUE } from "./tmux-common";
+import {
+	buildGjcTmuxUntaggedSessionHint,
+	GJC_TMUX_PROFILE_OPTION,
+	GJC_TMUX_PROFILE_VALUE,
+	resolveGjcTmuxCommand,
+} from "./tmux-common";
 
 export type GjcTeamPhase = "starting" | "running" | "awaiting_integration" | "complete" | "failed" | "cancelled";
 export type GjcTeamTaskStatus = "pending" | "blocked" | "in_progress" | "completed" | "failed";
@@ -1622,9 +1627,6 @@ async function ensureWorkerWorktree(
 	};
 }
 
-export function resolveGjcTmuxCommand(env: NodeJS.ProcessEnv = process.env): string {
-	return env.GJC_TEAM_TMUX_COMMAND?.trim() || "tmux";
-}
 function buildTeamTmuxLeaderRequirementMessage(detail?: string): string {
 	const suffix = detail?.trim() ? `:${detail.trim()}` : "";
 	return `gjc_team_requires_tmux_leader: run \`gjc --tmux\` first, then run \`gjc team ...\` inside that tmux-backed leader session, or use \`gjc team --dry-run\` for state-only smoke tests${suffix}`;
@@ -1641,6 +1643,17 @@ function readGjcTmuxProfileValue(tmuxCommand: string, sessionName: string): stri
 	return result.stdout.toString().trim();
 }
 
+function retagGjcLaunchedTmuxSession(tmuxCommand: string, sessionName: string): boolean {
+	const result = Bun.spawnSync(
+		[tmuxCommand, "set-option", "-t", `=${sessionName}`, GJC_TMUX_PROFILE_OPTION, GJC_TMUX_PROFILE_VALUE],
+		{
+			stdout: "pipe",
+			stderr: "pipe",
+		},
+	);
+	return result.exitCode === 0;
+}
+
 function readCurrentTmuxLeaderContext(tmuxCommand: string, env: NodeJS.ProcessEnv): GjcTmuxLeaderContext {
 	const paneTarget = env.TMUX_PANE?.trim();
 	const args = paneTarget
@@ -1652,8 +1665,21 @@ function readCurrentTmuxLeaderContext(tmuxCommand: string, env: NodeJS.ProcessEn
 	const [sessionName = "", windowIndex = ""] = sessionAndWindow.split(":");
 	if (!sessionName || !windowIndex || !leaderPaneId.startsWith("%"))
 		throw new Error(buildTeamTmuxLeaderRequirementMessage(`invalid_tmux_context:${result.stdout.toString().trim()}`));
-	if (readGjcTmuxProfileValue(tmuxCommand, sessionName) !== GJC_TMUX_PROFILE_VALUE)
-		throw new Error(buildTeamTmuxLeaderRequirementMessage(`unmanaged_tmux_session:${sessionName}`));
+	if (readGjcTmuxProfileValue(tmuxCommand, sessionName) !== GJC_TMUX_PROFILE_VALUE) {
+		// Self-heal: a pane launched through `gjc --tmux` exports
+		// GJC_TMUX_LAUNCHED=1, but the session can lose (or never receive) the
+		// @gjc-profile user-option tag when startup attach fails mid-way or the
+		// registry write races. That stranded-but-genuinely-GJC leader pane
+		// previously hard-failed as unmanaged_tmux_session; re-tag it instead.
+		const launchedByGjc = env[GJC_TMUX_LAUNCHED_ENV] === "1";
+		const retagged = launchedByGjc && retagGjcLaunchedTmuxSession(tmuxCommand, sessionName);
+		if (!retagged || readGjcTmuxProfileValue(tmuxCommand, sessionName) !== GJC_TMUX_PROFILE_VALUE)
+			throw new Error(
+				buildTeamTmuxLeaderRequirementMessage(
+					`unmanaged_tmux_session:${sessionName} — ${buildGjcTmuxUntaggedSessionHint(tmuxCommand)}`,
+				),
+			);
+	}
 	return { sessionName, windowIndex, leaderPaneId, target: `${sessionName}:${windowIndex}` };
 }
 export function resolveGjcWorkerCommand(cwd = process.cwd(), env: NodeJS.ProcessEnv = process.env): string {

package/src/gjc-runtime/tmux-common.ts

@@ -32,6 +32,21 @@ export function resolveGjcTmuxCommand(env: NodeJS.ProcessEnv = process.env): str
 	return env[GJC_TMUX_COMMAND_ENV]?.trim() || env.GJC_TEAM_TMUX_COMMAND?.trim() || "tmux";
 }
 
+export const GJC_TMUX_UNTAGGED_REASON = "gjc_tmux_session_untagged";
+
+export function buildGjcTmuxUntaggedSessionHint(tmuxCommand: string): string {
+	return (
+		`the active multiplexer "${tmuxCommand}" lists this session but did not return GJC's ${GJC_TMUX_PROFILE_OPTION} ownership tag; ` +
+		"GJC-managed sessions and `gjc team` require a tmux provider that round-trips tmux user options. " +
+		"Alternative multiplexers such as psmux on Windows do not persist user options yet, so the Windows-native psmux path is not fully supported; " +
+		"use real tmux for GJC-managed session and team flows."
+	);
+}
+
+export function buildGjcTmuxUntaggedSessionError(sessionName: string, tmuxCommand: string): string {
+	return `${GJC_TMUX_UNTAGGED_REASON}:${sessionName} — ${buildGjcTmuxUntaggedSessionHint(tmuxCommand)}`;
+}
+
 export function sanitizeTmuxToken(value: string): string {
 	return (
 		value

package/src/gjc-runtime/tmux-sessions.ts

@@ -1,6 +1,7 @@
 import {
 	buildGjcTmuxProfileCommands,
 	buildGjcTmuxSessionName,
+	buildGjcTmuxUntaggedSessionError,
 	GJC_TMUX_BRANCH_OPTION,
 	GJC_TMUX_BRANCH_SLUG_OPTION,
 	GJC_TMUX_PROFILE_OPTION,
@@ -73,17 +74,10 @@ function parseSessionLine(line: string): GjcTmuxSessionStatus | null {
 	};
 }
 
-function listSessionLines(env: NodeJS.ProcessEnv = process.env): string[] {
+function runListSessions(format: string, env: NodeJS.ProcessEnv = process.env): string[] {
 	let output = "";
 	try {
-		output = runTmux(
-			[
-				"list-sessions",
-				"-F",
-				`#{session_name}\t#{session_windows}\t#{session_attached}\t#{session_created}\t#{${GJC_TMUX_PROFILE_OPTION}}\t#{session_key_table}\t#{session_panes}\t#{${GJC_TMUX_BRANCH_OPTION}}\t#{${GJC_TMUX_BRANCH_SLUG_OPTION}}\t#{${GJC_TMUX_PROJECT_OPTION}}`,
-			],
-			env,
-		);
+		output = runTmux(["list-sessions", "-F", format], env);
 	} catch (error) {
 		const message = error instanceof Error ? error.message : String(error);
 		if (message.includes("no server running") || message.includes("failed to connect to server")) return [];
@@ -95,6 +89,17 @@ function listSessionLines(env: NodeJS.ProcessEnv = process.env): string[] {
 		.filter(Boolean);
 }
 
+function listSessionLines(env: NodeJS.ProcessEnv = process.env): string[] {
+	return runListSessions(
+		`#{session_name}\t#{session_windows}\t#{session_attached}\t#{session_created}\t#{${GJC_TMUX_PROFILE_OPTION}}\t#{session_key_table}\t#{session_panes}\t#{${GJC_TMUX_BRANCH_OPTION}}\t#{${GJC_TMUX_BRANCH_SLUG_OPTION}}\t#{${GJC_TMUX_PROJECT_OPTION}}`,
+		env,
+	);
+}
+
+function listRawTmuxSessionNames(env: NodeJS.ProcessEnv = process.env): string[] {
+	return runListSessions("#{session_name}", env).map(line => line.split("\t")[0] ?? line);
+}
+
 export function listGjcTmuxSessions(env: NodeJS.ProcessEnv = process.env): GjcTmuxSessionStatus[] {
 	return listSessionLines(env)
 		.map(parseSessionLine)
@@ -114,8 +119,11 @@ export function findGjcTmuxSessionByBranch(
 
 export function statusGjcTmuxSession(sessionName: string, env: NodeJS.ProcessEnv = process.env): GjcTmuxSessionStatus {
 	const session = listGjcTmuxSessions(env).find(candidate => candidate.name === sessionName);
-	if (!session) throw new Error(`gjc_tmux_session_not_found:${sessionName}`);
-	return session;
+	if (session) return session;
+	if (listRawTmuxSessionNames(env).includes(sessionName)) {
+		throw new Error(buildGjcTmuxUntaggedSessionError(sessionName, resolveGjcTmuxCommand(env)));
+	}
+	throw new Error(`gjc_tmux_session_not_found:${sessionName}`);
 }
 
 export function createGjcTmuxSession(env: NodeJS.ProcessEnv = process.env): GjcTmuxSessionStatus {