@huaqiu/dsh-tool-schematic-gen 0.3.12 → 0.3.14

package/lib/index.mjs

@@ -3,7 +3,7 @@ import { writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { defineTool } from "@deepseek-ai/dsh-tools";
-import { createLogger } from "@hqedge/logging";
+import { getLogger } from "@huaqiu/dsh-plugin-log";
 //#region src/config.ts
 /**
 * `@huaqiu/dsh-tool-schematic-gen` — config, agent identity, run-body and
@@ -710,7 +710,7 @@ async function exportModuleGraphZip(exportZipUrl, moduleGraph, config, account,
 function asJson(value) {
 	return JSON.parse(JSON.stringify(value));
 }
-const log$1 = createLogger({ component: "dsh-schematic-gen" });
+const log$1 = getLogger("dsh-schematic-gen");
 /** Agent-facing timeout hints. */
 const TOOL_TIMEOUT_MS = {
 	generate_schematic_from_description: HTTP_TIMEOUT_MS,
@@ -733,7 +733,7 @@ async function resolveAccount(auth) {
 		};
 		return null;
 	} catch (err) {
-		log$1.warn({ error: String(err?.message || err) }, "could not resolve the eda.cn account");
+		log$1.warn("could not resolve the eda.cn account", { error: String(err?.message || err) });
 		return null;
 	}
 }
@@ -798,10 +798,10 @@ async function artifactUriOf(env, id) {
 		if (!env.artifacts || typeof env.artifacts.getDownloadUri !== "function") return null;
 		return await env.artifacts.getDownloadUri(id);
 	} catch (err) {
-		log$1.warn({
+		log$1.warn("getDownloadUri failed", {
 			id,
 			error: String(err?.message || err)
-		}, "getDownloadUri failed");
+		});
 		return null;
 	}
 }
@@ -1405,7 +1405,7 @@ const inject = [
 	"huaqiuArtifacts",
 	"webServer"
 ];
-const log = createLogger({ component: "dsh-schematic-gen" });
+const log = getLogger("dsh-schematic-gen");
 /**
 * Host plugin body — register the two generation tools.
 *
@@ -1440,12 +1440,12 @@ function apply(ctx, config = {}) {
 		progress,
 		deps: {}
 	}).map((tool) => ctx.tools.register(tool));
-	log.info({
+	log.info("registered agent tools", {
 		tools: disposers.length,
 		copilotkitUrl: finalConfig.copilotkitUrl,
 		exportZipUrl: finalConfig.exportZipUrl,
 		auth: "huaqiuAuth"
-	}, "registered agent tools");
+	});
 	return function dispose() {
 		for (const disposeTool of disposers) try {
 			disposeTool();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@huaqiu/dsh-tool-schematic-gen",
-  "version": "0.3.12",
+  "version": "0.3.14",
   "type": "module",
   "main": "./lib/index.mjs",
   "types": "./lib/index.d.mts",
@@ -30,8 +30,8 @@
     "@deepseek-ai/cordis": "^4.0.1",
     "@deepseek-ai/dsh-host-webserver": "^0.1.0-rc.0",
     "@deepseek-ai/dsh-tools": "^0.1.0-rc.0",
-    "@huaqiu/dsh-auth": "^0.3.12",
-    "@huaqiu/dsh-artifacts": "^0.3.12",
+    "@huaqiu/dsh-auth": "^0.3.14",
+    "@huaqiu/dsh-artifacts": "^0.3.14",
     "react": "^18"
   },
   "devDependencies": {
@@ -39,9 +39,9 @@
     "@huaqiu/kicad-sexpr-parser": "^0.1.1",
     "@types/react": "^18.3.31",
     "react": "^18.3.1",
-    "@huaqiu/dsh-artifacts": "0.3.12",
-    "@huaqiu/dsh-tool-uncollapse": "0.3.12",
-    "@huaqiu/dsh-auth": "0.3.12"
+    "@huaqiu/dsh-auth": "0.3.14",
+    "@huaqiu/dsh-tool-uncollapse": "0.3.14",
+    "@huaqiu/dsh-artifacts": "0.3.14"
   },
   "files": [
     "lib",
@@ -52,7 +52,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@hqedge/logging": "^0.2.7"
+    "@huaqiu/dsh-plugin-log": "0.3.14"
   },
   "scripts": {
     "typecheck": "tsc --noEmit",

package/src/client/hit-card.tsx

@@ -33,6 +33,22 @@ export interface AuthStateLike {
   nickname?: string
 }
 
+/**
+ * Structural view of the `huaqiuAuth` CLIENT service (declared structurally,
+ * never imported — each package must remain independently installable).
+ * `login()` in HQ Edge host mode triggers the EDA login dialog through
+ * hq-edge (`POST /api/v1/auth/login` → EDA `TriggerLoginDialog`) instead of
+ * the auth.eda.cn iframe; `isHostMode()` tells the card which surface to show.
+ */
+export interface AuthClientLike {
+  auth?: {
+    isAuthenticated(): boolean
+    isHostMode?(): boolean
+    login?(options?: { lang?: string; theme?: string }): Promise<void>
+    onAuthStateChanged(listener: (info: { nickname?: string } | null) => void): () => void
+  }
+}
+
 export type PromptSender = (sessionId: string | undefined, message: string) => Promise<unknown>
 
 const TOOL_SCHEMATIC = 'generate_schematic_from_description'
