@kweaver-ai/kweaver-sdk 0.4.2 → 0.4.5

package/dist/commands/agent-chat.js

@@ -1,5 +1,6 @@
 import { ensureValidToken, formatHttpError } from "../auth/oauth.js";
 import { fetchAgentInfo, sendChatRequest } from "../api/agent-chat.js";
+import { resolveBusinessDomain } from "../config/store.js";
 function formatCliArg(value) {
     if (/^[A-Za-z0-9_./:=+-]+$/.test(value)) {
         return value;
@@ -42,7 +43,7 @@ export function parseChatArgs(args) {
     let conversationId;
     let stream;
     let verbose = false;
-    let businessDomain = "bd_public";
+    let businessDomain = "";
     for (let i = 0; i < args.length; i += 1) {
         const arg = args[i];
         if (arg === "-m" || arg === "--message") {
@@ -104,6 +105,8 @@ export function parseChatArgs(args) {
     if (!agentId) {
         throw new Error("Missing agent_id. Usage: kweaver agent chat <agent_id> [-m \"message\"]");
     }
+    if (!businessDomain)
+        businessDomain = resolveBusinessDomain();
     return { agentId, version, message, conversationId, stream, verbose, businessDomain };
 }
 export async function runAgentChatCommand(args) {

package/dist/commands/agent.js

@@ -1,8 +1,9 @@
-import { ensureValidToken, formatHttpError } from "../auth/oauth.js";
+import { ensureValidToken, formatHttpError, with401RefreshRetry } from "../auth/oauth.js";
 import { runAgentChatCommand } from "./agent-chat.js";
 import { listAgents, getAgent, getAgentByKey, createAgent, updateAgent, deleteAgent, publishAgent, unpublishAgent, } from "../api/agent-list.js";
 import { listConversations, listMessages } from "../api/conversations.js";
 import { formatCallOutput } from "./call.js";
+import { resolveBusinessDomain } from "../config/store.js";
 function readStringField(value, ...keys) {
     for (const key of keys) {
         const candidate = value[key];
@@ -48,7 +49,7 @@ export function parseAgentListArgs(args) {
     let category_id = "";
     let custom_space_id = "";
     let is_to_square = 1;
-    let businessDomain = "bd_public";
+    let businessDomain = "";
     let pretty = true;
     let verbose = false;
     for (let i = 0; i < args.length; i += 1) {
@@ -113,6 +114,8 @@ export function parseAgentListArgs(args) {
         }
         throw new Error(`Unsupported agent list argument: ${arg}`);
     }
+    if (!businessDomain)
+        businessDomain = resolveBusinessDomain();
     return {
         name,
         offset,
@@ -130,7 +133,7 @@ export function parseAgentSessionsArgs(args) {
     if (!agentId || agentId.startsWith("-")) {
         throw new Error("Missing agent_id");
     }
-    let businessDomain = "bd_public";
+    let businessDomain = "";
     let limit;
     let pretty = true;
     for (let i = 1; i < args.length; i += 1) {
@@ -163,6 +166,8 @@ export function parseAgentSessionsArgs(args) {
         }
         throw new Error(`Unsupported agent sessions argument: ${arg}`);
     }
+    if (!businessDomain)
+        businessDomain = resolveBusinessDomain();
     return { agentId, businessDomain, limit, pretty };
 }
 export function parseAgentHistoryArgs(args) {
@@ -170,7 +175,7 @@ export function parseAgentHistoryArgs(args) {
     if (!conversationId || conversationId.startsWith("-")) {
         throw new Error("Missing conversation_id");
     }
-    let businessDomain = "bd_public";
+    let businessDomain = "";
     let limit;
     let pretty = true;
     for (let i = 1; i < args.length; i += 1) {
@@ -203,9 +208,11 @@ export function parseAgentHistoryArgs(args) {
         }
         throw new Error(`Unsupported agent history argument: ${arg}`);
     }
+    if (!businessDomain)
+        businessDomain = resolveBusinessDomain();
     return { conversationId, businessDomain, limit, pretty };
 }
-export function runAgentCommand(args) {
+export async function runAgentCommand(args) {
     const [subcommand, ...rest] = args;
     if (!subcommand || subcommand === "--help" || subcommand === "-h") {
         console.log(`kweaver agent
@@ -227,6 +234,32 @@ Subcommands:
   history <conversation_id>          Show message history for a conversation`);
         return Promise.resolve(0);
     }
+    const dispatch = async () => {
+        if (subcommand === "chat")
+            return runAgentChatCommand(rest);
+        if (subcommand === "get")
+            return runAgentGetCommand(rest);
+        if (subcommand === "list")
+            return runAgentListCommand(rest);
+        if (subcommand === "sessions")
+            return runAgentSessionsCommand(rest);
+        if (subcommand === "history")
+            return runAgentHistoryCommand(rest);
+        if (subcommand === "get-by-key")
+            return runAgentGetByKeyCommand(rest);
+        if (subcommand === "create")
+            return runAgentCreateCommand(rest);
+        if (subcommand === "update")
+            return runAgentUpdateCommand(rest);
+        if (subcommand === "delete")
+            return runAgentDeleteCommand(rest);
+        if (subcommand === "publish")
+            return runAgentPublishCommand(rest);
+        if (subcommand === "unpublish")
+            return runAgentUnpublishCommand(rest);
+        return -1;
+    };
+    // Show subcommand-specific help inline (no retry needed)
     if (subcommand === "chat") {
         if (rest.length === 1 && (rest[0] === "--help" || rest[0] === "-h")) {
             console.log(`kweaver agent chat <agent_id> [-m "message"] [options]
@@ -264,9 +297,8 @@ Options:
   --verbose, -v             Show full JSON response
   -bd, --biz-domain <value>  Business domain (default: bd_public)
   --pretty                   Pretty-print JSON output (default)`);
-            return Promise.resolve(0);
+            return 0;
         }
-        return runAgentGetCommand(rest);
     }
     if (subcommand === "list") {
         if (rest.length === 1 && (rest[0] === "--help" || rest[0] === "-h")) {
@@ -284,9 +316,8 @@ Options:
   --verbose, -v             Show full JSON response
   -bd, --biz-domain <value>  Business domain (default: bd_public)
   --pretty                  Pretty-print JSON output (applies to both modes)`);
-            return Promise.resolve(0);
+            return 0;
         }
-        return runAgentListCommand(rest);
     }
     if (subcommand === "sessions") {
         if (rest.length === 1 && (rest[0] === "--help" || rest[0] === "-h")) {
@@ -298,9 +329,8 @@ Options:
   --limit <n>              Max conversations to return
   -bd, --biz-domain <value> Business domain (default: bd_public)
   --pretty                  Pretty-print JSON output (default)`);
-            return Promise.resolve(0);
+            return 0;
         }
-        return runAgentSessionsCommand(rest);
     }
     if (subcommand === "history") {
         if (rest.length === 1 && (rest[0] === "--help" || rest[0] === "-h")) {
@@ -312,37 +342,30 @@ Options:
   --limit <n>              Max messages to return
   -bd, --biz-domain <value> Business domain (default: bd_public)
   --pretty                  Pretty-print JSON output (default)`);
-            return Promise.resolve(0);
+            return 0;
         }
-        return runAgentHistoryCommand(rest);
-    }
-    if (subcommand === "get-by-key") {
-        return runAgentGetByKeyCommand(rest);
     }
-    if (subcommand === "create") {
-        return runAgentCreateCommand(rest);
-    }
-    if (subcommand === "update") {
-        return runAgentUpdateCommand(rest);
-    }
-    if (subcommand === "delete") {
-        return runAgentDeleteCommand(rest);
-    }
-    if (subcommand === "publish") {
-        return runAgentPublishCommand(rest);
+    try {
+        return await with401RefreshRetry(async () => {
+            const code = await dispatch();
+            if (code === -1) {
+                console.error(`Unknown agent subcommand: ${subcommand}`);
+                return 1;
+            }
+            return code;
+        });
     }
-    if (subcommand === "unpublish") {
-        return runAgentUnpublishCommand(rest);
+    catch (error) {
+        console.error(formatHttpError(error));
+        return 1;
     }
-    console.error(`Unknown agent subcommand: ${subcommand}`);
-    return Promise.resolve(1);
 }
 export function parseAgentGetArgs(args) {
     const agentId = args[0];
     if (!agentId || agentId.startsWith("-")) {
         throw new Error("Missing agent_id. Usage: kweaver agent get <agent_id> [options]");
     }
-    let businessDomain = "bd_public";
+    let businessDomain = "";
     let pretty = true;
     let verbose = false;
     for (let i = 1; i < args.length; i += 1) {
@@ -368,6 +391,8 @@ export function parseAgentGetArgs(args) {
         }
         throw new Error(`Unsupported agent get argument: ${arg}`);
     }
+    if (!businessDomain)
+        businessDomain = resolveBusinessDomain();
     return { agentId, businessDomain, pretty, verbose };
 }
 function formatSimpleAgentGet(text, pretty) {
@@ -577,7 +602,7 @@ async function runAgentCreateCommand(args) {
     let systemPrompt = "";
     let llmId = "";
     let llmMaxTokens = 4096;
-    let businessDomain = "bd_public";
+    let businessDomain = "";
     for (let i = 0; i < args.length; i += 1) {
         const arg = args[i];
         if (arg === "--help" || arg === "-h") {
@@ -631,6 +656,8 @@ Optional:
             continue;
         }
     }
+    if (!businessDomain)
+        businessDomain = resolveBusinessDomain();
     if (!name) {
         console.error("--name is required");
         return 1;

package/dist/commands/auth.d.ts

@@ -1,9 +1 @@
-import type { CallbackSession, ClientConfig, TokenConfig } from "../config/store.js";
-export declare function getClientProvisioningMessage(created: boolean): string;
-export declare function formatAuthStatusSummary(input: {
-    client: ClientConfig;
-    token: TokenConfig | null;
-    callback: CallbackSession | null;
-    isCurrent?: boolean;
-}): string[];
 export declare function runAuthCommand(args: string[]): Promise<number>;

package/dist/commands/auth.js

@@ -1,38 +1,18 @@
-import { clearPlatformSession, deletePlatform, getConfigDir, getCurrentPlatform, getPlatformAlias, hasPlatform, listPlatforms, resolvePlatformIdentifier, setCurrentPlatform, setPlatformAlias, } from "../config/store.js";
-import { callLogoutEndpoint, formatHttpError, getStoredAuthSummary, login, normalizeBaseUrl, } from "../auth/oauth.js";
-export function getClientProvisioningMessage(created) {
-    return created ? "Registered a new OAuth client." : "Reusing existing OAuth client.";
-}
-export function formatAuthStatusSummary(input) {
-    const lines = [
-        `Config directory: ${getConfigDir()}`,
-        `Platform: ${input.client.baseUrl}`,
-        `Current platform: ${input.isCurrent ? "yes" : "no"}`,
-        `Client ID: ${input.client.clientId}`,
-        `Redirect URI: ${input.client.redirectUri}`,
-        `Token present: ${input.token ? "yes" : "no"}`,
-        `Callback recorded: ${input.callback ? "yes" : "no"}`,
-    ];
-    if (input.client.product) {
-        lines.push(`Product: ${input.client.product}`);
-    }
-    if (input.client.lang) {
-        lines.push(`Lang: ${input.client.lang}`);
-    }
-    if (input.token?.expiresAt) {
-        lines.push(`Token expires at: ${input.token.expiresAt}`);
-    }
-    if (input.callback?.receivedAt) {
-        lines.push(`Last callback at: ${input.callback.receivedAt}`);
-    }
-    if (input.callback?.scope) {
-        lines.push(`Last callback scope: ${input.callback.scope}`);
-    }
-    return lines;
-}
+import { clearPlatformSession, deletePlatform, getConfigDir, getCurrentPlatform, getPlatformAlias, hasPlatform, listPlatforms, loadTokenConfig, resolvePlatformIdentifier, setCurrentPlatform, setPlatformAlias, } from "../config/store.js";
+import { formatHttpError, normalizeBaseUrl, playwrightLogin, } from "../auth/oauth.js";
 export async function runAuthCommand(args) {
     const target = args[0];
     const rest = args.slice(1);
+    if (!target || target === "--help" || target === "-h") {
+        console.log(`kweaver auth login <url>     Login to a platform (browser login)
+kweaver auth <url>           Login (shorthand)
+kweaver auth status [url]    Show current auth status
+kweaver auth list            List saved platforms
+kweaver auth use <url>       Switch active platform
+kweaver auth logout [url]    Logout (clear local token)
+kweaver auth delete <url>    Delete saved credentials`);
+        return 0;
+    }
     if (target === "login") {
         const url = rest[0];
         if (!url) {
@@ -44,47 +24,34 @@ export async function runAuthCommand(args) {
     if (target && target !== "status" && target !== "list" && target !== "use" && target !== "delete" && target !== "logout") {
         try {
             const normalizedTarget = normalizeBaseUrl(target);
-            const port = Number(readOption(args, "--port") ?? "9010");
-            const clientName = readOption(args, "--client-name") ?? "kweaver";
             const alias = readOption(args, "--alias");
-            const host = readOption(args, "--host");
-            const redirectUriOverride = readOption(args, "--redirect-uri");
-            const forceRegister = args.includes("--force-register");
-            const open = !args.includes("--no-open");
-            const lang = readOption(args, "--lang") ?? "zh-cn";
-            const product = readOption(args, "--product") ?? "adp";
-            const xForwardedPrefix = readOption(args, "--x-forwarded-prefix") ?? "";
-            const result = await login({
-                baseUrl: normalizedTarget,
-                port,
-                clientName,
-                open,
-                forceRegister,
-                host,
-                redirectUriOverride,
-                lang,
-                product,
-                xForwardedPrefix,
-            });
+            const username = readOption(args, "--username") ?? readOption(args, "-u");
+            const password = readOption(args, "--password") ?? readOption(args, "-p");
+            if (username && password) {
+                console.log("Logging in (headless)...");
+            }
+            else {
+                console.log("Opening browser for login...");
+            }
+            const token = await playwrightLogin(normalizedTarget, username && password ? { username, password } : undefined);
             if (alias) {
                 setPlatformAlias(normalizedTarget, alias);
             }
             console.log(`Config directory: ${getConfigDir()}`);
-            console.log(getClientProvisioningMessage(result.created));
-            console.log(`Client ID: ${result.client.clientId}`);
             if (alias) {
                 console.log(`Alias: ${alias.toLowerCase()}`);
             }
             else {
-                const savedAlias = getPlatformAlias(result.client.baseUrl);
+                const savedAlias = getPlatformAlias(normalizedTarget);
                 if (savedAlias) {
                     console.log(`Alias: ${savedAlias}`);
                 }
             }
-            console.log(`Authorization URL: ${result.authorizationUrl}`);
-            console.log(`Callback received at: ${result.callback.receivedAt}`);
-            console.log(`Current platform: ${result.client.baseUrl}`);
+            console.log(`Current platform: ${normalizedTarget}`);
             console.log(`Access token saved: yes`);
+            if (token.expiresAt) {
+                console.log(`Token expires at: ${token.expiresAt}`);
+            }
             return 0;
         }
         catch (error) {
@@ -95,18 +62,35 @@ export async function runAuthCommand(args) {
     if (target === "status") {
         const resolvedTarget = args[1] ? resolvePlatformIdentifier(args[1]) : undefined;
         const statusTarget = resolvedTarget && /^https?:\/\//.test(resolvedTarget) ? normalizeBaseUrl(resolvedTarget) : resolvedTarget ?? undefined;
-        const { client, token, callback } = getStoredAuthSummary(statusTarget);
-        if (!client) {
-            console.error(statusTarget ? `No saved client config found for ${statusTarget}.` : "No saved client config found.");
+        const platform = statusTarget ?? getCurrentPlatform();
+        if (!platform) {
+            console.error("No active platform. Run `kweaver auth login <platform-url>` first.");
+            return 1;
+        }
+        const token = loadTokenConfig(platform);
+        if (!token) {
+            console.error(statusTarget ? `No saved token for ${statusTarget}.` : "No saved token found.");
             return 1;
         }
         const currentPlatform = getCurrentPlatform();
-        for (const line of formatAuthStatusSummary({
-            client,
-            token,
-            callback,
-            isCurrent: currentPlatform === client.baseUrl,
-        })) {
+        const lines = [
+            `Config directory: ${getConfigDir()}`,
+            `Platform: ${token.baseUrl}`,
+            `Current platform: ${token.baseUrl === currentPlatform ? "yes" : "no"}`,
+            `Token present: yes`,
+        ];
+        if (token.expiresAt) {
+            const expiry = new Date(token.expiresAt);
+            const remainingMs = expiry.getTime() - Date.now();
+            if (remainingMs > 0) {
+                const remainingMin = Math.ceil(remainingMs / 60_000);
+                lines.push(`Token status: active (expires in ${remainingMin} min)`);
+            }
+            else {
+                lines.push(`Token status: expired (run \`kweaver auth login ${token.baseUrl}\` again)`);
+            }
+        }
+        for (const line of lines) {
             console.log(line);
         }
         return 0;
@@ -134,7 +118,7 @@ export async function runAuthCommand(args) {
             return 1;
         }
         if (!hasPlatform(useTarget)) {
-            console.error(`No saved client config found for ${useTarget}. Run \`kweaver auth ${useTarget}\` first.`);
+            console.error(`No saved token for ${useTarget}. Run \`kweaver auth login ${useTarget}\` first.`);
             return 1;
         }
         setCurrentPlatform(useTarget);
@@ -149,7 +133,7 @@ export async function runAuthCommand(args) {
             return 1;
         }
         if (!hasPlatform(deleteTarget)) {
-            console.error(`No saved client config found for ${deleteTarget}.`);
+            console.error(`No saved token for ${deleteTarget}.`);
             return 1;
         }
         const wasCurrent = getCurrentPlatform() === deleteTarget;
@@ -166,25 +150,20 @@ export async function runAuthCommand(args) {
         const logoutTarget = resolvedTarget && /^https?:\/\//.test(resolvedTarget) ? normalizeBaseUrl(resolvedTarget) : resolvedTarget;
         if (!logoutTarget) {
             console.error("Usage: kweaver auth logout [platform-url|alias]");
-            console.error("No current platform. Specify a platform to logout, e.g. kweaver auth logout <platform-url|alias>");
+            console.error("No current platform. Specify a platform to logout.");
             return 1;
         }
         if (!hasPlatform(logoutTarget)) {
-            console.error(`No saved client config found for ${logoutTarget}.`);
+            console.error(`No saved token for ${logoutTarget}.`);
             return 1;
         }
-        const { client, token } = getStoredAuthSummary(logoutTarget);
-        if (client) {
-            await callLogoutEndpoint(client, token);
-        }
         clearPlatformSession(logoutTarget);
         console.log(`Logged out: ${logoutTarget}`);
-        console.log(`Run \`kweaver auth ${logoutTarget}\` to sign in again (e.g. as a different user).`);
+        console.log(`Run \`kweaver auth login ${logoutTarget}\` to sign in again.`);
         return 0;
     }
-    console.error("Usage: kweaver auth <platform-url>");
-    console.error("       kweaver auth login <platform-url>");
-    console.error("       kweaver auth <platform-url> [--alias <name>] [--no-open] [--host <host>] [--redirect-uri <uri>]");
+    console.error("Usage: kweaver auth login <platform-url>");
+    console.error("       kweaver auth <platform-url> [--alias <name>]");
     console.error("       kweaver auth status [platform-url|alias]");
     console.error("       kweaver auth list");
     console.error("       kweaver auth use <platform-url|alias>");