tmux-team 2.1.0 → 3.0.0-alpha.1

package/src/identity.ts

@@ -0,0 +1,89 @@
+// ─────────────────────────────────────────────────────────────
+// Identity resolution - determine current agent from tmux pane
+// ─────────────────────────────────────────────────────────────
+
+import { execSync } from 'child_process';
+import type { PaneEntry } from './types.js';
+
+export interface ActorResolution {
+  actor: string;
+  source: 'pane' | 'env' | 'default';
+  warning?: string;
+}
+
+/**
+ * Get current tmux pane ID (e.g., "1.0").
+ */
+function getCurrentPane(): string | null {
+  if (!process.env.TMUX) {
+    return null;
+  }
+
+  const tmuxPane = process.env.TMUX_PANE;
+  if (!tmuxPane) {
+    return null;
+  }
+
+  try {
+    const result = execSync(
+      `tmux display-message -p -t "${tmuxPane}" '#{window_index}.#{pane_index}'`,
+      { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }
+    );
+    return result.trim();
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Find agent name by pane ID.
+ */
+function findAgentByPane(paneRegistry: Record<string, PaneEntry>, paneId: string): string | null {
+  for (const [agentName, entry] of Object.entries(paneRegistry)) {
+    if (entry.pane === paneId) {
+      return agentName;
+    }
+  }
+  return null;
+}
+
+/**
+ * Resolve current actor using pane registry as primary source.
+ */
+export function resolveActor(paneRegistry: Record<string, PaneEntry>): ActorResolution {
+  const envActor = process.env.TMT_AGENT_NAME || process.env.TMUX_TEAM_ACTOR;
+  const currentPane = getCurrentPane();
+
+  // Not in tmux - use env var or default to human
+  if (!currentPane) {
+    if (envActor) {
+      return { actor: envActor, source: 'env' };
+    }
+    return { actor: 'human', source: 'default' };
+  }
+
+  // In tmux - look up pane in registry
+  const paneAgent = findAgentByPane(paneRegistry, currentPane);
+
+  if (paneAgent) {
+    if (envActor && envActor !== paneAgent) {
+      return {
+        actor: paneAgent,
+        source: 'pane',
+        warning: `⚠️  Identity mismatch: TMT_AGENT_NAME="${envActor}" but pane ${currentPane} is registered to "${paneAgent}". Using pane identity.`,
+      };
+    }
+    return { actor: paneAgent, source: 'pane' };
+  }
+
+  // Pane not in registry
+  if (envActor) {
+    return {
+      actor: envActor,
+      source: 'env',
+      warning: `⚠️  Unregistered pane: pane ${currentPane} is not in registry. Using TMT_AGENT_NAME="${envActor}".`,
+    };
+  }
+
+  return { actor: 'human', source: 'default' };
+}

package/src/state.test.ts

@@ -51,8 +51,11 @@ describe('State Management', () => {
       fs.writeFileSync(paths.stateFile, JSON.stringify(existingState));
 
       const state = loadState(paths);
-      expect(state.requests.claude).toBeDefined();
-      expect(state.requests.claude?.nonce).toBe('abc123');
+      expect(state.requests.claude).toMatchObject({
+        id: 'req-1',
+        nonce: 'abc123',
+        pane: '1.0',
+      });
     });
 
     it('returns empty state when state.json is corrupted', () => {
@@ -123,7 +126,11 @@ describe('State Management', () => {
 
       const cleaned = cleanupState(paths, 60); // 60 second TTL
 
-      expect(cleaned.requests.recentAgent).toBeDefined();
+      expect(cleaned.requests.recentAgent).toMatchObject({
+        id: 'new',
+        nonce: 'new',
+        pane: '1.0',
+      });
     });
 
     it('requires ttlSeconds parameter', () => {
@@ -142,7 +149,7 @@ describe('State Management', () => {
       // With 10s TTL, agent1 should be kept, agent2 removed
       const cleaned = cleanupState(paths, 10);
 
-      expect(cleaned.requests.agent1).toBeDefined();
+      expect(cleaned.requests.agent1).toMatchObject({ id: '1', nonce: 'a' });
       expect(cleaned.requests.agent2).toBeUndefined();
     });
 
@@ -193,8 +200,11 @@ describe('State Management', () => {
       setActiveRequest(paths, 'claude', req);
 
       const state = loadState(paths);
-      expect(state.requests.claude).toBeDefined();
-      expect(state.requests.claude?.id).toBe('req-1');
+      expect(state.requests.claude).toMatchObject({
+        id: 'req-1',
+        nonce: 'nonce123',
+        pane: '1.0',
+      });
     });
 
     it('stores request with id, nonce, pane, and startedAtMs', () => {
@@ -244,8 +254,8 @@ describe('State Management', () => {
       setActiveRequest(paths, 'codex', req2);
 
       const state = loadState(paths);
-      expect(state.requests.claude).toBeDefined();
-      expect(state.requests.codex).toBeDefined();
+      expect(state.requests.claude).toMatchObject({ id: '1', nonce: 'a' });
+      expect(state.requests.codex).toMatchObject({ id: '2', nonce: 'b' });
     });
   });
 
@@ -282,7 +292,7 @@ describe('State Management', () => {
       clearActiveRequest(paths, 'claude', 'wrong-id');
 
       const state = loadState(paths);
-      expect(state.requests.claude).toBeDefined(); // Should still exist
+      expect(state.requests.claude).toMatchObject({ id: 'req-1', nonce: 'a' }); // Should still exist
     });
 
     it('clears when requestId matches', () => {
@@ -305,7 +315,7 @@ describe('State Management', () => {
 
       const state = loadState(paths);
       expect(state.requests.claude).toBeUndefined();
-      expect(state.requests.codex).toBeDefined();
+      expect(state.requests.codex).toMatchObject({ id: '2', nonce: 'b' });
     });
   });
 });

package/src/state.ts

@@ -15,6 +15,7 @@ export interface AgentRequestState {
 
 export interface StateFile {
   requests: Record<string, AgentRequestState>;
+  preambleCounters?: Record<string, number>; // agentName -> message count
 }
 
 const DEFAULT_STATE: StateFile = { requests: {} };
@@ -52,7 +53,10 @@ export function cleanupState(paths: Paths, ttlSeconds: number): StateFile {
   const now = Date.now();
 
   const ttlMs = Math.max(1, ttlSeconds) * 1000;
-  const next: StateFile = { requests: {} };
+  const next: StateFile = {
+    requests: {},
+    preambleCounters: state.preambleCounters, // Preserve preamble counters
+  };
 
   for (const [agent, req] of Object.entries(state.requests)) {
     if (!req || typeof req.startedAtMs !== 'number') continue;
@@ -81,3 +85,26 @@ export function clearActiveRequest(paths: Paths, agent: string, requestId?: stri
   delete state.requests[agent];
   saveState(paths, state);
 }
+
+/**
+ * Get the current preamble counter for an agent.
+ * Returns 0 if not set.
+ */
+export function getPreambleCounter(paths: Paths, agent: string): number {
+  const state = loadState(paths);
+  return state.preambleCounters?.[agent] ?? 0;
+}
+
+/**
+ * Increment the preamble counter for an agent and return the new value.
+ */
+export function incrementPreambleCounter(paths: Paths, agent: string): number {
+  const state = loadState(paths);
+  if (!state.preambleCounters) {
+    state.preambleCounters = {};
+  }
+  const newCount = (state.preambleCounters[agent] ?? 0) + 1;
+  state.preambleCounters[agent] = newCount;
+  saveState(paths, state);
+  return newCount;
+}

package/src/types.ts

@@ -10,24 +10,27 @@ export interface AgentConfig {
 export interface PaneEntry {
   pane: string;
   remark?: string;
+  preamble?: string; // Agent preamble (prepended to messages)
+  deny?: string[]; // Permission deny patterns
 }
 
 export interface ConfigDefaults {
   timeout: number; // seconds
   pollInterval: number; // seconds
   captureLines: number;
+  preambleEvery: number; // inject preamble every N messages (default: 3)
 }
 
 export interface GlobalConfig {
   mode: 'polling' | 'wait';
   preambleMode: 'always' | 'disabled';
   defaults: ConfigDefaults;
-  agents: Record<string, AgentConfig>;
 }
 
 export interface LocalSettings {
   mode?: 'polling' | 'wait';
   preambleMode?: 'always' | 'disabled';
+  preambleEvery?: number; // local override for preamble frequency
 }
 
 export interface LocalConfigFile {
@@ -82,7 +85,8 @@ export interface Tmux {
 export interface WaitResult {
   requestId: string;
   nonce: string;
-  marker: string;
+  startMarker: string;
+  endMarker: string;
   response: string;
 }
 

package/src/ui.ts

@@ -7,7 +7,8 @@ import type { UI } from './types.js';
 const isTTY = process.stdout.isTTY;
 
 // Strip ANSI escape codes for accurate length calculation
-const stripAnsi = (s: string) => s.replace(/\x1b\[[0-9;]*m/g, '');
+const ansiEscape = String.fromCharCode(27);
+const stripAnsi = (s: string) => s.replace(new RegExp(`${ansiEscape}\\[[0-9;]*m`, 'g'), '');
 
 export const colors = {
   red: (s: string) => (isTTY ? `\x1b[31m${s}\x1b[0m` : s),

package/src/version.ts

@@ -14,7 +14,7 @@ function getVersion(): string {
     const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
     return pkg.version;
   } catch {
-    return '2.0.0';
+    return '3.0.0';
   }
 }