copilotoffice 2.2.0 → 2.3.0

package/dist/electron/terminal/server.js

@@ -3044,8 +3044,8 @@ var require_main = __commonJS({
     exports2.createMessageConnection = exports2.createServerSocketTransport = exports2.createClientSocketTransport = exports2.createServerPipeTransport = exports2.createClientPipeTransport = exports2.generateRandomPipeName = exports2.StreamMessageWriter = exports2.StreamMessageReader = exports2.SocketMessageWriter = exports2.SocketMessageReader = exports2.PortMessageWriter = exports2.PortMessageReader = exports2.IPCMessageWriter = exports2.IPCMessageReader = void 0;
     var ril_1 = require_ril();
     ril_1.default.install();
-    var path5 = require("path");
-    var os4 = require("os");
+    var path7 = require("path");
+    var os5 = require("os");
     var crypto_1 = require("crypto");
     var net_1 = require("net");
     var api_1 = require_api();
@@ -3180,9 +3180,9 @@ var require_main = __commonJS({
       }
       let result;
       if (XDG_RUNTIME_DIR) {
-        result = path5.join(XDG_RUNTIME_DIR, `vscode-ipc-${randomSuffix}.sock`);
+        result = path7.join(XDG_RUNTIME_DIR, `vscode-ipc-${randomSuffix}.sock`);
       } else {
-        result = path5.join(os4.tmpdir(), `vscode-${randomSuffix}.sock`);
+        result = path7.join(os5.tmpdir(), `vscode-${randomSuffix}.sock`);
       }
       const limit = safeIpcPathLengths.get(process.platform);
       if (limit !== void 0 && result.length > limit) {
@@ -6441,40 +6441,40 @@ function normalizeSqliteParams(params) {
 }
 function createSessionFsAdapter(provider) {
   return {
-    readFile: async ({ path: path5 }) => {
+    readFile: async ({ path: path7 }) => {
       try {
-        const content = await provider.readFile(path5);
+        const content = await provider.readFile(path7);
         return { content };
       } catch (err) {
         return { content: "", error: toSessionFsError(err) };
       }
     },
-    writeFile: async ({ path: path5, content, mode }) => {
+    writeFile: async ({ path: path7, content, mode }) => {
       try {
-        await provider.writeFile(path5, content, mode);
+        await provider.writeFile(path7, content, mode);
         return void 0;
       } catch (err) {
         return toSessionFsError(err);
       }
     },
-    appendFile: async ({ path: path5, content, mode }) => {
+    appendFile: async ({ path: path7, content, mode }) => {
       try {
-        await provider.appendFile(path5, content, mode);
+        await provider.appendFile(path7, content, mode);
         return void 0;
       } catch (err) {
         return toSessionFsError(err);
       }
     },
-    exists: async ({ path: path5 }) => {
+    exists: async ({ path: path7 }) => {
       try {
-        return { exists: await provider.exists(path5) };
+        return { exists: await provider.exists(path7) };
       } catch {
         return { exists: false };
       }
     },
-    stat: async ({ path: path5 }) => {
+    stat: async ({ path: path7 }) => {
       try {
-        return await provider.stat(path5);
+        return await provider.stat(path7);
       } catch (err) {
         return {
           isFile: false,
@@ -6486,33 +6486,33 @@ function createSessionFsAdapter(provider) {
         };
       }
     },
-    mkdir: async ({ path: path5, recursive, mode }) => {
+    mkdir: async ({ path: path7, recursive, mode }) => {
       try {
-        await provider.mkdir(path5, recursive ?? false, mode);
+        await provider.mkdir(path7, recursive ?? false, mode);
         return void 0;
       } catch (err) {
         return toSessionFsError(err);
       }
     },
-    readdir: async ({ path: path5 }) => {
+    readdir: async ({ path: path7 }) => {
       try {
-        const entries = await provider.readdir(path5);
+        const entries = await provider.readdir(path7);
         return { entries };
       } catch (err) {
         return { entries: [], error: toSessionFsError(err) };
       }
     },
-    readdirWithTypes: async ({ path: path5 }) => {
+    readdirWithTypes: async ({ path: path7 }) => {
       try {
-        const entries = await provider.readdirWithTypes(path5);
+        const entries = await provider.readdirWithTypes(path7);
         return { entries };
       } catch (err) {
         return { entries: [], error: toSessionFsError(err) };
       }
     },
-    rm: async ({ path: path5, recursive, force }) => {
+    rm: async ({ path: path7, recursive, force }) => {
       try {
-        await provider.rm(path5, recursive ?? false, force ?? false);
+        await provider.rm(path7, recursive ?? false, force ?? false);
         return void 0;
       } catch (err) {
         return toSessionFsError(err);
@@ -9367,9 +9367,9 @@ var init_dist = __esm({
 });
 
 // electron/terminal/server.ts
-var path4 = __toESM(require("path"));
-var os3 = __toESM(require("os"));
-var fs3 = __toESM(require("fs"));
+var path6 = __toESM(require("path"));
+var os4 = __toESM(require("os"));
+var fs5 = __toESM(require("fs"));
 var crypto3 = __toESM(require("crypto"));
 var import_child_process2 = require("child_process");
 
@@ -9566,6 +9566,53 @@ function formatToolStatus(toolName, args) {
       return `Using ${toolName}`;
   }
 }
+function normalizeAskUserArgs(args) {
+  const a = args ?? {};
+  const questionRaw = a.question ?? a.prompt ?? a.message ?? a.text ?? "";
+  const question = typeof questionRaw === "string" ? questionRaw : String(questionRaw ?? "");
+  const rawOptions = a.options ?? a.choices ?? a.answers ?? a.selections ?? [];
+  const options = [];
+  if (Array.isArray(rawOptions)) {
+    for (const opt of rawOptions) {
+      if (typeof opt === "string") {
+        options.push({ text: opt });
+      } else if (opt && typeof opt === "object") {
+        const o = opt;
+        const text = o.text ?? o.label ?? o.value ?? o.name ?? "";
+        options.push({ text: typeof text === "string" ? text : String(text ?? "") });
+      }
+    }
+  }
+  const freeformRaw = a.freeform ?? a.allowFreeform ?? a.allowFreeText ?? a.allowCustom ?? a.freeText ?? false;
+  const freeform = Boolean(freeformRaw);
+  return { question, options, freeform };
+}
+function buildAskUserRelay(event, backendName) {
+  const d = event.data ?? {};
+  if (event.type === "user_input.requested") {
+    const options = Array.isArray(d.choices) ? d.choices.map((c) => ({
+      text: typeof c === "string" ? c : String(c?.text ?? c?.label ?? c?.value ?? "")
+    })) : [];
+    return {
+      toolId: String(d.toolCallId ?? ""),
+      requestId: String(d.requestId ?? ""),
+      question: String(d.question ?? ""),
+      options,
+      freeform: Boolean(d.allowFreeform)
+    };
+  }
+  if (event.type === "tool.execution_start" && d.toolName === "ask_user" && backendName === "node-pty") {
+    const norm = normalizeAskUserArgs(d.arguments);
+    return {
+      toolId: String(d.toolCallId ?? ""),
+      requestId: "",
+      question: norm.question,
+      options: norm.options,
+      freeform: norm.freeform
+    };
+  }
+  return null;
+}
 
 // electron/terminal/event-source.ts
 var EVENT_METADATA_KEYS = /* @__PURE__ */ new Set(["type", "id", "timestamp", "parentId"]);
@@ -9642,23 +9689,232 @@ var FileWatcherEventSourceFactory = class {
 
 // electron/terminal/terminal-backend.ts
 var import_child_process = require("child_process");
+var os3 = __toESM(require("os"));
+var path4 = __toESM(require("path"));
+
+// electron/terminal/custom-agents.ts
+var fs2 = __toESM(require("fs"));
 var os2 = __toESM(require("os"));
 var path2 = __toESM(require("path"));
+function parseAgentFrontmatter(content) {
+  const normalized = content.replace(/\r\n/g, "\n");
+  if (!normalized.startsWith("---\n") && normalized !== "---") {
+    return { prompt: content.trim() };
+  }
+  const end = normalized.indexOf("\n---", 3);
+  if (end === -1) {
+    return { prompt: content.trim() };
+  }
+  const fmBlock = normalized.slice(4, end);
+  const afterFence = normalized.indexOf("\n", end + 1);
+  const prompt = (afterFence === -1 ? "" : normalized.slice(afterFence + 1)).trim();
+  const raw = parseFrontmatterBlock(fmBlock);
+  const out = { prompt };
+  if (typeof raw.name === "string") out.name = raw.name;
+  if (typeof raw.displayName === "string") out.displayName = raw.displayName;
+  if (typeof raw.description === "string") out.description = raw.description;
+  if (typeof raw.model === "string") out.model = raw.model;
+  if (typeof raw.infer === "boolean") out.infer = raw.infer;
+  if (Array.isArray(raw.tools)) out.tools = raw.tools.map(String);
+  if (Array.isArray(raw.skills)) out.skills = raw.skills.map(String);
+  return out;
+}
+function parseFrontmatterBlock(block) {
+  const lines = block.split("\n");
+  const result = {};
+  let i = 0;
+  const keyLine = /^([A-Za-z_][A-Za-z0-9_-]*):(.*)$/;
+  while (i < lines.length) {
+    const line = lines[i];
+    if (!line.trim() || /^\s*#/.test(line)) {
+      i++;
+      continue;
+    }
+    const m = keyLine.exec(line);
+    if (!m || /^\s/.test(line)) {
+      i++;
+      continue;
+    }
+    const key = m[1];
+    const rest = m[2].trim();
+    if (rest === ">" || rest === "|" || rest === ">-" || rest === "|-") {
+      const folded = rest[0] === ">";
+      const collected = [];
+      i++;
+      while (i < lines.length && (lines[i].trim() === "" || /^\s/.test(lines[i]))) {
+        collected.push(lines[i].replace(/^\s+/, ""));
+        i++;
+      }
+      while (collected.length && collected[collected.length - 1] === "") collected.pop();
+      result[key] = folded ? collected.join(" ").replace(/\s+/g, " ").trim() : collected.join("\n");
+      continue;
+    }
+    if (rest.startsWith("[") && rest.endsWith("]")) {
+      result[key] = rest.slice(1, -1).split(",").map((s) => unquote(s.trim())).filter((s) => s.length > 0);
+      i++;
+      continue;
+    }
+    if (rest === "") {
+      const items = [];
+      let j = i + 1;
+      while (j < lines.length && (lines[j].trim() === "" || /^\s/.test(lines[j]))) {
+        const item = /^\s*-\s+(.*)$/.exec(lines[j]);
+        if (item) items.push(unquote(item[1].trim()));
+        else if (lines[j].trim() === "") {
+        } else break;
+        j++;
+      }
+      if (items.length > 0) {
+        result[key] = items;
+        i = j;
+        continue;
+      }
+      result[key] = "";
+      i++;
+      continue;
+    }
+    result[key] = coerceScalar(unquote(rest));
+    i++;
+  }
+  return result;
+}
+function unquote(s) {
+  if (s.startsWith('"') && s.endsWith('"') || s.startsWith("'") && s.endsWith("'")) {
+    return s.slice(1, -1);
+  }
+  return s;
+}
+function coerceScalar(s) {
+  if (s === "true") return true;
+  if (s === "false") return false;
+  return s;
+}
+function toCustomAgentConfig(parsed, fallbackName) {
+  const name = parsed.name || fallbackName;
+  if (!name || !parsed.prompt) return null;
+  const config = {
+    name,
+    prompt: parsed.prompt
+  };
+  if (parsed.displayName) config.displayName = parsed.displayName;
+  if (parsed.description) config.description = parsed.description;
+  if (parsed.tools && parsed.tools.length > 0) config.tools = parsed.tools;
+  if (parsed.model) config.model = parsed.model;
+  if (typeof parsed.infer === "boolean") config.infer = parsed.infer;
+  if (parsed.skills && parsed.skills.length > 0) config.skills = parsed.skills;
+  return config;
+}
+function resolveCopilotHome(env = process.env, homeDir = os2.homedir()) {
+  const override = env.COPILOT_HOME?.trim();
+  if (override) return override;
+  return path2.join(homeDir, ".copilot");
+}
+function customAgentDirs(cwd, copilotHome = resolveCopilotHome()) {
+  const dirs = [path2.join(copilotHome, "agents")];
+  if (cwd) {
+    dirs.push(path2.join(cwd, ".github", "agents"));
+  }
+  return dirs;
+}
+function loadCustomAgents(cwd, copilotHome = resolveCopilotHome()) {
+  const byName = /* @__PURE__ */ new Map();
+  for (const dir of customAgentDirs(cwd, copilotHome)) {
+    let entries;
+    try {
+      entries = fs2.readdirSync(dir);
+    } catch {
+      continue;
+    }
+    for (const entry of entries) {
+      if (!entry.toLowerCase().endsWith(".agent.md")) continue;
+      const full = path2.join(dir, entry);
+      let content;
+      try {
+        content = fs2.readFileSync(full, "utf8");
+      } catch {
+        continue;
+      }
+      const fallbackName = entry.slice(0, -".agent.md".length);
+      const config = toCustomAgentConfig(parseAgentFrontmatter(content), fallbackName);
+      if (config && !byName.has(config.name)) {
+        byName.set(config.name, config);
+      }
+    }
+  }
+  return [...byName.values()];
+}
+
+// electron/terminal/custom-skills.ts
+var fs3 = __toESM(require("fs"));
+var path3 = __toESM(require("path"));
+function skillDirs(cwd, copilotHome = resolveCopilotHome()) {
+  const dirs = [];
+  if (cwd) {
+    dirs.push(path3.join(cwd, ".github", "skills"));
+  }
+  dirs.push(path3.join(copilotHome, "skills"));
+  return dirs;
+}
+function resolveSkillDirectories(cwd, copilotHome = resolveCopilotHome()) {
+  const out = [];
+  for (const dir of skillDirs(cwd, copilotHome)) {
+    try {
+      if (fs3.statSync(dir).isDirectory()) {
+        out.push(dir);
+      }
+    } catch {
+    }
+  }
+  return out;
+}
+
+// electron/terminal/terminal-backend.ts
+var pendingUserInput = /* @__PURE__ */ new Map();
+function makeUserInputHandler(sessionId) {
+  return (_request, ctx) => new Promise((resolve) => {
+    const scope = sessionId || ctx?.sessionId || "";
+    const existing = pendingUserInput.get(scope);
+    if (existing) {
+      console.warn(
+        `[terminal-backend] makeUserInputHandler: replacing an UNRESOLVED pending user-input for session="${scope}" (its promise will never resolve)`
+      );
+    }
+    pendingUserInput.set(scope, { resolve, sessionId: scope });
+  });
+}
+function handlePendingUserInput(sessionId, answer) {
+  const entry = pendingUserInput.get(sessionId);
+  if (!entry) {
+    console.warn(
+      `[terminal-backend] handlePendingUserInput: no pending user-input for session="${sessionId}" (already resolved or unknown) \u2014 no-op`
+    );
+    return false;
+  }
+  pendingUserInput.delete(sessionId);
+  entry.resolve({ answer: answer.answer, wasFreeform: answer.wasFreeform });
+  return true;
+}
+function clearPendingUserInputForSession(sessionId) {
+  return pendingUserInput.delete(sessionId) ? 1 : 0;
+}
+function answerTransport(proc) {
+  return typeof proc.submitPrompt === "function" ? "sdk" : "keystroke";
+}
 function splitPathEntries(pathValue) {
-  return pathValue.split(path2.delimiter).filter(Boolean);
+  return pathValue.split(path4.delimiter).filter(Boolean);
 }
 function normalizeEntry(entry) {
-  return path2.normalize(entry).replace(/[\\\/]+$/, "");
+  return path4.normalize(entry).replace(/[\\\/]+$/, "");
 }
 function getRepoNodeModulesBin(repoRoot) {
-  return normalizeEntry(path2.join(repoRoot, "node_modules", ".bin"));
+  return normalizeEntry(path4.join(repoRoot, "node_modules", ".bin"));
 }
 function isRepoNodeModulesBin(entry, repoRoot) {
   return normalizeEntry(entry).toLowerCase() === getRepoNodeModulesBin(repoRoot).toLowerCase();
 }
 function sanitizeCopilotPath(pathValue, repoRoot) {
   if (!pathValue) return "";
-  return splitPathEntries(pathValue).filter((entry) => !isRepoNodeModulesBin(entry, repoRoot)).join(path2.delimiter);
+  return splitPathEntries(pathValue).filter((entry) => !isRepoNodeModulesBin(entry, repoRoot)).join(path4.delimiter);
 }
 function resolveBundledCopilotCliPath() {
   try {
@@ -9677,9 +9933,9 @@ function resolveCopilotCliPath(repoRoot, pathValue) {
   const sanitizedPath = sanitizeCopilotPath(pathValue, repoRoot);
   const env = { ...process.env, PATH: sanitizedPath };
   try {
-    const command = os2.platform() === "win32" ? "where.exe copilot" : "which -a copilot";
+    const command = os3.platform() === "win32" ? "where.exe copilot" : "which -a copilot";
     const output = (0, import_child_process.execSync)(command, { encoding: "utf8", env, stdio: ["ignore", "pipe", "ignore"] });
-    const candidates = output.split(/\r?\n/).map((line) => line.trim()).filter(Boolean).filter((candidate) => !candidate.toLowerCase().includes(`${path2.sep}node_modules${path2.sep}.bin${path2.sep}copilot`.toLowerCase()));
+    const candidates = output.split(/\r?\n/).map((line) => line.trim()).filter(Boolean).filter((candidate) => !candidate.toLowerCase().includes(`${path4.sep}node_modules${path4.sep}.bin${path4.sep}copilot`.toLowerCase()));
     return candidates[0] || null;
   } catch {
     return null;
@@ -9731,7 +9987,7 @@ var NodePtyProcess = class {
   }
   kill() {
     try {
-      if (os2.platform() === "win32") {
+      if (os3.platform() === "win32") {
         try {
           (0, import_child_process.execSync)(`taskkill /T /F /PID ${this.proc.pid}`, { stdio: "ignore" });
         } catch {
@@ -9986,7 +10242,21 @@ var CopilotSdkBackend = class _CopilotSdkBackend {
     const sharedConfig = {
       streaming: true,
       workingDirectory: options.cwd,
-      onPermissionRequest: this.approveAll ?? (async () => ({ kind: "approved" }))
+      // Inject the user's custom agents (~/.copilot/agents + <cwd>/.github/agents).
+      // SDK-created sessions don't auto-discover them the way the TUI does, so
+      // without this "New Session" loses every custom agent. See ./custom-agents.
+      customAgents: loadCustomAgents(options.cwd),
+      // Inject the user's skills too (~/.copilot/skills + <cwd>/.github/skills).
+      // SDK-created sessions don't auto-discover them (enableConfigDiscovery
+      // defaults to false), so without this the model never loads any skill even
+      // though the hosted TUI's `/` menu still lists them. See ./custom-skills.
+      enableSkills: true,
+      skillDirectories: resolveSkillDirectories(options.cwd),
+      onPermissionRequest: this.approveAll ?? (async () => ({ kind: "approved" })),
+      // spec 015 prerequisite (forStdio path): register the user-input handler so
+      // the model is told `ask_user` is available and Teams/local answers can
+      // resolve the pending interaction late. See makeUserInputHandler.
+      onUserInputRequest: makeUserInputHandler(options.sessionId)
     };
     try {
       return await client.resumeSession(options.sessionId, sharedConfig);
@@ -10081,7 +10351,7 @@ var UiServerHostRuntime = class {
     this.status = "stopped";
     clearTimeout(this.listeningTimeout);
     try {
-      if (os2.platform() === "win32") {
+      if (os3.platform() === "win32") {
         try {
           (0, import_child_process.execSync)(`taskkill /T /F /PID ${this.proc.pid}`, { stdio: "ignore" });
         } catch {
@@ -10120,7 +10390,20 @@ var ControlPlaneClient = class {
     const sharedConfig = {
       streaming: true,
       workingDirectory: cwd,
-      onPermissionRequest
+      // Inject the user's custom agents (~/.copilot/agents + <cwd>/.github/agents)
+      // so SDK-created ("New Session") sessions expose them like the TUI does.
+      customAgents: loadCustomAgents(cwd),
+      // Inject the user's skills too (~/.copilot/skills + <cwd>/.github/skills)
+      // so SDK-created ("New Session") sessions load them like the TUI does.
+      // See ./custom-skills.
+      enableSkills: true,
+      skillDirectories: resolveSkillDirectories(cwd),
+      onPermissionRequest,
+      // spec 015 prerequisite: advertise `ask_user` (requestUserInput: true) and
+      // provide the late-resolvable answer channel. Without this the model refuses
+      // to call ask_user. The relay of the question itself rides the normal event
+      // stream (user_input.requested → server watcherCallback).
+      onUserInputRequest: makeUserInputHandler(sessionId)
     };
     try {
       return await client.resumeSession(sessionId, sharedConfig);
@@ -10320,8 +10603,8 @@ var UiServerBackend = class _UiServerBackend {
   }
 };
 function createSdkCliLaunchConfig(cliPath) {
-  if (os2.platform() === "win32" && /\.(bat|cmd)$/i.test(cliPath)) {
-    const commandProcessor = process.env.ComSpec || path2.join(process.env.WINDIR || "C:\\Windows", "System32", "cmd.exe");
+  if (os3.platform() === "win32" && /\.(bat|cmd)$/i.test(cliPath)) {
+    const commandProcessor = process.env.ComSpec || path4.join(process.env.WINDIR || "C:\\Windows", "System32", "cmd.exe");
     return {
       cliPath: commandProcessor,
       cliArgs: ["/c", cliPath]
@@ -10361,6 +10644,12 @@ function hasActiveViewer(ck, maps) {
 function shouldForwardSharedHostData(ck, foreground) {
   return foreground === void 0 || foreground === ck;
 }
+function foregroundAfterStart(currentForeground, startingCk) {
+  return currentForeground ?? startingCk;
+}
+function shouldReassertForeground(intendedForeground, startingCk) {
+  return intendedForeground !== void 0 && intendedForeground !== startingCk;
+}
 
 // electron/terminal/session-repair.ts
 var crypto = __toESM(require("crypto"));
@@ -10391,12 +10680,12 @@ function repairDuplicateSessionIds(officeId, data, options = {}) {
 
 // electron/terminal/pty-registry.ts
 var crypto2 = __toESM(require("crypto"));
-var fs2 = __toESM(require("fs"));
-var path3 = __toESM(require("path"));
-var DEFAULT_REGISTRY_FILE = path3.join(process.cwd(), ".data", "pty-pids.json");
+var fs4 = __toESM(require("fs"));
+var path5 = __toESM(require("path"));
+var DEFAULT_REGISTRY_FILE = path5.join(process.cwd(), ".data", "pty-pids.json");
 function readPtyRegistry(file = DEFAULT_REGISTRY_FILE) {
   try {
-    const raw = fs2.readFileSync(file, "utf8");
+    const raw = fs4.readFileSync(file, "utf8");
     const parsed = JSON.parse(raw);
     if (!Array.isArray(parsed)) return [];
     return parsed.filter(
@@ -10408,10 +10697,10 @@ function readPtyRegistry(file = DEFAULT_REGISTRY_FILE) {
 }
 function writePtyRegistry(records, file = DEFAULT_REGISTRY_FILE) {
   try {
-    fs2.mkdirSync(path3.dirname(file), { recursive: true });
+    fs4.mkdirSync(path5.dirname(file), { recursive: true });
     const tmp = `${file}.${process.pid}.${crypto2.randomBytes(4).toString("hex")}.tmp`;
-    fs2.writeFileSync(tmp, JSON.stringify(records, null, 2));
-    fs2.renameSync(tmp, file);
+    fs4.writeFileSync(tmp, JSON.stringify(records, null, 2));
+    fs4.renameSync(tmp, file);
   } catch {
   }
 }
@@ -10466,13 +10755,13 @@ function normalizePromptText(s) {
 var MAX_BUFFER_BYTES = 512 * 1024;
 var agentScrollbackBuffers = /* @__PURE__ */ new Map();
 var agentScrollbackBytes = /* @__PURE__ */ new Map();
-var DATA_DIR = path4.join(process.cwd(), ".data");
-var OLD_SESSION_FILE = path4.join(DATA_DIR, "copilot-office-sessions.json");
-var OFFICES_FILE = path4.join(DATA_DIR, "copilot-offices.json");
+var DATA_DIR = path6.join(process.cwd(), ".data");
+var OLD_SESSION_FILE = path6.join(DATA_DIR, "copilot-office-sessions.json");
+var OFFICES_FILE = path6.join(DATA_DIR, "copilot-offices.json");
 var officeSessions = /* @__PURE__ */ new Map();
 var hasAutoTitled = /* @__PURE__ */ new Set();
 function getSessionFile(officeId) {
-  return path4.join(DATA_DIR, `${officeId}.sessions.json`);
+  return path6.join(DATA_DIR, `${officeId}.sessions.json`);
 }
 function getOfficeSession(officeId) {
   let data = officeSessions.get(officeId);
@@ -10513,9 +10802,9 @@ function appendToScrollback(agentId, data) {
 }
 async function loadOfficeSessionFile(officeId) {
   try {
-    await fs3.promises.mkdir(DATA_DIR, { recursive: true });
+    await fs5.promises.mkdir(DATA_DIR, { recursive: true });
     const filePath = getSessionFile(officeId);
-    const raw = await fs3.promises.readFile(filePath, "utf8").catch(() => null);
+    const raw = await fs5.promises.readFile(filePath, "utf8").catch(() => null);
     const data = getOfficeSession(officeId);
     if (raw) {
       const parsed = JSON.parse(raw);
@@ -10545,27 +10834,27 @@ async function loadOfficeSessionFile(officeId) {
 }
 async function saveOfficeSessionFile(officeId) {
   try {
-    await fs3.promises.mkdir(DATA_DIR, { recursive: true });
+    await fs5.promises.mkdir(DATA_DIR, { recursive: true });
     const data = getOfficeSession(officeId);
     const json = {
       current: Object.fromEntries(data.sessionIds),
       history: Object.fromEntries(data.sessionHistory),
       metadata: Object.fromEntries(data.sessionMeta)
     };
-    await fs3.promises.writeFile(getSessionFile(officeId), JSON.stringify(json, null, 2));
+    await fs5.promises.writeFile(getSessionFile(officeId), JSON.stringify(json, null, 2));
   } catch (e) {
     console.error(`[TermServer] Failed to save sessions for ${officeId}:`, e);
   }
 }
 async function createEmptySessionFile(officeId) {
-  await fs3.promises.mkdir(DATA_DIR, { recursive: true });
+  await fs5.promises.mkdir(DATA_DIR, { recursive: true });
   const filePath = getSessionFile(officeId);
   try {
-    await fs3.promises.access(filePath, fs3.constants.F_OK);
+    await fs5.promises.access(filePath, fs5.constants.F_OK);
     await loadOfficeSessionFile(officeId);
   } catch {
     const empty = { current: {}, history: {}, metadata: {} };
-    await fs3.promises.writeFile(filePath, JSON.stringify(empty, null, 2));
+    await fs5.promises.writeFile(filePath, JSON.stringify(empty, null, 2));
     getOfficeSession(officeId);
     console.log(`[TermServer] Created empty session file for ${officeId}: ${filePath}`);
   }
@@ -10585,19 +10874,19 @@ async function migrateGlobalSessionFile() {
   try {
     const migratedMarker = OLD_SESSION_FILE + ".migrated";
     try {
-      await fs3.promises.access(migratedMarker, fs3.constants.F_OK);
+      await fs5.promises.access(migratedMarker, fs5.constants.F_OK);
       return;
     } catch {
     }
     let oldRaw = null;
     try {
-      oldRaw = await fs3.promises.readFile(OLD_SESSION_FILE, "utf8");
+      oldRaw = await fs5.promises.readFile(OLD_SESSION_FILE, "utf8");
     } catch {
       return;
     }
     let firstOfficeId = "office-0";
     try {
-      const officesRaw = await fs3.promises.readFile(OFFICES_FILE, "utf8");
+      const officesRaw = await fs5.promises.readFile(OFFICES_FILE, "utf8");
       const officesData = JSON.parse(officesRaw);
       if (Array.isArray(officesData.offices) && officesData.offices.length > 0) {
         firstOfficeId = officesData.offices[0].id || "office-0";
@@ -10606,22 +10895,22 @@ async function migrateGlobalSessionFile() {
     }
     const firstOfficeFile = getSessionFile(firstOfficeId);
     try {
-      await fs3.promises.access(firstOfficeFile, fs3.constants.F_OK);
+      await fs5.promises.access(firstOfficeFile, fs5.constants.F_OK);
     } catch {
-      await fs3.promises.writeFile(firstOfficeFile, oldRaw);
+      await fs5.promises.writeFile(firstOfficeFile, oldRaw);
       console.log(`[TermServer] Migrated global sessions to ${firstOfficeFile}`);
     }
-    await fs3.promises.rename(OLD_SESSION_FILE, migratedMarker);
+    await fs5.promises.rename(OLD_SESSION_FILE, migratedMarker);
     console.log(`[TermServer] Renamed old session file to ${migratedMarker}`);
   } catch (e) {
     console.error("[TermServer] Migration error:", e);
   }
 }
 async function loadAllOfficeSessions() {
-  await fs3.promises.mkdir(DATA_DIR, { recursive: true });
+  await fs5.promises.mkdir(DATA_DIR, { recursive: true });
   await migrateGlobalSessionFile();
   try {
-    const files = await fs3.promises.readdir(DATA_DIR);
+    const files = await fs5.promises.readdir(DATA_DIR);
     for (const file of files) {
       const match = file.match(/^(.+)\.sessions\.json$/);
       if (match) {
@@ -10746,12 +11035,12 @@ async function startTerminalForAgentImpl(officeId, agentId, workingDir, cols, ro
     }
   }
   const terminalKey = ck;
-  const shell = os3.platform() === "win32" ? "powershell.exe" : "bash";
+  const shell = os4.platform() === "win32" ? "powershell.exe" : "bash";
   let cwd = process.cwd();
   if (workingDir) {
-    const customPath = path4.isAbsolute(workingDir) ? workingDir : path4.join(process.cwd(), workingDir);
+    const customPath = path6.isAbsolute(workingDir) ? workingDir : path6.join(process.cwd(), workingDir);
     try {
-      await fs3.promises.access(customPath, fs3.constants.F_OK);
+      await fs5.promises.access(customPath, fs5.constants.F_OK);
       cwd = customPath;
     } catch {
     }
@@ -10810,7 +11099,7 @@ async function startTerminalForAgentImpl(officeId, agentId, workingDir, cols, ro
     agentToTerminal.set(ck, terminalKey);
     if (activeBackend.name === "ui-server") {
       const intendedCk = officeForegroundCk.get(officeId);
-      if (intendedCk && intendedCk !== ck) {
+      if (shouldReassertForeground(intendedCk, ck)) {
         const fgKey = agentToTerminal.get(intendedCk);
         const fgProc = fgKey ? ptyProcesses.get(fgKey) : null;
         if (fgProc && typeof fgProc.process.setForeground === "function") {
@@ -10874,6 +11163,22 @@ async function startTerminalForAgentImpl(officeId, agentId, workingDir, cols, ro
           const d = event.data;
           console.log(`[TermServer] Forwarding tool_start for ${ck}: ${d.toolName}`);
           send({ type: "copilot-tool-start", agentId, toolName: d.toolName, toolId: d.toolCallId, status: formatToolStatus(d.toolName, d.arguments) });
+          const askRelay = buildAskUserRelay(event, activeBackend.name);
+          if (askRelay) {
+            send({ type: "copilot-ask-user", agentId, toolId: askRelay.toolId, requestId: askRelay.requestId, question: askRelay.question, options: askRelay.options, freeform: askRelay.freeform });
+          }
+        } else if (event.type === "user_input.requested") {
+          const askRelay = buildAskUserRelay(event, activeBackend.name);
+          if (askRelay) {
+            console.log(`[TermServer] Forwarding ask_user (user_input.requested) for ${ck}: requestId=${askRelay.requestId}, ${askRelay.options.length} option(s)`);
+            send({ type: "copilot-tool-start", agentId, toolName: "ask_user", toolId: askRelay.toolId, status: "Waiting for your answer" });
+            send({ type: "copilot-ask-user", agentId, toolId: askRelay.toolId, requestId: askRelay.requestId, question: askRelay.question, options: askRelay.options, freeform: askRelay.freeform });
+          }
+        } else if (event.type === "user_input.completed") {
+          const d = event.data ?? {};
+          const completedRequestId = d.requestId != null ? String(d.requestId) : "";
+          console.log(`[TermServer] Forwarding ask_user complete (user_input.completed) for ${ck}: requestId=${completedRequestId}`);
+          send({ type: "copilot-ask-user-complete", agentId, requestId: completedRequestId });
         } else if (event.type === "tool.execution_complete") {
           const d = event.data;
           console.log(`[TermServer] Forwarding tool_complete for ${ck}: ${d.toolCallId}`);
@@ -10951,8 +11256,8 @@ async function startTerminalForAgentImpl(officeId, agentId, workingDir, cols, ro
       pendingData = "";
     };
     const isSharedHostBackend = activeBackend.name === "ui-server";
-    if (isSharedHostBackend && !officeForegroundCk.has(officeId)) {
-      officeForegroundCk.set(officeId, ck);
+    if (isSharedHostBackend) {
+      officeForegroundCk.set(officeId, foregroundAfterStart(officeForegroundCk.get(officeId), ck));
     }
     proc.onData((data) => {
       if (isSharedHostBackend && !shouldForwardSharedHostData(ck, officeForegroundCk.get(officeId))) {
@@ -10995,6 +11300,10 @@ async function startTerminalForAgentImpl(officeId, agentId, workingDir, cols, ro
         w.stop();
         agentWatchers.delete(ck);
       }
+      const dropped = clearPendingUserInputForSession(sessionId);
+      if (dropped > 0) {
+        console.log(`[TermServer] Cleared ${dropped} pending ask_user interaction(s) for exited session ${sessionId} (${ck})`);
+      }
     });
     if (!shellOnlyMode && activeBackend.name === "node-pty") {
       setTimeout(() => {
@@ -11051,6 +11360,29 @@ async function handleMessage(msg) {
       }
       break;
     }
+    case "submit-answer": {
+      const key = getTerminalKey(msg.officeId, msg.agentId);
+      const proc = key ? ptyProcesses.get(key) : null;
+      if (proc) {
+        agentForwardKeys.add(compositeKey(msg.officeId, msg.agentId));
+        const backendProc = proc.process;
+        if (answerTransport(backendProc) === "sdk") {
+          const resolved = handlePendingUserInput(proc.sessionId, { answer: msg.answer, wasFreeform: msg.wasFreeform });
+          if (!resolved) {
+            console.warn(`[TermServer] submit-answer: no pending user-input for session="${proc.sessionId}" (answerRequestId="${msg.answerRequestId ?? ""}", ${compositeKey(msg.officeId, msg.agentId)}) \u2014 no-op (already resolved or unknown)`);
+          }
+          send({ type: "response", requestId: msg.requestId, result: { success: resolved, error: resolved ? void 0 : "no pending user-input to resolve" } });
+        } else {
+          submitViaKeystrokes(backendProc, msg.answer, key);
+          send({ type: "response", requestId: msg.requestId, result: { success: true } });
+        }
+      } else {
+        const ck = compositeKey(msg.officeId, msg.agentId);
+        console.log(`[TermServer] SUBMIT-ANSWER FAILED \u2014 no PTY for ${ck}`);
+        send({ type: "response", requestId: msg.requestId, result: { success: false, error: `No PTY for ${ck}` } });
+      }
+      break;
+    }
     case "set-agent-forwarding": {
       const ck = compositeKey(msg.officeId, msg.agentId);
       if (msg.enabled) agentForwardKeys.add(ck);
@@ -11181,9 +11513,9 @@ async function handleMessage(msg) {
       const ptyProc = termKey ? ptyProcesses.get(termKey) : null;
       let cwd = process.cwd();
       if (ptyProc?.workingDir) {
-        const customPath = path4.join(process.cwd(), ptyProc.workingDir);
+        const customPath = path6.join(process.cwd(), ptyProc.workingDir);
         try {
-          await fs3.promises.access(customPath, fs3.constants.F_OK);
+          await fs5.promises.access(customPath, fs5.constants.F_OK);
           cwd = customPath;
         } catch {
         }
@@ -11352,7 +11684,7 @@ async function handleMessage(msg) {
     case "delete-office-session": {
       const filePath = getSessionFile(msg.officeId);
       try {
-        await fs3.promises.unlink(filePath);
+        await fs5.promises.unlink(filePath);
         officeSessions.delete(msg.officeId);
         console.log(`[TermServer] Deleted session file for ${msg.officeId}`);
       } catch {