@gaia-ai/addon-herdr 0.6.4 → 0.6.5

package/dist/src/agents.js

@@ -1,4 +1,4 @@
-import { envArgs, findTabIdByLabel, parsePaneInfo, parsePanesInTab, parseTabCreate, } from './panes.js';
+import { AGENT_SHELL_ENV, envArgs, findTabIdByLabel, parsePaneInfo, parsePanesInTab, parseTabCreate, } from './panes.js';
 /** The single tab that holds a group's agent panes. */
 const groupTabLabel = (group) => `gaia-agents:${group}`;
 export function herdrAgentHost(execHerdr) {
@@ -31,7 +31,11 @@ export function herdrAgentHost(execHerdr) {
     return {
         async launch({ group, cwd, command, env, label }) {
             await captureHome();
-            const e = env ?? {};
+            // Every pane this host opens holds an agent, so all of them carry the
+            // agent-shell marker (GAIA-64) — this is the pane a `gaia ui` user actually
+            // attaches to. The caller's own env wins on a key clash; the marker is
+            // merged in, never substituted for it.
+            const e = { ...AGENT_SHELL_ENV, ...(env ?? {}) };
             // Find the group's tab and split off a LIVE pane (newest-first; a stale
             // pane — a previous agent died/was closed — is skipped). None survive, or
             // no tab yet → create the group tab (its root pane is the agent).

package/dist/src/index.js

@@ -3,6 +3,7 @@ import { exec, shellQuote, slugify } from '@gaia-ai/core';
 import { resolveStateConfig, } from './config.js';
 import { forceRemoveDir, restoreWritable } from './fs.js';
 import { applyPaneLayout, isRecord, parseJson, } from './pane-layout.js';
+import { AGENT_SHELL_ENV, envArgs } from './panes.js';
 import { deriveHerdrRoot } from './root-anchor.js';
 export { herdrAgentHost } from './agents.js';
 export { envArgs, findTabIdByLabel, parsePaneInfo, parsePanesInTab, parseTabCreate, } from './panes.js';
@@ -587,7 +588,12 @@ export class HerdrExecutor {
             runUuid: input.run.uuid,
             workspacePath: input.workspacePath,
         };
-        // 3. Create tab — NO --json flag; label includes the run-id token
+        // 3. Create tab — NO --json flag; label includes the run-id token. The tab's
+        // root pane IS the agent pane, so it is created carrying the agent-shell
+        // marker: the interactive shell must see it at startup for the user's opt-in
+        // history isolation to fire (GAIA-64). The run's own env (GAIA-99) stays out
+        // of here — it travels as inline `KEY='value'` prefixes on the command, so no
+        // secret moves into the pane environment.
         const { paneId: rootPaneId, tabId } = parseTabCreate(await this.execHerdr([
             'tab',
             'create',
@@ -596,6 +602,7 @@ export class HerdrExecutor {
             '--label',
             `${input.ticket.identifier} · ${input.ticket.state} #${input.run.id}`,
             '--no-focus',
+            ...envArgs(AGENT_SHELL_ENV),
         ]));
         try {
             // 4+5. Run the agent command in the root pane, then split each configured
@@ -603,10 +610,16 @@ export class HerdrExecutor {
             // open pane). The root command embeds `KEY='value'` env prefixes whose
             // values may be secret (GAIA-99); pass a redactor so a failed pane-run
             // exec-log carries key names, never values (only when env is present).
+            // The layout panes belong to the run's tab too, so they are marked as
+            // agent shells as well — the executor opts in, the workspace's open-layout
+            // caller does not (GAIA-64).
             const hasEnv = Object.keys(input.env ?? {}).length > 0;
-            await applyPaneLayout(this.execHerdr, rootPaneId, { command: this.commandFor(input), panes: cfg.panes }, input.workspacePath, vars, hasEnv
-                ? { redactCommand: () => this.redactedCommandFor(input) }
-                : undefined);
+            await applyPaneLayout(this.execHerdr, rootPaneId, { command: this.commandFor(input), panes: cfg.panes }, input.workspacePath, vars, {
+                env: AGENT_SHELL_ENV,
+                ...(hasEnv
+                    ? { redactCommand: () => this.redactedCommandFor(input) }
+                    : {}),
+            });
             // 6. Return branch as sessionRef (for logging)
             return { sessionRef: branchName };
         }

package/dist/src/pane-layout.d.ts

@@ -31,7 +31,15 @@ export interface PaneLayout {
  * `redactArgs` scrubber is passed so a failed `pane run` exec-log never carries a
  * secret, while the command herdr actually runs stays real. An empty layout
  * (`{}`) issues no calls at all — the caller's unconfigured default is preserved.
+ *
+ * `opts.env` is forwarded to each split pane as `--env` args (GAIA_* only, see
+ * {@link envArgs}). It is deliberately per-CALLER rather than baked in: this
+ * primitive serves both the executor's agent tab and the workspace's own open
+ * pane, and only the former's panes are agent-owned (GAIA-64). The ROOT pane is
+ * not touched — it already exists when we get here, so its environment came from
+ * whoever created it. Omitted ⇒ no `--env` at all.
  */
 export declare function applyPaneLayout(execHerdr: HerdrExec, rootPaneId: string, layout: PaneLayout, cwd: string, vars: Record<string, string>, opts?: {
     redactCommand?: (command: string) => string;
+    env?: Record<string, string | undefined>;
 }): Promise<void>;

package/dist/src/pane-layout.js

@@ -1,4 +1,5 @@
 import { renderTemplate } from './config.js';
+import { envArgs } from './panes.js';
 export function isRecord(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
@@ -33,6 +34,13 @@ export function parsePaneSplit(output) {
  * `redactArgs` scrubber is passed so a failed `pane run` exec-log never carries a
  * secret, while the command herdr actually runs stays real. An empty layout
  * (`{}`) issues no calls at all — the caller's unconfigured default is preserved.
+ *
+ * `opts.env` is forwarded to each split pane as `--env` args (GAIA_* only, see
+ * {@link envArgs}). It is deliberately per-CALLER rather than baked in: this
+ * primitive serves both the executor's agent tab and the workspace's own open
+ * pane, and only the former's panes are agent-owned (GAIA-64). The ROOT pane is
+ * not touched — it already exists when we get here, so its environment came from
+ * whoever created it. Omitted ⇒ no `--env` at all.
  */
 export async function applyPaneLayout(execHerdr, rootPaneId, layout, cwd, vars, opts) {
     if (layout.command) {
@@ -58,6 +66,7 @@ export async function applyPaneLayout(execHerdr, rootPaneId, layout, cwd, vars,
             '--cwd',
             cwd,
             spec.focus ? '--focus' : '--no-focus',
+            ...envArgs(opts?.env ?? {}),
         ]));
         await execHerdr([
             'pane',

package/dist/src/panes.d.ts

@@ -7,6 +7,18 @@ export interface HerdrPaneRef {
 export interface HerdrPaneInfo extends HerdrPaneRef {
     label: string;
 }
+/**
+ * Marker exported into an AGENT pane's interactive shell, so a user's opt-in
+ * shell init can recognise an agent-run pane at startup and isolate its history
+ * (GAIA-64). It is a plain `GAIA_*` env entry on purpose: it rides {@link envArgs}
+ * like every other pane var instead of adding a second mechanism.
+ *
+ * AGENT panes only — the executor's per-run tab and its layout panes, plus the
+ * TUI-hosted agents. NOT the workspace's own open-layout pane: that one is the
+ * human's landing pane, and the opt-in unsets `HISTFILE`. See
+ * `docs/conductor/node.md` § Agent-pane shell marker.
+ */
+export declare const AGENT_SHELL_ENV: Record<string, string>;
 /** GAIA_* env vars as `--env KEY=VALUE` args (never dump the full environment). */
 export declare function envArgs(env: Record<string, string | undefined>): string[];
 /** `{ paneId, tabId }` from a `herdr tab create` envelope. */

package/dist/src/panes.js

@@ -4,6 +4,20 @@
 function isRecord(v) {
     return typeof v === 'object' && v !== null;
 }
+/**
+ * Marker exported into an AGENT pane's interactive shell, so a user's opt-in
+ * shell init can recognise an agent-run pane at startup and isolate its history
+ * (GAIA-64). It is a plain `GAIA_*` env entry on purpose: it rides {@link envArgs}
+ * like every other pane var instead of adding a second mechanism.
+ *
+ * AGENT panes only — the executor's per-run tab and its layout panes, plus the
+ * TUI-hosted agents. NOT the workspace's own open-layout pane: that one is the
+ * human's landing pane, and the opt-in unsets `HISTFILE`. See
+ * `docs/conductor/node.md` § Agent-pane shell marker.
+ */
+export const AGENT_SHELL_ENV = {
+    GAIA_AGENT_SHELL: '1',
+};
 /** GAIA_* env vars as `--env KEY=VALUE` args (never dump the full environment). */
 export function envArgs(env) {
     const out = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gaia-ai/addon-herdr",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "description": "GAIA herdr integration: spawn executor + per-ticket worktree workspace.",
   "type": "module",
   "license": "MIT",
@@ -20,10 +20,10 @@
     "directory": "gaia-cli/addons/herdr"
   },
   "dependencies": {
-    "@gaia-ai/addon-workspace-git": "^0.6.4"
+    "@gaia-ai/addon-workspace-git": "^0.6.5"
   },
   "peerDependencies": {
-    "@gaia-ai/conductor": "^0.6.4",
-    "@gaia-ai/core": "^0.6.4"
+    "@gaia-ai/conductor": "^0.6.5",
+    "@gaia-ai/core": "^0.6.5"
   }
 }