From c8deb818daecb24460718beb65422a4f5eab6f77 Mon Sep 17 00:00:00 2001
From: lyon <liang6516@outlook.com>
Date: Tue, 16 Jun 2026 13:15:52 +0800
Subject: [PATCH] fix: route runner job defaults through shared config

---
 src/mgr/server.ts | 28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

diff --git a/src/mgr/server.ts b/src/mgr/server.ts
index 116a3b8..8889e59 100644
--- a/src/mgr/server.ts
+++ b/src/mgr/server.ts
@@ -587,23 +587,11 @@ async function route({ method, url, body, store, sourceCommit, authSummary, runn
   if (method === "GET" && queueTaskMatch) return await refreshQueueTaskForRead(store, queueTaskMatch[1] ?? "") as unknown as JsonValue;
   const queueTaskDispatchMatch = path.match(/^\/api\/v1\/queue\/tasks\/([^/]+)\/dispatch$/u);
   if (method === "POST" && queueTaskDispatchMatch) {
-    const namespace = runnerJobDefaults?.namespace ?? process.env.AGENTRUN_RUNTIME_NAMESPACE ?? "agentrun-v01";
     return await dispatchQueueTask({
       store,
       taskId: queueTaskDispatchMatch[1] ?? "",
       input: asRecord(body ?? {}, "queueDispatch"),
-      defaults: {
-        namespace,
-        managerUrl: runnerJobDefaults?.managerUrl ?? process.env.AGENTRUN_INTERNAL_MGR_URL ?? `http://agentrun-mgr.${namespace}.svc.cluster.local:8080`,
-        image: runnerJobDefaults?.image ?? process.env.AGENTRUN_RUNNER_IMAGE ?? "",
-        ...optionalStringRecord("bootRepoUrl", runnerJobDefaults?.bootRepoUrl ?? process.env.AGENTRUN_BOOT_REPO_URL),
-        sourceCommit,
-        ...optionalStringRecord("envIdentity", runnerJobDefaults?.envIdentity ?? process.env.AGENTRUN_ENV_IDENTITY),
-        ...optionalStringRecord("artifactCatalogFile", runnerJobDefaults?.artifactCatalogFile ?? process.env.AGENTRUN_ARTIFACT_CATALOG_FILE),
-        serviceAccountName: runnerJobDefaults?.serviceAccountName ?? process.env.AGENTRUN_RUNNER_SERVICE_ACCOUNT ?? "agentrun-v01-runner",
-        ...(runnerJobDefaults?.kubectlCommand ? { kubectlCommand: runnerJobDefaults.kubectlCommand } : {}),
-        ...(runnerJobDefaults?.unideskSshEndpointEnv ? { unideskSshEndpointEnv: runnerJobDefaults.unideskSshEndpointEnv } : {}),
-      },
+      defaults: runnerJobDefaultsForRequest(runnerJobDefaults, sourceCommit),
     }) as unknown as JsonValue;
   }
   const queueTaskRefreshMatch = path.match(/^\/api\/v1\/queue\/tasks\/([^/]+)\/refresh$/u);
@@ -652,23 +640,11 @@ async function route({ method, url, body, store, sourceCommit, authSummary, runn
   if (method === "GET" && commandCreateMatch) return { items: await store.listCommands(commandCreateMatch[1] ?? "", integerQuery(url, "afterSeq", 0), integerQuery(url, "limit", 20)) as unknown as JsonValue };
   const runnerJobMatch = path.match(/^\/api\/v1\/runs\/([^/]+)\/runner-jobs$/u);
   if (method === "POST" && runnerJobMatch) {
-    const namespace = runnerJobDefaults?.namespace ?? process.env.AGENTRUN_RUNTIME_NAMESPACE ?? "agentrun-v01";
     return await createKubernetesRunnerJob({
       store,
       runId: runnerJobMatch[1] ?? "",
       input: asRecord(body ?? {}, "runnerJob") as never,
-      defaults: {
-        namespace,
-        managerUrl: runnerJobDefaults?.managerUrl ?? process.env.AGENTRUN_INTERNAL_MGR_URL ?? `http://agentrun-mgr.${namespace}.svc.cluster.local:8080`,
-        image: runnerJobDefaults?.image ?? process.env.AGENTRUN_RUNNER_IMAGE ?? "",
-        ...optionalStringRecord("bootRepoUrl", runnerJobDefaults?.bootRepoUrl ?? process.env.AGENTRUN_BOOT_REPO_URL),
-        sourceCommit,
-        ...optionalStringRecord("envIdentity", runnerJobDefaults?.envIdentity ?? process.env.AGENTRUN_ENV_IDENTITY),
-        ...optionalStringRecord("artifactCatalogFile", runnerJobDefaults?.artifactCatalogFile ?? process.env.AGENTRUN_ARTIFACT_CATALOG_FILE),
-        serviceAccountName: runnerJobDefaults?.serviceAccountName ?? process.env.AGENTRUN_RUNNER_SERVICE_ACCOUNT ?? "agentrun-v01-runner",
-        ...(runnerJobDefaults?.kubectlCommand ? { kubectlCommand: runnerJobDefaults.kubectlCommand } : {}),
-        ...(runnerJobDefaults?.unideskSshEndpointEnv ? { unideskSshEndpointEnv: runnerJobDefaults.unideskSshEndpointEnv } : {}),
-      },
+      defaults: runnerJobDefaultsForRequest(runnerJobDefaults, sourceCommit),
     }) as unknown as JsonValue;
   }
   if (method === "GET" && runnerJobMatch) {