@openacp/cli 2026.406.5 → 2026.407.1

package/dist/cli.js

@@ -362,7 +362,7 @@ async function runUpdate() {
   });
 }
 async function checkAndPromptUpdate() {
-  if (process.env.OPENACP_DEV_LOOP || process.env.OPENACP_SKIP_UPDATE_CHECK) return;
+  if (process.env.OPENACP_DEV_LOOP || process.env.OPENACP_SKIP_UPDATE_CHECK || !process.stdin.isTTY) return;
   const current = getCurrentVersion();
   if (current === "0.0.0-dev") return;
   const latest = await getLatestVersion();
@@ -7555,7 +7555,9 @@ var init_config_registry = __esm({
         displayName: "Default Agent",
         group: "agent",
         type: "select",
-        options: () => {
+        options: (config) => {
+          const configAgents = Object.keys(config.agents ?? {});
+          if (configAgents.length > 0) return configAgents;
           try {
             const agentsPath = path24.join(getGlobalRoot(), "agents.json");
             if (fs19.existsSync(agentsPath)) {
@@ -8335,6 +8337,7 @@ var sessions_exports = {};
 __export(sessions_exports, {
   sessionRoutes: () => sessionRoutes
 });
+import { nanoid as nanoid2 } from "nanoid";
 async function sessionRoutes(app, deps) {
   app.get("/", { preHandler: requireScopes("sessions:read") }, async () => {
     const summaries = deps.core.sessionManager.listAllSessions();
@@ -8493,14 +8496,26 @@ async function sessionRoutes(app, deps) {
         }
         attachments = await resolveAttachments(fileService, sessionId, body.attachments);
       }
+      const sourceAdapterId = body.sourceAdapterId ?? "api";
+      const turnId = nanoid2(8);
+      deps.core.eventBus.emit(BusEvent.MESSAGE_QUEUED, {
+        sessionId,
+        turnId,
+        text: body.prompt,
+        sourceAdapterId,
+        attachments,
+        timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+        queueDepth: session.queueDepth
+      });
       await session.enqueuePrompt(body.prompt, attachments, {
-        sourceAdapterId: body.sourceAdapterId ?? "api",
+        sourceAdapterId,
         responseAdapterId: body.responseAdapterId
-      });
+      }, turnId);
       return {
         ok: true,
         sessionId,
-        queueDepth: session.queueDepth
+        queueDepth: session.queueDepth,
+        turnId
       };
     }
   );
@@ -8763,6 +8778,7 @@ var init_sessions2 = __esm({
     init_error_handler();
     init_auth();
     init_attachment_utils();
+    init_events();
     init_sessions();
   }
 });
@@ -11877,6 +11893,50 @@ async function createSessionDirect(ctx, core, chatId, agentName, workspace, onCo
     return null;
   }
 }
+function _pruneExpiredForceReplies() {
+  const cutoff = Date.now() - 10 * 60 * 1e3;
+  for (const [msgId, entry] of _forceReplyMap) {
+    if (entry.createdAt < cutoff) _forceReplyMap.delete(msgId);
+  }
+}
+async function _sendCustomPathPrompt(ctx, chatId, agentKey) {
+  const threadId = ctx.message?.message_thread_id ?? ctx.callbackQuery?.message?.message_thread_id;
+  const sent = await ctx.api.sendMessage(
+    chatId,
+    `Please type the workspace path.
+
+Examples:
+\u2022 <code>/absolute/path/to/project</code>
+\u2022 <code>~/my-project</code>
+\u2022 <code>project-name</code> (created under your base directory)
+
+Reply to this message with your path.`,
+    {
+      parse_mode: "HTML",
+      reply_markup: { force_reply: true },
+      ...threadId !== void 0 ? { message_thread_id: threadId } : {}
+    }
+  );
+  _forceReplyMap.set(sent.message_id, { agentKey, chatId, createdAt: Date.now() });
+}
+async function _handleCustomPathReply(ctx, core, chatId, entry) {
+  const input2 = (ctx.message.text ?? "").trim();
+  let resolvedPath;
+  try {
+    resolvedPath = core.configManager.resolveWorkspace(input2);
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    await ctx.reply(`\u274C ${escapeHtml4(message)}
+
+Please try again:`, {
+      parse_mode: "HTML"
+    }).catch(() => {
+    });
+    await _sendCustomPathPrompt(ctx, chatId, entry.agentKey);
+    return;
+  }
+  await createSessionDirect(ctx, core, chatId, entry.agentKey, resolvedPath);
+}
 function cacheWorkspace(agentKey, workspace) {
   const now = Date.now();
   for (const [id2, entry] of workspaceCache) {
@@ -11957,7 +12017,16 @@ Select workspace:`;
     }
   }
 }
-function setupNewSessionCallbacks(bot, core, chatId, getAssistantSession) {
+function setupNewSessionCallbacks(bot, core, chatId) {
+  bot.on("message:text", async (ctx, next) => {
+    _pruneExpiredForceReplies();
+    const replyToId = ctx.message.reply_to_message?.message_id;
+    if (replyToId === void 0) return next();
+    const entry = _forceReplyMap.get(replyToId);
+    if (!entry || entry.chatId !== ctx.message.chat.id) return next();
+    _forceReplyMap.delete(replyToId);
+    await _handleCustomPathReply(ctx, core, chatId, entry);
+  });
   bot.callbackQuery("ns:start", async (ctx) => {
     try {
       await ctx.answerCallbackQuery();
@@ -12034,33 +12103,20 @@ Try again with /new or /menu`,
       await ctx.answerCallbackQuery();
     } catch {
     }
-    const assistant = getAssistantSession?.();
-    if (assistant) {
-      try {
-        await ctx.editMessageText(
-          `<b>\u{1F195} New Session</b>
+    try {
+      await ctx.editMessageText(
+        `<b>\u{1F195} New Session</b>
 Agent: <code>${escapeHtml4(agentKey)}</code>
 
-\u{1F4AC} Type your workspace path in the chat below.`,
-          { parse_mode: "HTML" }
-        );
-      } catch {
-      }
-      await assistant.enqueuePrompt(
-        `User wants to create a new session with agent "${agentKey}". Ask them for the workspace (project directory) path, then create the session.`
+\u2328\uFE0F Waiting for workspace path...`,
+        { parse_mode: "HTML" }
       );
-    } else {
-      try {
-        await ctx.editMessageText(
-          `Usage: <code>/new ${escapeHtml4(agentKey)} &lt;workspace-path&gt;</code>`,
-          { parse_mode: "HTML" }
-        );
-      } catch {
-      }
+    } catch {
     }
+    await _sendCustomPathPrompt(ctx, chatId, agentKey);
   });
 }
-var log18, WS_CACHE_MAX, workspaceCache, nextWsId;
+var log18, WS_CACHE_MAX, workspaceCache, nextWsId, _forceReplyMap;
 var init_new_session = __esm({
   "src/plugins/telegram/commands/new-session.ts"() {
     "use strict";
@@ -12072,6 +12128,7 @@ var init_new_session = __esm({
     WS_CACHE_MAX = 50;
     workspaceCache = /* @__PURE__ */ new Map();
     nextWsId = 0;
+    _forceReplyMap = /* @__PURE__ */ new Map();
   }
 });
 
@@ -14666,7 +14723,7 @@ function setupAllCallbacks(bot, core, chatId, systemTopicIds, getAssistantSessio
       core.configManager.get().workspace.baseDir
     );
   });
-  setupNewSessionCallbacks(bot, core, chatId, getAssistantSession);
+  setupNewSessionCallbacks(bot, core, chatId);
   bot.callbackQuery(/^ar:/, (ctx) => handleArchiveConfirm(ctx, core, chatId));
   bot.callbackQuery(/^m:/, async (ctx) => {
     const itemId = ctx.callbackQuery.data.replace("m:", "");
@@ -14823,7 +14880,7 @@ var init_commands3 = __esm({
 
 // src/plugins/telegram/permissions.ts
 import { InlineKeyboard as InlineKeyboard11 } from "grammy";
-import { nanoid as nanoid2 } from "nanoid";
+import { nanoid as nanoid3 } from "nanoid";
 var log26, PermissionHandler;
 var init_permissions = __esm({
   "src/plugins/telegram/permissions.ts"() {
@@ -14842,7 +14899,7 @@ var init_permissions = __esm({
       pending = /* @__PURE__ */ new Map();
       async sendPermissionRequest(session, request) {
         const threadId = Number(session.threadId);
-        const callbackKey = nanoid2(8);
+        const callbackKey = nanoid3(8);
         this.pending.set(callbackKey, {
           sessionId: session.id,
           requestId: request.id,
@@ -20044,10 +20101,10 @@ var init_permission_gate = __esm({
 });
 
 // src/core/sessions/turn-context.ts
-import { nanoid as nanoid3 } from "nanoid";
+import { nanoid as nanoid4 } from "nanoid";
 function createTurnContext(sourceAdapterId, responseAdapterId, turnId) {
   return {
-    turnId: turnId ?? nanoid3(8),
+    turnId: turnId ?? nanoid4(8),
     sourceAdapterId,
     responseAdapterId
   };
@@ -20075,7 +20132,7 @@ var init_turn_context = __esm({
 });
 
 // src/core/sessions/session.ts
-import { nanoid as nanoid4 } from "nanoid";
+import { nanoid as nanoid5 } from "nanoid";
 import * as fs41 from "fs";
 var moduleLog, TTS_PROMPT_INSTRUCTION, TTS_BLOCK_REGEX, TTS_MAX_LENGTH, TTS_TIMEOUT_MS, VALID_TRANSITIONS, Session;
 var init_session2 = __esm({
@@ -20153,7 +20210,7 @@ Additionally, include a [TTS]...[/TTS] block with a spoken-friendly summary of y
       pendingContext = null;
       constructor(opts) {
         super();
-        this.id = opts.id || nanoid4(12);
+        this.id = opts.id || nanoid5(12);
         this.channelId = opts.channelId;
         this.attachedAdapters = [opts.channelId];
         this.agentName = opts.agentName;
@@ -20255,7 +20312,7 @@ Additionally, include a [TTS]...[/TTS] block with a spoken-friendly summary of y
       }
       // --- Public API ---
       async enqueuePrompt(text6, attachments, routing, externalTurnId) {
-        const turnId = externalTurnId ?? nanoid4(8);
+        const turnId = externalTurnId ?? nanoid5(8);
         if (this.middlewareChain) {
           const payload = { text: text6, attachments, sessionId: this.id, sourceAdapterId: routing?.sourceAdapterId };
           const result = await this.middlewareChain.execute(Hook.AGENT_BEFORE_PROMPT, payload, async (p2) => p2);
@@ -20984,7 +21041,7 @@ var init_session_bridge = __esm({
           this.deps.sessionManager.patchRecord(this.session.id, { currentPromptCount: count });
         });
         this.listen(this.session, SessionEv.TURN_STARTED, (ctx) => {
-          if (ctx.sourceAdapterId !== "sse" && ctx.sourceAdapterId !== "api") {
+          if (ctx.sourceAdapterId !== "sse") {
             this.deps.eventBus?.emit(BusEvent.MESSAGE_PROCESSING, {
               sessionId: this.session.id,
               turnId: ctx.turnId,
@@ -24074,7 +24131,7 @@ var init_core_items = __esm({
 // src/core/core.ts
 import path51 from "path";
 import os23 from "os";
-import { nanoid as nanoid5 } from "nanoid";
+import { nanoid as nanoid6 } from "nanoid";
 var log42, OpenACPCore;
 var init_core = __esm({
   "src/core/core.ts"() {
@@ -24389,7 +24446,7 @@ ${text6}`;
         const sourceAdapterId = message.routing?.sourceAdapterId ?? message.channelId;
         const routing = sourceAdapterId !== message.routing?.sourceAdapterId ? { ...message.routing, sourceAdapterId } : message.routing;
         if (sourceAdapterId && sourceAdapterId !== "sse" && sourceAdapterId !== "api") {
-          const turnId = nanoid5(8);
+          const turnId = nanoid6(8);
           this.eventBus.emit(BusEvent.MESSAGE_QUEUED, {
             sessionId: session.id,
             turnId,
@@ -30668,13 +30725,18 @@ async function buildInstanceListEntries() {
     };
   });
 }
-async function cmdInstances(args2 = []) {
+async function cmdInstances(args2 = [], parentFlags) {
   if (wantsHelp(args2)) {
     printInstancesHelp();
     return;
   }
   const sub = args2[0];
   const subArgs = args2.slice(1);
+  if (parentFlags) {
+    if (parentFlags.dir && !subArgs.includes("--dir")) subArgs.push("--dir", parentFlags.dir);
+    if (parentFlags.from && !subArgs.includes("--from")) subArgs.push("--from", parentFlags.from);
+    if (parentFlags.name && !subArgs.includes("--name")) subArgs.push("--name", parentFlags.name);
+  }
   if (!sub || sub === "list") return cmdInstancesList(subArgs);
   if (sub === "create") return cmdInstancesCreate(subArgs);
   console.error(`Unknown subcommand: instances ${sub}`);
@@ -30774,19 +30836,33 @@ async function cmdInstancesCreate(args2) {
     try {
       const config = JSON.parse(fs53.readFileSync(configPath, "utf-8"));
       config.instanceName = name;
+      if (!config.workspace) config.workspace = {};
+      config.workspace.baseDir = resolvedDir;
       fs53.writeFileSync(configPath, JSON.stringify(config, null, 2));
     } catch {
     }
   } else if (noInteractive || !process.stdin.isTTY) {
     fs53.mkdirSync(instanceRoot, { recursive: true });
-    const config = { instanceName: name, runMode: "daemon" };
-    if (agent) config.defaultAgent = agent;
+    const config = {
+      channels: { sse: { enabled: true } },
+      defaultAgent: agent || "claude",
+      workspace: { baseDir: resolvedDir },
+      runMode: "daemon",
+      autoStart: false,
+      instanceName: name
+    };
     fs53.writeFileSync(path62.join(instanceRoot, "config.json"), JSON.stringify(config, null, 2));
     fs53.writeFileSync(path62.join(instanceRoot, "plugins.json"), JSON.stringify({ version: 1, installed: {} }, null, 2));
   } else {
     fs53.mkdirSync(instanceRoot, { recursive: true });
-    const config = { instanceName: name, runMode: "daemon" };
-    if (agent) config.defaultAgent = agent;
+    const config = {
+      channels: { sse: { enabled: true } },
+      defaultAgent: agent || "claude",
+      workspace: { baseDir: resolvedDir },
+      runMode: "daemon",
+      autoStart: false,
+      instanceName: name
+    };
     fs53.writeFileSync(path62.join(instanceRoot, "config.json"), JSON.stringify(config, null, 2));
     fs53.writeFileSync(path62.join(instanceRoot, "plugins.json"), JSON.stringify({ version: 1, installed: {} }, null, 2));
     console.log(`Instance created at ${resolvedDir}. Run 'openacp setup' inside that directory to configure it.`);
@@ -32193,7 +32269,7 @@ var noInstanceCommands = {
   "-v": () => cmdVersion(args),
   "update": () => cmdUpdate(args),
   "adopt": () => cmdAdopt(args),
-  "instances": async () => cmdInstances(args),
+  "instances": async () => cmdInstances(args, flags),
   "integrate": () => cmdIntegrate(args),
   "dev": () => cmdDev(args)
 };