feat: add per-chat project switching

Author: MackDing

.env.example

@@ -4,6 +4,7 @@ PROACTIVE_USER_IDS=123456789
 
 CODEX_COMMAND=codex
 CODEX_ARGS=
+WORKSPACE_ROOT=.
 CODEX_WORKDIR=.
 STREAM_THROTTLE_MS=1200
 STREAM_BUFFER_CHARS=120000

README.md

@@ -47,6 +47,7 @@ Minimum required:
 ```bash
 BOT_TOKEN=123456789:telegram-token
 ALLOWED_USER_IDS=123456789
+WORKSPACE_ROOT=.
 CODEX_WORKDIR=.
 ```
 
@@ -110,6 +111,9 @@ General:
 - `/start` - bootstrap message
 - `/help` - command summary
 - `/status` - show current chat status, active runner mode, workdir, model override, MCP servers
+- `/pwd` - show the current project directory for this chat
+- `/repo` - list switchable git projects under `WORKSPACE_ROOT`
+- `/repo <name>` - switch the current chat to another project
 - `/new` - close current session and start fresh on the next message
 - `/exec <task>` - force a one-off `codex exec`
 - `/auto <task>` - force a one-off `codex exec --full-auto`
@@ -139,6 +143,7 @@ Telegram adaptation notes:
 - `/auto` behaves like `codex exec --full-auto "task"`
 - `/new` is implemented by the bot and resets the current chat session
 - `/status` is implemented by the bot and reports local runtime state
+- `/repo` is implemented by the bot and switches the per-chat working directory inside `WORKSPACE_ROOT`
 - `/plan` translates to a planning-only prompt instead of passing a raw `/plan` slash command to Codex
 
 ## Streaming and Reasoning Visualization
@@ -170,6 +175,7 @@ Required:
 ```bash
 BOT_TOKEN=...
 ALLOWED_USER_IDS=123456789,987654321
+WORKSPACE_ROOT=.
 CODEX_WORKDIR=.
 ```
 
@@ -178,6 +184,7 @@ Common options:
 ```bash
 CODEX_COMMAND=codex
 CODEX_ARGS=
+WORKSPACE_ROOT=/Users/yourname/projects
 STREAM_THROTTLE_MS=1200
 STREAM_BUFFER_CHARS=120000
 REASONING_RENDER_MODE=spoiler
@@ -208,6 +215,7 @@ E2E_TEST_COMMAND=npx playwright test --reporter=line
 - Do not commit `.env`, tokens, or session artifacts
 - Run bot under a restricted OS user in production
 - Keep `CODEX_WORKDIR` scoped to a safe workspace root
+- Keep `WORKSPACE_ROOT` limited to a parent directory that only contains projects you want the bot to access
 - Prefer least-privilege GitHub PAT
 
 ## Troubleshooting

src/bot/handlers.js

@@ -45,7 +45,7 @@ export function registerHandlers({ bot, router, ptyManager, skills, scheduler })
         "codex-telegram-claws ready.",
         "普通消息和编码任务会路由到 Codex。",
         "MCP 只在显式 /mcp 命令下调用。",
-        "试试: /status, /exec, /auto, /plan, /model, /new",
+        "试试: /status, /repo, /pwd, /exec, /auto, /plan, /model, /new",
         "GitHub 指令示例: /gh commit \"feat: init\""
       ].join("\n")
     );
@@ -58,6 +58,9 @@ export function registerHandlers({ bot, router, ptyManager, skills, scheduler })
         "Commands:",
         "/help - 显示帮助",
         "/status - 查看当前 chat 的运行状态",
+        "/pwd - 查看当前项目目录",
+        "/repo - 列出可切换项目",
+        "/repo <name> - 切换当前 chat 的项目",
         "/new - 新建会话并清空当前上下文",
         "/exec <task> - 强制用 codex exec 运行一次任务",
         "/auto <task> - 强制用 codex exec --full-auto 运行任务",
@@ -87,12 +90,63 @@ export function registerHandlers({ bot, router, ptyManager, skills, scheduler })
         }`,
         `preferred model: ${status.preferredModel || "inherit codex default"}`,
         `command: ${status.command}`,
+        `workspace root: ${status.workspaceRoot}`,
         `workdir: ${status.workdir}`,
         `mcp servers: ${status.mcpServers.length ? status.mcpServers.join(", ") : "none"}`
       ].join("\n")
     );
   });
 
