@oqtopus-team/pi-qdash 0.1.10-beta.13 → 0.1.10-beta.15

package/extensions/lib/links.ts

@@ -9,7 +9,17 @@ function firstString(object: Record<string, unknown>, keys: string[]): string |
   return undefined;
 }
 
-export function qdashWebBaseUrl(client: QDashClient): string {
+/**
+ * Where the QDash web UI lives, for links in tool output.
+ *
+ * `QDASH_WEB_URL` wins when set: inside a deployment the API base URL is an
+ * internal address (`http://api:5715`) that no browser can open. Without it,
+ * the UI is assumed to sit next to the API with the `/api` prefix stripped,
+ * which holds for a local checkout.
+ */
+export function qdashWebBaseUrl(client: QDashClient, env: NodeJS.ProcessEnv = process.env): string {
+  const configured = env.QDASH_WEB_URL?.trim();
+  if (configured) return configured.replace(/\/+$/, "");
   return client.config.baseUrl.replace(/\/api\/?$/, "").replace(/\/$/, "");
 }
 
@@ -17,16 +27,28 @@ export function qdashWebUrl(client: QDashClient, path: string): string {
   return `${qdashWebBaseUrl(client)}${path.startsWith("/") ? path : `/${path}`}`;
 }
 
+/** Path of an execution page: under its chip when known, else the id-only route that redirects. */
+export function executionPagePath(executionId: string, chipId?: string | null): string {
+  return chipId
+    ? `/execution/${encodeURIComponent(chipId)}/${encodeURIComponent(executionId)}`
+    : `/executions/${encodeURIComponent(executionId)}`;
+}
+
+export function forumPostPagePath(postId: string): string {
+  return `/forum/${encodeURIComponent(postId)}`;
+}
+
 export function qdashObjectLinks(client: QDashClient, object: Record<string, unknown>): Record<string, string> {
   const links: Record<string, string> = {};
   const taskId = firstString(object, ["task_id", "taskId"]);
   const executionId = firstString(object, ["execution_id", "executionId"]);
+  const chipId = firstString(object, ["chip_id", "chipId"]);
   const postId = firstString(object, ["post_id", "forum_post_id", "id"]);
   const issueId = firstString(object, ["issue_id"]);
   const sessionId = firstString(object, ["session_id", "sessionId"]);
   if (taskId) links.task_result = qdashWebUrl(client, `/task-results/${encodeURIComponent(taskId)}`);
-  if (executionId) links.execution = qdashWebUrl(client, `/executions/${encodeURIComponent(executionId)}`);
-  if (postId) links.forum_post = qdashWebUrl(client, `/forum/posts/${encodeURIComponent(postId)}`);
+  if (executionId) links.execution = qdashWebUrl(client, executionPagePath(executionId, chipId));
+  if (postId) links.forum_post = qdashWebUrl(client, forumPostPagePath(postId));
   if (issueId) links.issue = qdashWebUrl(client, `/issues/${encodeURIComponent(issueId)}`);
   if (sessionId) links.agent_session = qdashWebUrl(client, `/agent-sessions/${encodeURIComponent(sessionId)}`);
   return links;

package/extensions/qdash.ts

@@ -19,7 +19,7 @@ import { fetchFigureDetails, figureComponent, figureResultText, mediaTypeForPath
 import { forumImageReplyContent, forumImageReplyPreview, loadLocalForumImages, type LocalForumImage } from "./lib/forum-images.js";
 import { forumDetailComponent, forumDetailLines, forumListLines, forumPostTitle, forumPostsFromPayload } from "./lib/forum-render.js";
 import { investigationContextSummary, validateInvestigationContext, type TimeseriesInvestigationContext } from "./lib/investigation-context.js";
-import { qdashObjectLinks, qdashWebBaseUrl, qdashWebUrl, safeConfig, withQDashLinks } from "./lib/links.js";
+import { executionPagePath, forumPostPagePath, qdashObjectLinks, qdashWebBaseUrl, qdashWebUrl, safeConfig, withQDashLinks } from "./lib/links.js";
 import { arrayFromPayload, compactItems, firstNumber, firstString, formatItem, payloadTotal, statusIcon } from "./lib/payload.js";
 import { toFigureToolResult, toTextToolResult, toToolResult } from "./lib/results.js";
 import { ansi, boxLinesToWidth, boxed, formatNumber, textComponent } from "./lib/render.js";
@@ -1419,7 +1419,7 @@ async function buildForumEvidenceReply(client: QDashClient, params: ForumEvidenc
   const targetId = firstString(parent, ["target_id", "targetId"]) ?? couplingId ?? qid;
   const title = params.title ?? `${new Date().toISOString().slice(0, 10)} 追加観測: ${target} ${taskName}`;
   const taskUrl = qdashWebUrl(client, `/task-results/${encodeURIComponent(params.taskId)}`);
-  const executionUrl = executionId ? qdashWebUrl(client, `/executions/${encodeURIComponent(executionId)}`) : undefined;
+  const executionUrl = executionId ? qdashWebUrl(client, executionPagePath(executionId, chipId)) : undefined;
   const figures = params.includeFigures === false ? [] : taskFigurePaths(task, params.maxFigures ?? 2);
   const figureMarkdown = figures.map((path) => `![${filenameFromFigurePath(path)}](${figureApiUrl(path)})`).join("\n\n");
   const history = params.includeHistory === false ? [] : arrayFromPayload(await client.listTaskResults({
@@ -2238,7 +2238,7 @@ export default function qdashExtension(pi: ExtensionAPI) {
     async execute(_toolCallId, params: { profile?: string; configPath?: string; useEnv?: boolean; postId: string; color?: boolean }) {
       const client = await makeClient(params);
       const data = await client.getForumPost(params.postId);
-      const url = qdashWebUrl(client, `/forum/posts/${encodeURIComponent(params.postId)}`);
+      const url = qdashWebUrl(client, forumPostPagePath(params.postId));
       return toTextToolResult(`${forumDetailLines(data, "QDash Forum Post", params.color).join("\n")}\nurl ${url}`, withQDashLinks(client, data), { tool: "qdash_get_forum_post", url });
     },
     renderResult(result, _options, theme) {
@@ -2257,7 +2257,7 @@ export default function qdashExtension(pi: ExtensionAPI) {
     async execute(_toolCallId, params: { profile?: string; configPath?: string; useEnv?: boolean; postId: string; color?: boolean }) {
       const client = await makeClient(params);
       const data = await client.getForumPostReplies(params.postId);
-      const url = qdashWebUrl(client, `/forum/posts/${encodeURIComponent(params.postId)}`);
+      const url = qdashWebUrl(client, forumPostPagePath(params.postId));
       return toTextToolResult(`${forumListLines(data, "QDash Forum Replies", params.color).join("\n")}\nurl ${url}`, data, { tool: "qdash_list_forum_replies", url });
     },
     renderResult(result, _options, theme) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oqtopus-team/pi-qdash",
-  "version": "0.1.10-beta.13",
+  "version": "0.1.10-beta.15",
   "description": "Pi extension for querying QDash via @oqtopus-team/qdash-client",
   "type": "module",
   "license": "Apache-2.0",

package/skills/qdash/SKILL.md

@@ -134,6 +134,7 @@ For cryostat wiring requests, start with `qdash_get_cooldown_wiring`. Pass `cool
 The extension uses `@oqtopus-team/qdash-client` and supports:
 
 - `QDASH_*` environment variables (`QDASH_BASE_URL`, `QDASH_API_TOKEN`, `QDASH_PROJECT_ID`, etc.)
+- `QDASH_WEB_URL`: the QDash web UI address used for links in tool output, when it differs from the API base URL (for example inside a deployment where the API is reached by an internal hostname)
 - `$XDG_CONFIG_HOME/qdash/config.ini`
 - `~/.config/qdash/config.ini`
 - explicit `profile` / `configPath` parameters