@@ -53,6 +69,13 @@ export interface GenHitProps {
   inspect?: () => void
   authState?: AuthStateLike
   sendPrompt?: PromptSender
+  /**
+   * Lazy accessor for the `huaqiuAuth` client service (auth plugin browser
+   * half). Absent/undefined in a broken install — the needs_auth card then
+   * falls back to the embedded auth.eda.cn iframe. Lazy (not captured once)
+   * so plugin load order resolves correctly at click time.
+   */
+  getAuth?: () => AuthClientLike | undefined
   /**
    * Lazy accessor for the host's `hqEdge` service (edge-bridge browser half).
    * Absent/undefined in standalone DSH — the Place button is then hidden.
@@ -186,9 +209,16 @@ function PreviewStage({ payload, t }: { payload: PreviewPayload; t: Translate })
 
 // ── needs_auth login card ───────────────────────────────────────────────────
 
-function LoginCard({ toolName, authState, t }: { toolName: string; authState?: AuthStateLike; t: Translate }): ReactElement {
+function LoginCard({ toolName, authState, t, getAuth }: { toolName: string; authState?: AuthStateLike; t: Translate; getAuth?: () => AuthClientLike | undefined }): ReactElement {
   const dark = useTheme()
   const locale = useLocale()
+  const authClient = getAuth?.()?.auth
+  // HQ Edge host mode: EDA owns the credential — login must ask EDA to open
+  // its own TriggerLoginDialog (hq-edge POST /api/v1/auth/login), not the
+  // auth.eda.cn iframe (a browser-pushed token is ignored by the STRICT host
+  // resolver). Standalone DSH keeps the inline iframe.
+  const hostMode = authClient?.isHostMode?.() ?? false
+
   // FILL mode (`fill=full`): this card IS the surface, so let the embed paint
   // it edge-to-edge with its own `bg-background`. Without it the embed's
   // `grid-rows-[20px_1fr_20px]` wrapper leaves two transparent strips above
@@ -202,6 +232,41 @@ function LoginCard({ toolName, authState, t }: { toolName: string; authState?: A
   // its URL params once on mount), silently ignoring the new `fill`/`theme`.
   const remountKey = `${locale}|${dark ? 'd' : 'l'}`
 
+  const statusLine = (
+    <p className="hq-sch__login-status" style={{ color: authState?.authenticated ? '#1677ff' : '#d4380d' }}>
+      {authState?.authenticated
+        ? t('card.auth.loggedIn', {
+            nickname: authState.nickname ? t('card.nicknameSep', { nickname: authState.nickname }) : '',
+          })
+        : t('card.auth.loggedOut')}
+    </p>
+  )
+
+  if (hostMode) {
+    return (
+      <div className="hq-sch">
+        <div className="hq-sch__header">
+          <span className="hq-sch__icon">⇶</span>
+          <span className="hq-sch__title">{t('card.auth.title')}</span>
+        </div>
+        <div className="hq-sch__login">
+          <p className="hq-sch__login-desc">{t('card.auth.descHost', { tool: toolName })}</p>
+          {statusLine}
+          <button
+            type="button"
+            className="hq-sch__login-btn"
+            onClick={() => {
+              void authClient?.login?.({ lang: locale, theme: dark ? 'dark' : 'light' })
+                .catch(() => { /* login cancelled / dialog failed — card keeps showing the button */ })
+            }}
+          >
+            {t('card.auth.loginBtn')}
+          </button>
+        </div>
+      </div>
+    )
+  }
+
   return (
     <div className="hq-sch">
       <div className="hq-sch__header">
@@ -210,13 +275,7 @@ function LoginCard({ toolName, authState, t }: { toolName: string; authState?: A
       </div>
       <div className="hq-sch__login">
         <p className="hq-sch__login-desc">{t('card.auth.desc', { tool: toolName })}</p>
-        <p className="hq-sch__login-status" style={{ color: authState?.authenticated ? '#1677ff' : '#d4380d' }}>
-          {authState?.authenticated
-            ? t('card.auth.loggedIn', {
-                nickname: authState.nickname ? t('card.nicknameSep', { nickname: authState.nickname }) : '',
-              })
-            : t('card.auth.loggedOut')}
-        </p>
+        {statusLine}
         <iframe
           key={remountKey}
           src={src}
@@ -364,7 +423,7 @@ export const GenHit = memo(function GenHit(props: GenHitProps): ReactElement {
 
   // needs_auth
   if (state.phase === 'needs_auth') {
-    return <LoginCard toolName={props.toolName} authState={props.authState} t={t} />
+    return <LoginCard toolName={props.toolName} authState={props.authState} t={t} getAuth={props.getAuth} />
   }
 
   const headerKind = result?.kind ?? kindOf(props.toolName)

package/src/client/i18n.ts

@@ -59,6 +59,8 @@ const ZH = {
     'card.auth.desc': '工具「{tool}」需要登录华秋 EDA AI 账号才能继续。请在下方的登录框完成登录（或点击左侧「华秋EDA AI登录」按钮）；登录完成后，回复助手「已登录，请重试」，助手会自动重新调用该工具。',
     'card.auth.loggedIn': '✓ 已登录{nickname}—— 现在可以回复助手「已登录，请重试」，助手会重新调用工具。',
     'card.auth.loggedOut': '未登录 —— 请在上方登录华秋 EDA AI（eda.cn）账号，或点击左侧「华秋EDA AI 登录」按钮；登录完成后让助手重试。',
+    'card.auth.descHost': '工具「{tool}」需要登录华秋 EDA AI 账号才能继续。点击下方按钮后，EDA（KiCad）将弹出登录窗口，请在弹出的窗口中完成登录；登录完成后回复助手「已登录，请重试」，助手会自动重新调用该工具。',
+    'card.auth.loginBtn': '登录华秋 EDA AI',
     // Substituted into `{nickname}` by `card.auth.loggedIn`. zh uses a
     // full-width colon, en a half-width one plus a space — hardcoding '：'
     // made the English card read "Logged in：John".
@@ -116,6 +118,8 @@ const EN: Record<CopyKey, string> = {
     'card.auth.desc': 'Tool "{tool}" requires a Huaqiu EDA AI login. Complete the login below (or use the 华秋EDA AI sidebar button); then reply "I have logged in, please retry" so the assistant can retry the tool.',
     'card.auth.loggedIn': '✓ Logged in{nickname} — reply "I have logged in, please retry" and the assistant will retry.',
     'card.auth.loggedOut': 'Not logged in — complete the login above, or use the 华秋EDA AI sidebar button.',
+    'card.auth.descHost': 'Tool "{tool}" requires a Huaqiu EDA AI account. Click the button below — EDA (KiCad) will open its login dialog. Complete the login there, then reply "I have logged in, please retry" so the assistant can retry the tool.',
+    'card.auth.loginBtn': 'Sign in to Huaqiu EDA AI',
     'card.nicknameSep': ': {nickname}',
 }
 

package/src/client/index.ts

@@ -159,6 +159,7 @@ export function apply(ctx: ClientContext): () => void {
         sendPrompt,
         authState: useAuthState(),
         getHqEdge,
+        getAuth: () => authService,
       })
 
     for (const toolName of TOOLVIEW_KEYS) {

package/src/client/theme.ts

@@ -181,6 +181,8 @@ const CSS = `
 .hq-sch__login-desc { margin: 0 0 10px; font: var(--dsw-font-xxs-12, 12px/1.4 system-ui, sans-serif); color: var(--dsw-alias-label-secondary, currentColor); line-height: 1.5; }
 .hq-sch__login-status { margin: 0 0 10px; font: var(--dsw-font-xxs-12, 12px/1.4 system-ui, sans-serif); line-height: 1.5; }
 .hq-sch__login-iframe { width: 100%; height: ${LOGIN_IFRAME_HEIGHT}px; border: 0; border-radius: 8px; display: block; }
+.hq-sch__login-btn { display: inline-flex; align-items: center; gap: 4px; border: 1px solid var(--dsw-alias-border-l1, currentColor); border-radius: 6px; padding: 6px 16px; background: var(--dsw-alias-interactive-bg-hover, rgba(127,127,127,0.08)); color: var(--dsw-alias-label-primary, currentColor); font: var(--dsw-font-xxs-12, 12px/1.4 system-ui, sans-serif); cursor: pointer; }
+.hq-sch__login-btn:hover { filter: brightness(1.08); }
 
 /* ── live call stack (long-running generations) ───────────────────────────── */
 .hq-sch__progress { display: flex; align-items: center; gap: 8px; padding: 0 12px 8px; font: var(--dsw-font-xxs-12, 12px/1.4 system-ui, sans-serif); color: var(--dsw-alias-label-secondary, currentColor); }

package/src/index.ts

@@ -26,7 +26,7 @@ import { resolveConfig } from './config.js'
 import { HTTP_TIMEOUT_MS } from './sse.js'
 import { ProgressStore } from './progress.js'
 import { createProgressHandler, PROGRESS_ROUTE_PREFIX } from './routes.js'
-import { createLogger } from '@hqedge/logging'
+import { getLogger } from '@huaqiu/dsh-plugin-log'
 
 /** Plugin id — matches package.json. */
 export const name = '@huaqiu/dsh-tool-schematic-gen'
@@ -42,7 +42,7 @@ export const inject = ['tools', 'huaqiuAuth', 'huaqiuArtifacts', 'webServer'] as
 
 /** Shared component name for the unified DSH-plugin log. */
 const COMPONENT = 'dsh-schematic-gen'
-const log = createLogger({ component: COMPONENT })
+const log = getLogger(COMPONENT)
 
 export interface SchematicGenPluginConfig {
   /** Endpoint overrides, env-backed. */
@@ -107,7 +107,12 @@ export function apply(ctx: Context, config: SchematicGenPluginConfig = {}): () =
 
   const disposers = createSchematicGenTools(env).map((tool) => ctx.tools.register(tool))
 
-  log.info({ tools: disposers.length, copilotkitUrl: finalConfig.copilotkitUrl, exportZipUrl: finalConfig.exportZipUrl, auth: 'huaqiuAuth' }, 'registered agent tools')
+  log.info('registered agent tools', {
+    tools: disposers.length,
+    copilotkitUrl: finalConfig.copilotkitUrl,
+    exportZipUrl: finalConfig.exportZipUrl,
+    auth: 'huaqiuAuth',
+  })
 
   return function dispose() {
     for (const disposeTool of disposers) {

package/src/tools.ts

@@ -23,7 +23,7 @@ import { join } from 'node:path'
 import { defineTool } from '@deepseek-ai/dsh-tools'
 import type { HuaqiuAuthService } from '@huaqiu/dsh-auth'
 import type { CreateArtifactResult, HuaqiuArtifacts } from '@huaqiu/dsh-artifacts'
-import { createLogger } from '@hqedge/logging'
+import { getLogger } from '@huaqiu/dsh-plugin-log'
 import {
   agentIds,
   buildHeaders,
@@ -47,7 +47,7 @@ function asJson<T>(value: T): Json {
 
 /** Shared component name for the unified DSH-plugin log. */
 const COMPONENT = 'dsh-schematic-gen'
-const log = createLogger({ component: COMPONENT })
+const log = getLogger(COMPONENT)
 
 /** Agent-facing timeout hints. */
 export const TOOL_TIMEOUT_MS = {
@@ -98,7 +98,7 @@ async function resolveAccount(auth: HuaqiuAuthService['auth']): Promise<EdaAccou
     }
     return null
   } catch (err) {
-    log.warn({ error: String((err as Error)?.message || err) }, 'could not resolve the eda.cn account')
+    log.warn('could not resolve the eda.cn account', { error: String((err as Error)?.message || err) })
     return null
   }
 }
@@ -180,7 +180,7 @@ async function artifactUriOf(env: SchematicGenEnv, id: string): Promise<string |
     if (!env.artifacts || typeof env.artifacts.getDownloadUri !== 'function') return null
     return await env.artifacts.getDownloadUri(id)
   } catch (err) {
-    log.warn({ id, error: String((err as Error)?.message || err) }, 'getDownloadUri failed')
+    log.warn('getDownloadUri failed', { id, error: String((err as Error)?.message || err) })
     return null
   }
 }