Fix session renaming issue

Author: bezbac

tests/Dockerfile

@@ -49,6 +49,7 @@ RUN chown -R alice:alice /home/alice/.config
 COPY ./tests/package.json ./package.json
 COPY ./tests/tui-test.config.js ./tui-test.config.js
 COPY ./tests/main.test.js ./main.test.js
+COPY ./tests/session-rename.test.js ./session-rename.test.js
 COPY ./tests/stable-id.test.js ./stable-id.test.js
 COPY ./tests/test-utils.js ./test-utils.js
 RUN chown -R alice:alice /tests

tests/session-rename.test.js

@@ -0,0 +1,53 @@
+import { test, expect } from "@microsoft/tui-test";
+import {
+  writeLine,
+  expectViewToContain,
+  maybeApprovePermissions,
+} from "./test-utils.js";
+
+test.use({ program: { file: "/bin/zsh" } });
+
+const initialSessionName = `rename-session-${Date.now()}`;
+const renamedSessionName = `${initialSessionName}-renamed`;
+const targetDir = `renamed-session-test-${Date.now()}`;
+const backgroundSessionName = `${initialSessionName}-background`;
+
+test("continues handling cd after renaming the session with multiple sessions present", async ({ terminal }) => {
+  await expect(
+    terminal.getByText("Using config /home/alice/.zshrc", { full: true }),
+  ).toBeVisible();
+
+  writeLine(terminal, "cd");
+  await expect(terminal.getByText("~ $", { strict: false })).toBeVisible();
+
+  writeLine(terminal, `zellij attach -b ${backgroundSessionName}`);
+  await expectViewToContain(terminal, "~ $", 10000);
+
+  writeLine(terminal, `zellij attach -c ${initialSessionName}`);
+  await expect(terminal.getByText("Pane #1", { full: true })).toBeVisible({
+    timeout: 10000,
+  });
+  await maybeApprovePermissions(terminal);
+  await expect(
+    terminal.getByText("Using config /home/alice/.zshrc", { full: true }),
+  ).toBeVisible();
+  await expect(terminal.getByText("~ $", { strict: false })).toBeVisible();
+  await expectViewToContain(terminal, `Zellij (${initialSessionName})  Tab #1`);
+
+  writeLine(terminal, `mkdir ${targetDir}`);
+  await expectViewToContain(terminal, "~ $", 10000);
+
+  writeLine(terminal, `zellij action rename-session ${renamedSessionName}`);
+  writeLine(terminal, "env | sort | grep '^ZELLIJ_SESSION_NAME='");
+  await expectViewToContain(
+    terminal,
+    `ZELLIJ_SESSION_NAME=${renamedSessionName}`,
+    10000,
+  );
+
+  writeLine(terminal, `cd ${targetDir}`);
+  await expectViewToContain(terminal, `~/${targetDir} $`, 10000);
+
+  writeLine(terminal, "pwd");
+  await expectViewToContain(terminal, `/home/alice/${targetDir}`, 10000);
+});

zellij-tabula.plugin.zsh

@@ -1,5 +1,22 @@
 export ZELLIJ_TABULA_ZSH_PLUGIN_VERSION="0.2.0"
 
+zellij() {
+  command zellij "$@"
+  local exit_code=$?
+
+  # Zellij keeps the old session name in existing shells after
+  # `action rename-session`, which makes later CLI calls like `pipe` hang.
+  if [[ $exit_code -eq 0 && "$1" == "action" && "$2" == "rename-session" && -n "$3" ]]; then
+    export ZELLIJ_SESSION_NAME="$3"
+  fi
+
+  if [[ $exit_code -eq 0 && "$1" == "ac" && "$2" == "rename-session" && -n "$3" ]]; then
+    export ZELLIJ_SESSION_NAME="$3"
+  fi
+
+  return $exit_code
+}
+
 chpwd() {
   if [[ -n $ZELLIJ ]]; then
     zellij pipe --name tabula -- "'$ZELLIJ_PANE_ID' '$PWD'"