@agentknight/client 0.9.47 → 0.9.48

package/dist/cli.js

@@ -3399,9 +3399,20 @@ function renderAgentSelectionPage(input) {
   const accountPanel = account === void 0 ? "" : `
     <div id="relay-account" class="account" data-state="${account.state}" role="status" aria-label="Relay \u8D26\u6237">
       <span id="relay-account-name" class="account-name">${escapeHtml(relayAccountLabel(account))}</span>
-      <div class="account-meta"><span id="relay-account-method">${account.method === "microsoft" ? "Microsoft" : "\u4F20\u7EDF\u8D26\u6237"}</span><span id="relay-account-role"${account.user === void 0 ? " hidden" : ""}>${account.user?.role === "admin" ? "\u7BA1\u7406\u5458" : "\u666E\u901A\u7528\u6237"}</span><span id="relay-account-state">${account.state === "signed-in" ? "\u5DF2\u767B\u5F55" : account.state === "connecting" ? "\u8FDE\u63A5\u4E2D" : account.state === "error" ? "\u767B\u5F55\u5F02\u5E38" : "\u72B6\u6001\u672A\u77E5"}</span>${accountUrl === void 0 ? "" : `<a id="relay-account-link" href="${escapeHtml(accountUrl)}" target="_blank" rel="noopener noreferrer"${account.method === "microsoft" ? "" : " hidden"}>\u67E5\u770B\u8D26\u6237</a>`}</div>
+      <div class="account-meta"><span id="relay-account-method">${account.method === "microsoft" ? "Microsoft" : "\u4F20\u7EDF\u8D26\u6237"}</span><span id="relay-account-role"${account.user === void 0 ? " hidden" : ""}>${account.user?.role === "admin" ? "\u7BA1\u7406\u5458" : "\u666E\u901A\u7528\u6237"}</span><span id="relay-account-state">${account.state === "signed-in" ? "\u5DF2\u767B\u5F55" : account.state === "connecting" ? "\u8FDE\u63A5\u4E2D" : account.state === "disconnected" ? "\u5DF2\u65AD\u5F00" : account.state === "error" ? "\u767B\u5F55\u5F02\u5E38" : "\u72B6\u6001\u672A\u77E5"}</span>${accountUrl === void 0 ? "" : `<a id="relay-account-link" href="${escapeHtml(accountUrl)}" target="_blank" rel="noopener noreferrer"${account.method === "microsoft" ? "" : " hidden"}>\u67E5\u770B\u8D26\u6237</a>`}</div>
       <p id="relay-account-error" class="error"${account.error === void 0 ? " hidden" : ""}>${escapeHtml(account.error ?? "")}</p>
     </div>`;
+  const reconnect = input.relayState === void 0 ? "" : `
+    <form id="relay-reconnect-form" method="post" action="/relay-reconnect" data-state="${input.relayState}">
+      <input type="hidden" name="token" value="${escapeHtml(input.token)}">
+      <button id="relay-reconnect" class="secondary" type="submit"${input.relayState === "registered" ? " hidden" : ""}${input.relayState === "connecting" ? " disabled" : ""}>${input.relayState === "connecting" ? "\u8FDE\u63A5\u4E2D\u2026" : "\u91CD\u8FDE"}</button>
+      <p id="relay-reconnect-error" class="error" role="alert"${input.reconnectError ? "" : " hidden"}>${escapeHtml(input.reconnectError ?? "")}</p>
+    </form>`;
+  const disconnect = !input.canDisconnectRelay || input.relayState === void 0 ? "" : `
+    <form id="relay-disconnect-form" method="post" action="/relay-disconnect">
+      <input type="hidden" name="token" value="${escapeHtml(input.token)}">
+      <button id="relay-disconnect" class="secondary" type="submit"${input.relayState === "disconnected" ? " hidden" : ""}>\u65AD\u5F00\u8FDE\u63A5</button>
+    </form>`;
   const deployment = input.deploymentInfo;
   const upgradedAt = deployment?.upgradedAt;
   const upgradeTime = upgradedAt === void 0 ? void 0 : new Date(upgradedAt);
@@ -3455,6 +3466,7 @@ function renderAgentSelectionPage(input) {
     header { display: flex; gap: 24px; align-items: center; justify-content: space-between; margin-bottom: 38px; }
     .header-actions { display: flex; align-items: center; gap: 24px; min-width: 0; }
     .header-actions > a { flex-shrink: 0; }
+    #relay-reconnect, #relay-disconnect { white-space: nowrap; }
     .account { min-width: 0; max-width: 360px; text-align: right; }
     .account-name { display: block; font-size: 15px; font-weight: 650; overflow-wrap: anywhere; }
     .account-meta { display: flex; justify-content: flex-end; flex-wrap: wrap; gap: 6px 12px; margin-top: 6px; font-size: 12px; color: var(--muted); }
@@ -3546,7 +3558,7 @@ function renderAgentSelectionPage(input) {
 </head>
 <body>
   <main>
-    <header><div><span class="brand"><span class="brand-mark" aria-hidden="true"></span>AgentKnight</span><h1>${escapeHtml(input.machineName)}</h1></div>${account === void 0 ? '<a href="/">\u5237\u65B0</a>' : `<div class="header-actions">${accountPanel}<a href="/">\u5237\u65B0</a></div>`}</header>
+    <header><div><span class="brand"><span class="brand-mark" aria-hidden="true"></span>AgentKnight</span><h1>${escapeHtml(input.machineName)}</h1></div><div class="header-actions">${accountPanel}${reconnect}${disconnect}<a href="/">\u5237\u65B0</a></div></header>
     ${deploymentPanel}
     <div class="layout">
       <section aria-labelledby="agents-heading">
@@ -3570,7 +3582,7 @@ function renderAgentSelectionPage(input) {
           <input type="hidden" name="token" value="${escapeHtml(input.token)}">
           <div class="pair-actions"><button id="show-qr" class="secondary" type="submit"${input.pairing ? " hidden" : ""}>\u663E\u793A\u4E8C\u7EF4\u7801</button><button id="refresh-qr" class="secondary" type="submit" formaction="/refresh"${input.pairing ? "" : " hidden"}>\u5237\u65B0\u4E8C\u7EF4\u7801</button><button id="hide-qr" class="secondary" type="button"${input.pairing ? "" : " hidden"}>\u9690\u85CF</button></div>
         </form>
-        <p id="pair-error" class="error" role="alert"${input.pairingError ? "" : " hidden"}>${escapeHtml(input.pairingError ?? "")}</p>
+        <p id="pair-error" class="error" role="alert"${input.pairingError ? "" : " hidden"}${input.pairingError && input.relayState !== void 0 && input.relayState !== "registered" ? ' data-relay-offline="true"' : ""}>${escapeHtml(input.pairingError ?? "")}</p>
       </aside>
     </div>
   </main>
@@ -3579,6 +3591,98 @@ function renderAgentSelectionPage(input) {
 }
 var localPageScript = `
 (() => {
+  const reconnectForm = document.querySelector('#relay-reconnect-form');
+  if (reconnectForm) {
+    const button = document.querySelector('#relay-reconnect');
+    const disconnectForm = document.querySelector('#relay-disconnect-form');
+    const disconnectButton = document.querySelector('#relay-disconnect');
+    const error = document.querySelector('#relay-reconnect-error');
+    let stopped = false;
+    let timer;
+    let generation = 0;
+    let submitting = false;
+    let state = reconnectForm.dataset.state;
+    let failureState;
+    const update = next => {
+      if (!next || !['connecting', 'registered', 'disconnected', 'error'].includes(next.state)) throw new Error('Invalid Relay status');
+      state = next.state;
+      button.hidden = next.state === 'registered';
+      button.disabled = next.state === 'connecting';
+      button.textContent = next.state === 'connecting' ? '\u8FDE\u63A5\u4E2D\u2026' : '\u91CD\u8FDE';
+      if (disconnectButton) {
+        disconnectButton.hidden = next.state === 'disconnected';
+        disconnectButton.disabled = false;
+        disconnectButton.textContent = '\u65AD\u5F00\u8FDE\u63A5';
+      }
+      if (next.state === 'disconnected') conceal();
+      const pairingError = document.querySelector('#pair-error');
+      if (next.state === 'registered' && pairingError?.dataset.relayOffline === 'true') {
+        pairingError.hidden = true;
+        pairingError.textContent = '';
+        delete pairingError.dataset.relayOffline;
+      }
+    };
+    const poll = async () => {
+      const current = generation;
+      try {
+        const response = await fetch('/relay-status', { cache: 'no-store', signal: AbortSignal.timeout(5000) });
+        if (!response.ok) throw new Error('Relay status unavailable');
+        const next = await response.json();
+        if (!stopped && current === generation && !submitting) {
+          update(next);
+          if (next.state !== failureState) error.hidden = true;
+        }
+      } catch {
+        if (!stopped && current === generation && !submitting) {
+          error.textContent = '\u65E0\u6CD5\u66F4\u65B0 Relay \u8FDE\u63A5\u72B6\u6001\uFF0C\u8BF7\u5237\u65B0\u9875\u9762\u3002';
+          error.hidden = false;
+        }
+      } finally {
+        if (!stopped && current === generation) timer = setTimeout(poll, 3000);
+      }
+    };
+    const submit = async (event, form, actionButton, disconnecting) => {
+      event.preventDefault();
+      if (actionButton.disabled || submitting) return;
+      const current = ++generation;
+      clearTimeout(timer);
+      submitting = true;
+      button.disabled = true;
+      if (disconnectButton) disconnectButton.disabled = true;
+      actionButton.textContent = disconnecting ? '\u6B63\u5728\u65AD\u5F00\u2026' : '\u8FDE\u63A5\u4E2D\u2026';
+      error.hidden = true;
+      failureState = undefined;
+      try {
+        const response = await fetch(form.action, {
+          method: 'POST', headers: { Accept: 'application/json' },
+          body: new URLSearchParams(new FormData(form)), signal: AbortSignal.timeout(5000),
+        });
+        if (!response.ok) throw new Error('Relay reconnect failed');
+        const next = await response.json();
+        if (!stopped && current === generation) {
+          update(next);
+          if (actionButton.hidden) (button.hidden ? disconnectButton : button)?.focus();
+        }
+      } catch {
+        if (!stopped && current === generation) {
+          update({ state: disconnecting ? state : 'error' });
+          failureState = state;
+          error.textContent = disconnecting ? '\u65E0\u6CD5\u65AD\u5F00 Relay\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5\u3002' : '\u65E0\u6CD5\u91CD\u8FDE Relay\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5\u3002';
+          error.hidden = false;
+        }
+      } finally {
+        submitting = false;
+        if (!stopped && current === generation) timer = setTimeout(poll, 1000);
+      }
+    };
+    reconnectForm.addEventListener('submit', event => submit(event, reconnectForm, button, false));
+    if (disconnectForm && disconnectButton) {
+      disconnectForm.addEventListener('submit', event => submit(event, disconnectForm, disconnectButton, true));
+    }
+    addEventListener('pagehide', () => { stopped = true; generation++; clearTimeout(timer); });
+    addEventListener('pageshow', () => { if (stopped) { stopped = false; timer = setTimeout(poll, 0); } });
+    timer = setTimeout(poll, 1000);
+  }
   const account = document.querySelector('#relay-account');
   if (account) {
     const accountLabel = ${relayAccountLabel.toString()};
@@ -3605,7 +3709,7 @@ var localPageScript = `
         role.hidden = !next.user;
         role.textContent = next.user?.role === 'admin' ? '\u7BA1\u7406\u5458' : '\u666E\u901A\u7528\u6237';
         account.dataset.state = next.state;
-        state.textContent = next.state === 'signed-in' ? '\u5DF2\u767B\u5F55' : next.state === 'connecting' ? '\u8FDE\u63A5\u4E2D' : next.state === 'error' ? '\u767B\u5F55\u5F02\u5E38' : '\u72B6\u6001\u672A\u77E5';
+        state.textContent = next.state === 'signed-in' ? '\u5DF2\u767B\u5F55' : next.state === 'connecting' ? '\u8FDE\u63A5\u4E2D' : next.state === 'disconnected' ? '\u5DF2\u65AD\u5F00' : next.state === 'error' ? '\u767B\u5F55\u5F02\u5E38' : '\u72B6\u6001\u672A\u77E5';
         error.textContent = next.error ?? '';
         error.hidden = !next.error;
       } catch {
@@ -3786,6 +3890,7 @@ var localPageScript = `
     loading = true;
     show.disabled = refresh.disabled = hide.disabled = true;
     pairError.hidden = true;
+    delete pairError.dataset.relayOffline;
     conceal();
     const generation = statusGeneration;
     const endpoint = event.submitter?.getAttribute('formaction') || pairing.action;
@@ -4131,6 +4236,11 @@ var PairingPageServer = class {
       return;
     }
     const relayLogin = this.#options.relayLogin;
+    if (relayLogin === void 0 && this.#options.reconnectRelay !== void 0 && request.method === "GET" && requestUrl.pathname === "/relay-status") {
+      this.#writeHeaders(response, 200, "application/json; charset=utf-8");
+      response.end(JSON.stringify({ state: this.#options.getRegistrationStatus().state }));
+      return;
+    }
     if (relayLogin === void 0 && this.#options.getAccount !== void 0 && request.method === "GET" && requestUrl.pathname === "/relay-account") {
       const account = await this.#options.getAccount();
       this.#writeHeaders(response, 200, "application/json; charset=utf-8");
@@ -4174,12 +4284,44 @@ var PairingPageServer = class {
         this.#redirectLogin(response, operation === "start" && next.state === "pending" ? next.verificationUri : "/");
         return;
       }
-      if (request.method === "POST" && ["/pair", "/pair/status", "/refresh", "/selection", "/group-chat-settings", "/peer-chat-settings"].includes(requestUrl.pathname)) {
+      if (request.method === "POST" && ["/pair", "/pair/status", "/refresh", "/selection", "/group-chat-settings", "/peer-chat-settings", "/relay-reconnect", "/relay-disconnect"].includes(requestUrl.pathname)) {
         if (await this.#readAuthorizedForm(request, response) === void 0) return;
         this.#renderLogin(response, 409, this.#loginState(relayLogin));
         return;
       }
     }
+    const relayOperation = requestUrl.pathname === "/relay-reconnect" ? this.#options.reconnectRelay : requestUrl.pathname === "/relay-disconnect" ? this.#options.disconnectRelay : void 0;
+    if (request.method === "POST" && relayOperation !== void 0) {
+      const disconnecting = requestUrl.pathname === "/relay-disconnect";
+      const form = await this.#readAuthorizedForm(request, response);
+      if (form === void 0) return;
+      if (form.getAll("token").length !== 1 || [...form.keys()].some((key) => key !== "token")) {
+        this.#writeHeaders(response, 400, "text/plain; charset=utf-8");
+        response.end(disconnecting ? "Invalid Relay disconnect request." : "Invalid Relay reconnect request.");
+        return;
+      }
+      try {
+        relayOperation();
+      } catch (error) {
+        const message = disconnecting ? "\u65E0\u6CD5\u65AD\u5F00 Relay\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5\u3002" : "\u65E0\u6CD5\u91CD\u8FDE Relay\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5\u3002";
+        this.#options.logger?.error({ error: toErrorDetails(error) }, disconnecting ? "relay.disconnect.failed" : "relay.reconnect.failed");
+        if (wantsJson(request)) {
+          this.#writeHeaders(response, 503, "application/json; charset=utf-8");
+          response.end(JSON.stringify({ error: message }));
+        } else {
+          await this.#renderPage(response, 503, { reconnectError: message });
+        }
+        return;
+      }
+      if (wantsJson(request)) {
+        this.#writeHeaders(response, 200, "application/json; charset=utf-8");
+        response.end(JSON.stringify({ state: this.#options.getRegistrationStatus().state }));
+      } else {
+        response.writeHead(303, { location: "/", "cache-control": "no-store" });
+        response.end();
+      }
+      return;
+    }
     const chatKind = requestUrl.pathname === "/group-chat-settings" ? "group" : requestUrl.pathname === "/peer-chat-settings" ? "peer" : void 0;
     const chatSettings = chatKind === "group" ? this.#options.groupChatSettings : this.#options.peerChatSettings;
     if (request.method === "POST" && chatKind !== void 0 && chatSettings !== void 0) {
@@ -4312,9 +4454,12 @@ var PairingPageServer = class {
       "/relay-login/start",
       "/relay-login/cancel",
       "/relay-login/callback",
+      "/relay-reconnect",
+      "/relay-disconnect",
+      ...this.#options.reconnectRelay === void 0 || relayLogin !== void 0 ? [] : ["/relay-status"],
       ...relayLogin === void 0 ? [] : ["/relay-login/status"]
     ].includes(requestUrl.pathname)) {
-      response.setHeader("allow", requestUrl.pathname === "/pair" ? "GET, POST" : ["/", "/local-page.js", "/relay-login.js", "/relay-login/status", "/relay-login/callback"].includes(requestUrl.pathname) ? "GET" : "POST");
+      response.setHeader("allow", requestUrl.pathname === "/pair" ? "GET, POST" : ["/", "/local-page.js", "/relay-login.js", "/relay-login/status", "/relay-login/callback", "/relay-status"].includes(requestUrl.pathname) ? "GET" : "POST");
       this.#writeHeaders(response, 405, "text/plain; charset=utf-8");
       response.end("Method not allowed.");
       return;
@@ -4354,6 +4499,8 @@ var PairingPageServer = class {
     response.end(renderAgentSelectionPage({
       machineName: this.#options.machineName,
       token: this.#refreshToken,
+      ...this.#options.reconnectRelay === void 0 ? {} : { relayState: registration.state },
+      ...this.#options.disconnectRelay === void 0 ? {} : { canDisconnectRelay: true },
       ...deploymentInfo === void 0 ? {} : { deploymentInfo },
       ...account === void 0 ? {} : { account },
       ...agents === void 0 ? {} : { agents },
@@ -5313,8 +5460,8 @@ var RelayAccount = class {
       this.#expiresAt = 0;
       this.#pending = void 0;
       return this.#view(
-        registration.state === "connecting" ? "connecting" : "error",
-        registration.state === "error" ? "Relay \u8FDE\u63A5\u5F02\u5E38\uFF0C\u8BF7\u68C0\u67E5\u8FDE\u63A5\u6216\u91CD\u65B0\u767B\u5F55\u3002" : void 0
+        registration.state === "connecting" ? "connecting" : "disconnected",
+        registration.state === "error" ? "Relay \u8FDE\u63A5\u5DF2\u65AD\u5F00\u3002" : void 0
       );
     }
     if (this.#cached !== void 0 && Date.now() < this.#expiresAt) return this.#cached;
@@ -7248,6 +7395,8 @@ async function main() {
         port: config.pairingPagePort,
         pairingProvider,
         getRegistrationStatus: () => runningAgent.relayRegistrationStatus,
+        reconnectRelay: () => runningAgent.reconnectRelay(),
+        disconnectRelay: () => runningAgent.disconnectRelay(),
         getAccount: () => relayAccount.read(runningAgent.relayRegistrationStatus),
         getDeploymentInfo: async () => {
           const lastUpgrade = await readLastUpgrade(config.dataDirectory);

package/dist/upgrade-worker.js

@@ -20193,7 +20193,7 @@ async function installPreparedPackage(options) {
 import { createConnection, createServer } from "node:net";
 import { join as join5, resolve as resolve3 } from "node:path";
 
-// ../../shared/sdk/dist/chunks/chunk-DUMC5F2D.js
+// ../../shared/sdk/dist/chunks/chunk-BDKVGENQ.js
 var IdSchema = external_exports.string().trim().min(1).max(256);
 var IsoDateSchema = external_exports.iso.datetime({ offset: true });
 var Base64UrlKeyIdSchema = external_exports.string().regex(/^[A-Za-z0-9_-]{22}$/u, "Expected a 16-byte base64url key ID");
@@ -22765,7 +22765,7 @@ var AndroidProtocolSchemas = {
   ProtocolError: ProtocolErrorSchema
 };
 
-// ../../shared/sdk/dist/chunks/chunk-GRXWNM6S.js
+// ../../shared/sdk/dist/chunks/chunk-7HZ5UZSC.js
 var OwnerSchema = external_exports.object({ pid: external_exports.number().int().positive(), instanceId: external_exports.uuid().optional() });
 var PeerChatRequestSchema = external_exports.object({
   sessionId: IdSchema,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentknight/client",
-  "version": "0.9.47",
+  "version": "0.9.48",
   "description": "AgentKnight PC Agent CLI for remote coding sessions",
   "license": "Apache-2.0",
   "type": "module",
@@ -41,7 +41,7 @@
     "qrcode": "1.5.4",
     "qrcode-terminal": "0.12.0",
     "zod": "4.6.5",
-    "@agentknight/sdk": "0.9.47"
+    "@agentknight/sdk": "0.9.48"
   },
   "devDependencies": {
     "@types/qrcode": "1.5.6",
@@ -49,8 +49,8 @@
     "esbuild": "0.28.2",
     "sharp": "0.35.5",
     "socket.io-client": "4.8.4",
-    "@agentknight/protocol": "0.1.0",
-    "@agentknight/shared": "0.1.0"
+    "@agentknight/shared": "0.1.0",
+    "@agentknight/protocol": "0.1.0"
   },
   "scripts": {
     "clean": "node -e \"require('node:fs').rmSync('dist',{recursive:true,force:true})\"",