@aliyunrds/ctxdb 1.0.11-beta.0 → 1.0.12-beta.0

package/dist/cli/main.js

@@ -39,7 +39,7 @@ import {
   uploadFile,
   uploadText,
   validateLocalFile
-} from "../chunk-JM7EOAQZ.js";
+} from "../chunk-EX6SM7I3.js";
 import {
   AGENT_CHOICES,
   CtxdbError,
@@ -100,7 +100,7 @@ import {
   withStateLock,
   writeInstalledPkgVersion,
   writeState
-} from "../chunk-HHKQPWYI.js";
+} from "../chunk-HUX2XS5P.js";
 import {
   DISTRIBUTION_MANIFEST
 } from "../chunk-5ITT5GSP.js";
@@ -987,7 +987,8 @@ async function runSetupAll(options = {}, dependencies = {}) {
         agent,
         apiKey,
         login: options.login,
-        // Public setup resets the endpoint by default, including shared logins.
+        site: options.site,
+        // Public setup resolves site assertions and preserves each credential's endpoint.
         baseUrl: options.baseUrl ?? (publicAuth ? void 0 : existing?.baseUrl),
         userId: options.userId ?? existing?.userId,
         persistCredential: options.persistCredential,
@@ -2275,7 +2276,7 @@ async function runUpgrade(options = {}) {
 }
 
 // src/cli/setup-cli.ts
-import { validateDataBaseUrl as validateDataBaseUrl2 } from "@aliyunrds/ctxdb-shared";
+import { validateDataBaseUrl as validateDataBaseUrl2, parsePublicSite, siteBaseUrl } from "@aliyunrds/ctxdb-shared";
 var HELP = `ctxdb setup \u2014 configure an agent
 
 USAGE
@@ -2348,7 +2349,7 @@ async function setup(args) {
       ).replace(
         "  --base-url <url>      Server URL (default: https://api.cn-hangzhou.agentcontext.aliyuncs.com)\n",
         ""
-      ) : HELP.replace("[--api-key=K]", "[--api-key=K | --login=default|ID]").replace("  --api-key <key>       API key (required on first setup)", "  --api-key <key>       Replace this Agent's authentication with an API key\n  --login <default|ID>  Bind an existing login; ordinary setup preserves existing authentication").replace("BEHAVIOR\n", "BEHAVIOR\n  First-time auth binds default's login when available. Explicit unbind or invalid auth is preserved.\n")
+      ) : HELP.replace("[--base-url=URL]", "[--site=cn|intl | --base-url=URL]").replace("  --base-url <url>      Server URL (default: https://api.cn-hangzhou.agentcontext.aliyuncs.com)", "  --site <cn|intl>     Official site; intl selects Singapore\n  --base-url <url>      Custom service URL; omitted URL preserves existing credentials").replace("[--api-key=K]", "[--api-key=K | --login=default|ID]").replace("  --api-key <key>       API key (required on first setup)", "  --api-key <key>       Replace this Agent's authentication with an API key\n  --login <default|ID>  Bind an existing login; ordinary setup preserves existing authentication").replace("BEHAVIOR\n", "BEHAVIOR\n  First-time auth binds default's login when available. Explicit unbind or invalid auth is preserved.\n")
     );
     return 0;
   }
@@ -2376,6 +2377,15 @@ async function setup(args) {
     );
     return 2;
   }
+  let site;
+  try {
+    site = parsePublicSite(args.flags.site);
+    siteBaseUrl(site, args.flags["base-url"]);
+    if (site && DISTRIBUTION_MANIFEST.capabilities.managedCredentials) throw new Error("--site is supported only in the public distribution.");
+  } catch (error) {
+    process.stderr.write(error.message + "\n");
+    return 2;
+  }
   const baseUrl = args.flags["base-url"];
   if (baseUrl !== void 0) {
     try {
@@ -2394,6 +2404,7 @@ async function setup(args) {
     const result2 = await runSetupAll({
       apiKey: explicitApiKey,
       login,
+      site,
       baseUrl,
       userId: typeof args.flags["user-id"] === "string" ? args.flags["user-id"] : void 0,
       persistCredential,
@@ -2428,6 +2439,7 @@ ${highlightInlineCode(hint)}
     agent,
     apiKey: explicitApiKey,
     login,
+    site,
     baseUrl,
     userId: typeof args.flags["user-id"] === "string" ? args.flags["user-id"] : void 0,
     persistCredential,
@@ -6031,9 +6043,9 @@ function publicSetupSpec(managedCredentials) {
     option("--login", "Bind an existing login ID; default selects the default Agent's current login.", {
       valueName: "default|ID"
     }),
-    option("--base-url", "ContextDB DATA API base URL.", {
-      valueName: "url",
-      default: "https://api.cn-hangzhou.agentcontext.aliyuncs.com"
+    option("--site", "Official site: cn (China) or intl (Singapore).", { valueName: "cn|intl", choices: ["cn", "intl"] }),
+    option("--base-url", "Custom DATA URL; omitted URL preserves the saved endpoint.", {
+      valueName: "url"
     })
   ];
   return leaf(
@@ -6042,7 +6054,7 @@ function publicSetupSpec(managedCredentials) {
     setup,
     details({
       usage: [
-        `ctxdb setup [--agent <${SUPPORTED_AGENT_CHOICES}> | --all]${managedCredentials ? "" : " [--api-key=<key> | --login=<default|ID>] [--base-url=<url>]"} [--user-id=<id>] [--no-install-skill] [--no-validate] [--json]`
+        `ctxdb setup [--agent <${SUPPORTED_AGENT_CHOICES}> | --all]${managedCredentials ? "" : " [--api-key=<key> | --login=<default|ID>] [--site=<cn|intl> | --base-url=<url>]"} [--user-id=<id>] [--no-install-skill] [--no-validate] [--json]`
       ],
       options: [
         option("--agent", "Configure exactly one built-in Agent; omit for the CLI-only default profile.", {
@@ -6069,6 +6081,7 @@ function publicSetupSpec(managedCredentials) {
         "--agent and --all are mutually exclusive.",
         ...!managedCredentials ? [
           "--api-key and --login are mutually exclusive.",
+          "--site and --base-url are mutually exclusive. Switching sites requires login or a new API key.",
           "Unset CTXDB_ACCESS_TOKEN and CTXDB_API_KEY before explicitly switching persisted authentication."
         ] : []
       ],
@@ -7374,13 +7387,15 @@ import {
   rejectAuthEnvironment,
   releaseLogin,
   collectUnusedLogins,
-  validateDataBaseUrl as validateDataBaseUrl3
+  validateDataBaseUrl as validateDataBaseUrl3,
+  parsePublicSite as parsePublicSite2,
+  siteBaseUrl as siteBaseUrl2,
+  PUBLIC_SITES as PUBLIC_SITES2
 } from "@aliyunrds/ctxdb-shared";
 
 // src/lib/oauth-login-config.ts
 import { existsSync as existsSync7, readFileSync as readFileSync3 } from "node:fs";
-import { isOfficialProductionUrl, normalizeCoreOrigin } from "@aliyunrds/ctxdb-shared";
-var PRODUCTION_AUTHORIZATION_URL = "https://rdsnext.console.aliyun.com/contextDbCliAuthorization/cn-hangzhou";
+import { PUBLIC_SITES, publicSiteForUrl, normalizeCoreOrigin } from "@aliyunrds/ctxdb-shared";
 function authorizationPage(value2) {
   if (typeof value2 !== "string" || !value2.trim()) throw new Error();
   const url = new URL(value2);
@@ -7395,7 +7410,8 @@ function consoleAuthorizationBase(path, core, loginUrl) {
       throw new Error("--login-url requires an HTTPS page URL without credentials, query parameters or fragment. No authorization request was created.");
     }
   }
-  const fallback = isOfficialProductionUrl(core) ? PRODUCTION_AUTHORIZATION_URL : void 0;
+  const site = publicSiteForUrl(core);
+  const fallback = site ? PUBLIC_SITES[site].authorizationUrl : void 0;
   if (!existsSync7(path)) return fallback;
   try {
     const raw = JSON.parse(readFileSync3(path, "utf8"));
@@ -7439,7 +7455,7 @@ function openBrowser(url) {
 }
 
 // src/cli/device-auth-cli.ts
-var usage = "ctxdb login [--agent <name> | --login <default|ID>] [--base-url <core-origin> | --server <core-origin>] [--login-url <console-page>] [--yes] [--device-code] [--no-browser] [--json]\n";
+var usage = "ctxdb login [--agent <name> | --login <default|ID>] [--site <cn|intl> | --base-url <core-origin> | --server <core-origin>] [--login-url <console-page>] [--yes] [--device-code] [--no-browser] [--json]\n";
 function createPublicAuthCommands(dependencies = {}) {
   const env = () => dependencies.env ?? process.env;
   const stdout = dependencies.stdout ?? ((s) => {
@@ -7452,7 +7468,7 @@ function createPublicAuthCommands(dependencies = {}) {
   const launchBrowser = dependencies.openBrowser ?? openBrowser;
   const output = (value2, json) => stdout(json ? JSON.stringify(value2) + "\n" : String(value2) + "\n");
   function options(args, command) {
-    const allowed = ["agent", "json", "help", "h", ...command === "login" ? ["base-url", "login-url", "server", "device-code", "no-browser", "login", "yes"] : command === "logout" ? ["login", "yes"] : command === "status" ? ["all"] : []];
+    const allowed = ["agent", "json", "help", "h", ...command === "login" ? ["site", "base-url", "login-url", "server", "device-code", "no-browser", "login", "yes"] : command === "logout" ? ["login", "yes"] : command === "status" ? ["all"] : []];
     if (args.positional.length || Object.keys(args.flags).some((k) => !allowed.includes(k))) throw new Error("Unsupported authentication option.");
     for (const flag of ["json", "help", "h", "device-code", "no-browser", "yes", "all"]) {
       if (args.flags[flag] !== void 0 && args.flags[flag] !== true) throw new Error("Invalid boolean authentication option.");
@@ -7493,10 +7509,13 @@ function createPublicAuthCommands(dependencies = {}) {
       if (args.flags["base-url"] !== void 0 && args.flags.server !== void 0) throw new Error("Use --base-url or its legacy alias --server, not both.");
       const explicitBase = args.flags["base-url"] ?? args.flags.server;
       if (explicitBase !== void 0) validateDataBaseUrl3(explicitBase, true);
+      const site = parsePublicSite2(args.flags.site);
+      const presetBase = siteBaseUrl2(site, explicitBase);
+      if (site && args.flags["login-url"] !== void 0) throw new Error("--site and --login-url are mutually exclusive.");
       const pending = beginLogin(path, agent, name);
       await confirmImpact(name ? pending.users[0] ?? agent : agent, pending.users, args, "Reauthorizing this login");
-      const baseUrl = normalizeCoreOrigin2(explicitBase ?? DEFAULT_BASE_URL);
-      const consoleBase = consoleAuthorizationBase(join6(dirname2(path), "device-environments.json"), baseUrl, args.flags["login-url"]);
+      const baseUrl = normalizeCoreOrigin2(presetBase ?? explicitBase ?? pending.previous?.baseUrl ?? load({ path, agent, env: {} }).baseUrl ?? DEFAULT_BASE_URL);
+      const consoleBase = site ? PUBLIC_SITES2[site].authorizationUrl : consoleAuthorizationBase(join6(dirname2(path), "device-environments.json"), baseUrl, args.flags["login-url"]);
       const connection = client(baseUrl), controller = new AbortController();
       let browserOpening = Promise.resolve();
       const interrupt = () => controller.abort();
@@ -7720,10 +7739,11 @@ var ENVIRONMENT_CONSTRAINT = "Unset CTXDB_ACCESS_TOKEN and CTXDB_API_KEY before
 function publicCommands() {
   return [
     leaf("login", "Authorize a public Device Flow login and configure the selected Agent.", deviceLogin, details({
-      usage: ["ctxdb login [--agent=<name> | --login=<default|ID>] [--base-url=<core-origin> | --server=<core-origin>] [--login-url=<console-page>] [--device-code] [--no-browser] [--yes] [--json]"],
+      usage: ["ctxdb login [--agent=<name> | --login=<default|ID>] [--site=<cn|intl> | --base-url=<core-origin> | --server=<core-origin>] [--login-url=<console-page>] [--device-code] [--no-browser] [--yes] [--json]"],
       options: [
         AGENT_OPTION2,
         LOGIN_OPTION,
+        option("--site", "Official site: cn (China) or intl (Singapore).", { valueName: "cn|intl", choices: ["cn", "intl"] }),
         option("--base-url", "Core service origin for Device Flow and DATA requests.", { valueName: "core-origin" }),
         option("--server", "Legacy alias for --base-url; do not combine them.", { valueName: "core-origin" }),
         option("--login-url", "HTTPS console authorization page; CLI appends the current user_code.", { valueName: "console-page" }),
@@ -7732,8 +7752,9 @@ function publicCommands() {
         YES_OPTION,
         JSON_OPTION2
       ],
-      constraints: ["--agent and --login are mutually exclusive.", "--base-url and --server are mutually exclusive.", ENVIRONMENT_CONSTRAINT],
+      constraints: ["--agent and --login are mutually exclusive.", "--base-url and --server are mutually exclusive.", "--site cannot be combined with --base-url, --server or --login-url.", ENVIRONMENT_CONSTRAINT],
       notes: [
+        "With no site or URL override, reauthorization keeps the saved endpoint; a fresh installation defaults to cn.",
         "Default login creates or updates the default shared login; login for another Agent creates an independent login.",
         "--login reauthorizes the selected existing login while retaining its stable local ID.",
         "Device scope is fixed to default. A non-default Agent login also installs hooks/skills and validates connectivity; no separate setup command is needed.",
@@ -7747,6 +7768,7 @@ function publicCommands() {
       examples: [
         { command: "ctxdb login" },
         { command: "ctxdb login --agent=codex --json" },
+        { command: "ctxdb login --agent=codex --site=intl" },
         { command: "ctxdb login --login=default --yes --json" },
         { command: "ctxdb login --base-url=https://core.example.com --login-url=https://console.example.com/contextDbCliAuthorization/cn-hangzhou" }
       ]

package/dist/hooks/hermes-post-llm-call.js

@@ -1,12 +1,9 @@
 #!/usr/bin/env node
 import {
   captureParsedMessages
-} from "../chunk-EWCB3UQS.js";
-import "../chunk-7RMETV4M.js";
-import {
-  shouldSkipHooks
-} from "../chunk-5ML4VSXN.js";
+} from "../chunk-4GYXLFNU.js";
 import "../chunk-SR3M7AL5.js";
+import "../chunk-7CZIQG6Z.js";
 import {
   HttpClient,
   agentFromArgvWithFallback,
@@ -16,12 +13,16 @@ import {
   sessionBinding,
   setDebug,
   skillStopRows
-} from "../chunk-HHKQPWYI.js";
+} from "../chunk-HUX2XS5P.js";
 import "../chunk-5ITT5GSP.js";
+import {
+  shouldSkipHooks
+} from "../chunk-5ML4VSXN.js";
 import "../chunk-PI2SUS3M.js";
 
 // src/hooks/hermes-post-llm-call.ts
 import { pathToFileURL } from "node:url";
+import { selectCaptureTurn, captureText, captureToolCalls, captureCompletionReason } from "@aliyunrds/ctxdb-shared";
 function asRecord(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : {};
 }
@@ -31,38 +32,15 @@ function firstString(...values) {
   }
   return "";
 }
-function textContent(content) {
-  if (typeof content === "string") return content.trim();
-  if (!Array.isArray(content)) return "";
-  const chunks = [];
-  for (const rawBlock of content) {
-    if (typeof rawBlock === "string") {
-      if (rawBlock.trim()) chunks.push(rawBlock.trim());
-      continue;
-    }
-    const block = asRecord(rawBlock);
-    const text = firstString(block.text, block.content);
-    if (text.trim()) chunks.push(text.trim());
-  }
-  return chunks.join("\n").trim();
-}
 function currentTurnHistory(history) {
-  const records = history.map(asRecord);
-  let start = -1;
-  for (let i = records.length - 1; i >= 0; i--) {
-    if (records[i].role === "user") {
-      start = i;
-      break;
-    }
-  }
-  return start >= 0 ? records.slice(start) : records;
+  return selectCaptureTurn(history).map(asRecord);
 }
 function parsedHistoryMessages(history) {
   const messages = [];
   for (const item of history) {
     const role = item.role;
     if (role !== "user" && role !== "assistant") continue;
-    const content = textContent(item.content);
+    const content = captureText(item).trim();
     if (!content) continue;
     messages.push({
       role,
@@ -147,7 +125,15 @@ function extractHermesPostLlmCall(event) {
   return {
     sessionId,
     messages: userMessage && assistantResponse ? explicitMessages : historyMessages.length > 0 ? historyMessages : explicitMessages,
-    kbDetectionMessages: toHermesKbDetectionMessages(turnHistory)
+    kbDetectionMessages: toHermesKbDetectionMessages(turnHistory),
+    toolCalls: captureToolCalls(turnHistory),
+    completionReason: userMessage && historyMessages.find((m) => m.role === "user")?.content !== userMessage ? "turn_unverified" : captureCompletionReason(turnHistory, {
+      // post_llm_call may fire for tool-producing intermediate calls. Require
+      // the host's final answer to match the final history message as well.
+      lastAssistantMessage: assistantResponse || void 0,
+      turnId: firstString(extra.turn_id, event.turn_id) || void 0,
+      sessionId
+    })
   };
 }
 async function readStdinJson() {
@@ -213,7 +199,7 @@ async function main() {
       client,
       agent,
       input.sessionId,
-      { kbDetectionMessages: input.kbDetectionMessages }
+      { kbDetectionMessages: input.kbDetectionMessages, toolCalls: input.toolCalls, completionReason: input.completionReason }
     );
     if (result.captured) {
       debug("hermes.post_llm_call", `ok (${result.messageCount} msgs)`, result);

package/dist/hooks/hermes-pre-llm-call.js

@@ -2,20 +2,17 @@
 import {
   HOOK_TIMEOUT_MS,
   composeSessionStart
-} from "../chunk-WCVCSOFL.js";
+} from "../chunk-CGA7EITY.js";
 import {
   composeUserPromptSubmit
-} from "../chunk-6XK3RDZ6.js";
+} from "../chunk-BRCQTX2M.js";
 import {
   fetchKbCatalogBlock
-} from "../chunk-XEX5344F.js";
+} from "../chunk-C66FQHNI.js";
+import "../chunk-EX6SM7I3.js";
 import {
   isCircuitOpen
-} from "../chunk-7RMETV4M.js";
-import {
-  shouldSkipHooks
-} from "../chunk-5ML4VSXN.js";
-import "../chunk-JM7EOAQZ.js";
+} from "../chunk-7CZIQG6Z.js";
 import {
   HttpClient,
   agentFromArgvWithFallback,
@@ -28,8 +25,11 @@ import {
   skillDeferredFeedback,
   skillPromptContext,
   skillSessionStart
-} from "../chunk-HHKQPWYI.js";
+} from "../chunk-HUX2XS5P.js";
 import "../chunk-5ITT5GSP.js";
+import {
+  shouldSkipHooks
+} from "../chunk-5ML4VSXN.js";
 import "../chunk-PI2SUS3M.js";
 
 // src/hooks/hermes-pre-llm-call.ts

package/dist/hooks/session-end.js

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
-import {
-  shouldSkipHooks
-} from "../chunk-5ML4VSXN.js";
 import {
   agentFromArgvWithFallback,
   receiveEnd,
   sessionBinding
-} from "../chunk-HHKQPWYI.js";
+} from "../chunk-HUX2XS5P.js";
 import "../chunk-5ITT5GSP.js";
+import {
+  shouldSkipHooks
+} from "../chunk-5ML4VSXN.js";
 import "../chunk-PI2SUS3M.js";
 
 // src/hooks/session-end.ts

package/dist/hooks/session-start.js

@@ -3,15 +3,12 @@ import {
   HOOK_TIMEOUT_MS,
   composeSessionStart,
   formatSessionStartStdout
-} from "../chunk-WCVCSOFL.js";
-import "../chunk-XEX5344F.js";
+} from "../chunk-CGA7EITY.js";
+import "../chunk-C66FQHNI.js";
+import "../chunk-EX6SM7I3.js";
 import {
   isCircuitOpen
-} from "../chunk-7RMETV4M.js";
-import {
-  shouldSkipHooks
-} from "../chunk-5ML4VSXN.js";
-import "../chunk-JM7EOAQZ.js";
+} from "../chunk-7CZIQG6Z.js";
 import {
   HttpClient,
   agentFromArgvWithFallback,
@@ -20,8 +17,11 @@ import {
   resolveDataApiCredential,
   setDebug,
   skillSessionStart
-} from "../chunk-HHKQPWYI.js";
+} from "../chunk-HUX2XS5P.js";
 import "../chunk-5ITT5GSP.js";
+import {
+  shouldSkipHooks
+} from "../chunk-5ML4VSXN.js";
 import "../chunk-PI2SUS3M.js";
 
 // src/hooks/session-start.ts

package/dist/hooks/stop.js

@@ -1,12 +1,9 @@
 #!/usr/bin/env node
 import {
   captureTurn
-} from "../chunk-EWCB3UQS.js";
-import "../chunk-7RMETV4M.js";
-import {
-  shouldSkipHooks
-} from "../chunk-5ML4VSXN.js";
+} from "../chunk-4GYXLFNU.js";
 import "../chunk-SR3M7AL5.js";
+import "../chunk-7CZIQG6Z.js";
 import {
   HttpClient,
   agentFromArgvWithFallback,
@@ -16,8 +13,11 @@ import {
   sessionBinding,
   setDebug,
   skillStop
-} from "../chunk-HHKQPWYI.js";
+} from "../chunk-HUX2XS5P.js";
 import "../chunk-5ITT5GSP.js";
+import {
+  shouldSkipHooks
+} from "../chunk-5ML4VSXN.js";
 import "../chunk-PI2SUS3M.js";
 
 // src/hooks/stop.ts
@@ -67,7 +67,12 @@ async function main() {
       return 0;
     }
     const client = new HttpClient({ baseUrl: cfg.baseUrl, credential, timeoutMs: 5e3 });
-    const result = await captureTurn(transcriptPath, cfg, client, agent, sessionId);
+    if (event.stop_hook_active === true || event.isSidechain === true || event.is_subagent === true) return 0;
+    const result = await captureTurn(transcriptPath, cfg, client, agent, sessionId, {
+      sessionId,
+      turnId: typeof event.turn_id === "string" ? event.turn_id : void 0,
+      lastAssistantMessage: typeof event.last_assistant_message === "string" ? event.last_assistant_message : void 0
+    });
     if (result.captured) {
       debug("capture", `ok (${result.messageCount} msgs)`, result);
       process.stderr.write(

package/dist/hooks/user-prompt-submit.js

@@ -2,15 +2,12 @@
 import {
   composeUserPromptSubmit,
   formatUserPromptSubmitStdout
-} from "../chunk-6XK3RDZ6.js";
-import "../chunk-XEX5344F.js";
+} from "../chunk-BRCQTX2M.js";
+import "../chunk-C66FQHNI.js";
+import "../chunk-EX6SM7I3.js";
 import {
   isCircuitOpen
-} from "../chunk-7RMETV4M.js";
-import {
-  shouldSkipHooks
-} from "../chunk-5ML4VSXN.js";
-import "../chunk-JM7EOAQZ.js";
+} from "../chunk-7CZIQG6Z.js";
 import {
   HttpClient,
   agentFromArgvWithFallback,
@@ -19,8 +16,11 @@ import {
   resolveDataApiCredential,
   setDebug,
   skillPromptContext
-} from "../chunk-HHKQPWYI.js";
+} from "../chunk-HUX2XS5P.js";
 import "../chunk-5ITT5GSP.js";
+import {
+  shouldSkipHooks
+} from "../chunk-5ML4VSXN.js";
 import "../chunk-PI2SUS3M.js";
 
 // src/hooks/user-prompt-submit.ts