+  bot.command("pwd", async (ctx) => {
+    const status = ptyManager.getStatus(ctx.chat.id);
+    await sendChunkedMarkdown(
+      ctx,
+      [
+        `workspace root: ${status.workspaceRoot}`,
+        `current project: ${status.relativeWorkdir}`,
+        `workdir: ${status.workdir}`
+      ].join("\n")
+    );
+  });
+
+  bot.command("repo", async (ctx) => {
+    const payload = extractCommandPayload(ctx.message.text, "repo");
+    if (!payload) {
+      const status = ptyManager.getStatus(ctx.chat.id);
+      const projects = ptyManager.listProjects();
+      const lines = projects.map((project) => {
+        const marker = project.path === status.workdir ? " <current>" : "";
+        return `- ${project.relativePath}${marker}`;
+      });
+
+      await sendChunkedMarkdown(
+        ctx,
+        [
+          `workspace root: ${status.workspaceRoot}`,
+          "Available projects:",
+          ...(lines.length ? lines : ["- (no git repos found under workspace root)"]),
+          "",
+          "Usage: /repo <name>"
+        ].join("\n")
+      );
+      return;
+    }
+
+    try {
+      const result = ptyManager.switchWorkdir(ctx.chat.id, payload);
+      await sendChunkedMarkdown(
+        ctx,
+        [
+          "Project switched.",
+          `current project: ${result.relativePath}`,
+          `workdir: ${result.workdir}`
+        ].join("\n")
+      );
+    } catch (error) {
+      await sendChunkedMarkdown(ctx, `切换项目失败: ${error.message}`);
+    }
+  });
+
   bot.command("new", async (ctx) => {
     const closed = ptyManager.closeSession(ctx.chat.id);
     await sendChunkedMarkdown(
@@ -219,7 +273,11 @@ export function registerHandlers({ bot, router, ptyManager, skills, scheduler })
   bot.command("gh", async (ctx) => {
     try {
       const text = extractCommandPayload(ctx.message.text, "gh") || "help";
-      const result = await skills.github.execute({ text: `/gh ${text}`, ctx });
+      const result = await skills.github.execute({
+        text: `/gh ${text}`,
+        ctx,
+        workdir: ptyManager.getStatus(ctx.chat.id).workdir
+      });
       await sendSkillResult(ctx, result);
     } catch (error) {
       await sendChunkedMarkdown(ctx, `GitHub skill 执行失败: ${error.message}`);

src/config.js

@@ -83,12 +83,20 @@ export function loadConfig() {
     ? rawMcpServers.map((server, index) => normalizeMcpServer(server, index)).filter(Boolean)
     : [];
   const runnerCwd = resolveDirectory(process.env.CODEX_WORKDIR, "CODEX_WORKDIR");
+  const workspaceRoot = resolveDirectory(
+    process.env.WORKSPACE_ROOT,
+    "WORKSPACE_ROOT",
+    runnerCwd
+  );
   const githubDefaultWorkdir = resolveDirectory(process.env.GITHUB_DEFAULT_WORKDIR, "GITHUB_DEFAULT_WORKDIR");
 
   return {
     app: {
       name: "codex-telegram-claws"
     },
+    workspace: {
+      root: workspaceRoot
+    },
     telegram: {
       botToken: required("BOT_TOKEN"),
       allowedUserIds,

src/orchestrator/skills/githubSkill.js

@@ -39,14 +39,17 @@ function pickJobId(text, fallbackJobId) {
 export class GitHubSkill {
   constructor({ config }) {
     this.config = config;
-    this.git = simpleGit({
-      baseDir: config.github.defaultWorkdir
-    });
     this.octokit = config.github.token ? new Octokit({ auth: config.github.token }) : null;
     this.testJobs = new Map();
     this.latestTestJobId = "";
   }
 
+  getGit(workdir) {
+    return simpleGit({
+      baseDir: workdir || this.config.github.defaultWorkdir
+    });
+  }
+
   supports(text) {
     const normalized = text.toLowerCase();
     return (
@@ -55,7 +58,7 @@ export class GitHubSkill {
     );
   }
 
-  async execute({ text }) {
+  async execute({ text, workdir }) {
     const stripped = text.replace(/^\/gh(@\w+)?\s*/i, "").trim();
     const normalized = stripped.toLowerCase();
 
@@ -64,23 +67,23 @@ export class GitHubSkill {
     }
 
     if (/创建仓库|create repo|new repo/.test(normalized)) {
-      return this.createRepoFromText(stripped);
+      return this.createRepoFromText(stripped, workdir);
     }
 
     if (/测试状态|test status|status/.test(normalized)) {
       return this.readTestStatusFromText(stripped);
     }
 
     if (/运行测试|run test|playwright|e2e/.test(normalized)) {
-      return this.startTests();
+      return this.startTests(workdir);
     }
 
     if ((/推送|\bpush\b/.test(normalized) && !/提交|commit/.test(normalized))) {
-      return this.pushOnly();
+      return this.pushOnly(workdir);
     }
 
     if (/提交|推送|commit|push/.test(normalized)) {
-      return this.commitAndPush(stripped);
+      return this.commitAndPush(stripped, workdir);
     }
 
     return { text: this.helpText() };
@@ -97,30 +100,37 @@ export class GitHubSkill {
     ].join("\n");
   }
 
-  async commitAndPush(rawText) {
-    const status = await this.git.status();
+  async commitAndPush(rawText, workdir) {
+    const git = this.getGit(workdir);
+    const status = await git.status();
     if (!status.files.length) {
       return { text: "没有检测到变更，跳过 commit。" };
     }
 
     const explicitMessage = extractQuotedMessage(rawText);
     const commitMessage = explicitMessage || buildAutoCommitMessage(status);
 
-    await this.git.add(".");
-    await this.git.commit(commitMessage);
+    await git.add(".");
+    await git.commit(commitMessage);
 
-    const branchInfo = await this.git.branch();
+    const branchInfo = await git.branch();
     const branch = branchInfo.current || this.config.github.defaultBranch;
 
     try {
-      await this.git.push("origin", branch);
+      await git.push("origin", branch);
       return {
-        text: `提交并推送成功。\nbranch: ${branch}\nmessage: ${commitMessage}`
+        text: [
+          "提交并推送成功。",
+          `workdir: ${workdir || this.config.github.defaultWorkdir}`,
+          `branch: ${branch}`,
+          `message: ${commitMessage}`
+        ].join("\n")
       };
     } catch (error) {
       return {
         text: [
           "提交完成，但推送失败。",
+          `workdir: ${workdir || this.config.github.defaultWorkdir}`,
           `branch: ${branch}`,
           `message: ${commitMessage}`,
           `error: ${error.message}`
@@ -129,16 +139,17 @@ export class GitHubSkill {
     }
   }
 
-  async pushOnly() {
-    const branchInfo = await this.git.branch();
+  async pushOnly(workdir) {
+    const git = this.getGit(workdir);
+    const branchInfo = await git.branch();
     const branch = branchInfo.current || this.config.github.defaultBranch;
-    await this.git.push("origin", branch);
+    await git.push("origin", branch);
     return {
-      text: `推送成功。\nbranch: ${branch}`
+      text: `推送成功。\nworkdir: ${workdir || this.config.github.defaultWorkdir}\nbranch: ${branch}`
     };
   }
 
-  async createRepoFromText(rawText) {
+  async createRepoFromText(rawText, workdir) {
     if (!this.octokit) {
       return { text: "缺少 GITHUB_TOKEN，无法调用 GitHub API 创建仓库。" };
     }
@@ -148,42 +159,45 @@ export class GitHubSkill {
       return { text: "无法解析仓库名。示例: /gh create repo codex-telegram-claws-demo" };
     }
 
+    const git = this.getGit(workdir);
     const isPrivate = !/public|公开/.test(rawText.toLowerCase());
     const { data: repo } = await this.octokit.repos.createForAuthenticatedUser({
       name: repoName,
       private: isPrivate,
       auto_init: false
     });
 
-    const remotes = await this.git.getRemotes(true);
+    const remotes = await git.getRemotes(true);
     const origin = remotes.find((remote) => remote.name === "origin");
     if (!origin) {
-      await this.git.addRemote("origin", repo.clone_url);
+      await git.addRemote("origin", repo.clone_url);
     } else {
-      await this.git.remote(["set-url", "origin", repo.clone_url]);
+      await git.remote(["set-url", "origin", repo.clone_url]);
     }
 
-    const branchInfo = await this.git.branch();
+    const branchInfo = await git.branch();
     const branch = branchInfo.current || this.config.github.defaultBranch;
 
-    await this.git.push(["-u", "origin", branch]);
+    await git.push(["-u", "origin", branch]);
 
     return {
       text: [
         "仓库创建并关联成功。",
+        `workdir: ${workdir || this.config.github.defaultWorkdir}`,
         `repo: ${repo.full_name}`,
         `url: ${repo.html_url}`,
         `branch: ${branch}`
       ].join("\n")
     };
   }
 
-  async startTests() {
+  async startTests(workdir) {
     const jobId = `job-${Date.now()}`;
     const command = this.config.github.e2eCommand;
     const job = {
       jobId,
       status: "running",
+      workdir: workdir || this.config.github.defaultWorkdir,
       command,
       startedAt: new Date().toISOString(),
       finishedAt: "",
@@ -192,7 +206,7 @@ export class GitHubSkill {
     };
 
     const child = spawn(command, {
-      cwd: this.config.github.defaultWorkdir,
+      cwd: workdir || this.config.github.defaultWorkdir,
       env: process.env,
       shell: true
     });
@@ -225,6 +239,7 @@ export class GitHubSkill {
       text: [
         "已触发自动化测试任务。",
         `jobId: ${jobId}`,
+        `workdir: ${job.workdir}`,
         `command: ${command}`,
         "使用 /gh test status <jobId> 查询状态。"
       ].join("\n"),
@@ -247,6 +262,7 @@ export class GitHubSkill {
       text: [
         `jobId: ${job.jobId}`,
         `status: ${job.status}`,
+        `workdir: ${job.workdir}`,
         `startedAt: ${job.startedAt}`,
         job.finishedAt ? `finishedAt: ${job.finishedAt}` : "finishedAt: running",
         job.exitCode === null ? "exitCode: running" : `exitCode: ${job.exitCode}`,