@openagentpack/sdk 0.3.0 → 0.3.1

package/dist/index.js

@@ -24,6 +24,178 @@ var UserError = class extends Error {
   }
 };
 
+// src/internal/transport.ts
+var defaultFetch;
+function setDefaultFetch(fetchImpl) {
+  defaultFetch = fetchImpl;
+}
+function resolveFetch() {
+  return defaultFetch ?? ((input, init) => fetch(input, init));
+}
+
+// src/internal/providers/base-client.ts
+var ApiError = class _ApiError extends Error {
+  constructor(statusCode, responseBody, prefix) {
+    super(`${prefix} ${statusCode}: ${responseBody}`);
+    this.statusCode = statusCode;
+    this.responseBody = responseBody;
+  }
+  statusCode;
+  responseBody;
+  static isNotFound(err) {
+    return err instanceof _ApiError && err.statusCode === 404;
+  }
+};
+var ConflictError = class extends ApiError {
+};
+var BaseApiClient = class {
+  isConflict(_status, _body) {
+    return false;
+  }
+  async throwIfError(res) {
+    if (res.ok) return;
+    const body = await res.text();
+    if (this.isConflict(res.status, body)) throw new ConflictError(res.status, body, this.errorPrefix);
+    throw new ApiError(res.status, body, this.errorPrefix);
+  }
+  async post(path, body) {
+    const res = await resolveFetch()(`${this.baseUrl}${path}`, {
+      method: "POST",
+      headers: this.headers(),
+      body: JSON.stringify(body)
+    });
+    await this.throwIfError(res);
+    return res.json();
+  }
+  async put(path, body) {
+    const res = await resolveFetch()(`${this.baseUrl}${path}`, {
+      method: "PUT",
+      headers: this.headers(),
+      body: JSON.stringify(body)
+    });
+    await this.throwIfError(res);
+    return res.json();
+  }
+  async delete(path) {
+    const res = await resolveFetch()(`${this.baseUrl}${path}`, {
+      method: "DELETE",
+      headers: this.headers()
+    });
+    await this.throwIfError(res);
+  }
+  async get(path) {
+    const res = await resolveFetch()(`${this.baseUrl}${path}`, {
+      method: "GET",
+      headers: this.headers()
+    });
+    await this.throwIfError(res);
+    return res.json();
+  }
+  async getBuffer(path) {
+    const res = await resolveFetch()(`${this.baseUrl}${path}`, {
+      method: "GET",
+      headers: this.headers()
+    });
+    await this.throwIfError(res);
+    return Buffer.from(await res.arrayBuffer());
+  }
+  async *sse(path, options) {
+    const controller = new AbortController();
+    const res = await resolveFetch()(`${this.baseUrl}${path}`, {
+      method: "GET",
+      headers: { ...this.headers(), Accept: "text/event-stream", ...options?.headers },
+      signal: controller.signal
+    });
+    await this.throwIfError(res);
+    const reader = res.body.getReader();
+    const decoder = new TextDecoder();
+    let buffer = "";
+    try {
+      while (true) {
+        const { done, value } = await reader.read();
+        if (done) break;
+        buffer += decoder.decode(value, { stream: true });
+        let boundary = buffer.indexOf("\n\n");
+        while (boundary !== -1) {
+          const frame = buffer.slice(0, boundary);
+          buffer = buffer.slice(boundary + 2);
+          boundary = buffer.indexOf("\n\n");
+          const dataLines = [];
+          let sseId;
+          for (const line of frame.split("\n")) {
+            if (line.startsWith(":")) continue;
+            if (line.startsWith("event:") && line.slice(6).trim() === "heartbeat") {
+              dataLines.length = 0;
+              break;
+            }
+            if (line.startsWith("data:")) {
+              dataLines.push(line.slice(5).trimStart());
+            }
+            if (line.startsWith("id:")) {
+              sseId = line.slice(3).trimStart();
+            }
+          }
+          if (dataLines.length === 0) continue;
+          const json = dataLines.join("\n");
+          try {
+            const parsed = JSON.parse(json);
+            if (sseId !== void 0 && parsed.id === void 0) {
+              parsed.id = sseId;
+            }
+            yield parsed;
+          } catch {
+          }
+        }
+      }
+    } finally {
+      try {
+        await reader.cancel();
+      } catch {
+      }
+      controller.abort();
+      reader.releaseLock();
+    }
+  }
+  async postFormData(path, formData) {
+    const { "Content-Type": _contentType, ...headers } = this.headers();
+    const res = await resolveFetch()(`${this.baseUrl}${path}`, {
+      method: "POST",
+      headers,
+      body: formData
+    });
+    await this.throwIfError(res);
+    return res.json();
+  }
+  async getAllPaged(path) {
+    const all = [];
+    let cursor;
+    for (; ; ) {
+      const sep = path.includes("?") ? "&" : "?";
+      const param = this.paginationStrategy === "page" ? "page" : "after_id";
+      const url = cursor ? `${path}${sep}limit=100&${param}=${encodeURIComponent(cursor)}` : `${path}${sep}limit=100`;
+      const res = await this.get(url);
+      const data = res.data ?? [];
+      all.push(...data);
+      if (data.length === 0) break;
+      if (this.paginationStrategy === "page") {
+        if (!res.next_page) break;
+        cursor = res.next_page;
+      } else {
+        if (!res.has_more || !res.last_id) break;
+        cursor = res.last_id;
+      }
+    }
+    return all;
+  }
+};
+function toRemoteResource(res) {
+  return {
+    id: res.id,
+    type: res.type,
+    version: res.version
+  };
+}
+
 // src/internal/providers/capabilities.ts
 function isSupported(caps, kind) {
   const tier = caps?.[kind]?.tier;
@@ -80,6 +252,16 @@ function getProvider(name) {
 function allProviders() {
   return Array.from(registry.values());
 }
+function parseProviderConfig(def, rawConfig) {
+  const result = def.configSchema.safeParse(rawConfig);
+  if (result.success) return result.data;
+  const details = result.error.issues.map((issue) => {
+    const path = issue.path.join(".");
+    return path ? `${path}: ${issue.message}` : issue.message;
+  });
+  throw new UserError(`Provider '${def.name}' config invalid:
+${details.join("\n")}`);
+}
 function buildProviders(providersConfig, projectName) {
   const adapters = /* @__PURE__ */ new Map();
   for (const [name, rawConfig] of Object.entries(providersConfig)) {
@@ -87,7 +269,7 @@ function buildProviders(providersConfig, projectName) {
     if (!def) {
       throw new UserError(`Unknown provider '${name}'. Registered: ${Array.from(registry.keys()).join(", ")}`);
     }
-    const parsed = def.configSchema.parse(rawConfig);
+    const parsed = parseProviderConfig(def, rawConfig);
     const adapter2 = def.createAdapter(parsed, projectName);
     validateProviderFacets(def, adapter2);
     adapters.set(name, adapter2);
@@ -97,8 +279,11 @@ function buildProviders(providersConfig, projectName) {
 var PROVIDER_ENV_VARS = {
   bailian: {
     api_key: { env: ["DASHSCOPE_API_KEY", "BAILIAN_API_KEY"], required: true },
-    workspace_id: { env: ["BAILIAN_WORKSPACE_ID"], required: true },
-    base_url: { env: ["BAILIAN_BASE_URL"], required: false }
+    // Neither workspace_id nor base_url is required on its own; the config schema
+    // enforces "at least one" so a host can supply just base_url (BAILIAN_BASE_URL).
+    // base_url is the preferred placeholder emitted by `agents sync`.
+    workspace_id: { env: ["BAILIAN_WORKSPACE_ID"], required: false },
+    base_url: { env: ["BAILIAN_BASE_URL"], required: false, placeholder: true }
   },
   qoder: {
     api_key: { env: ["QODER_PAT", "QODER_API_KEY"], required: true },
@@ -117,8 +302,8 @@ function placeholderProviderConfig(providerName) {
   const envMap = PROVIDER_ENV_VARS[providerName];
   if (!envMap) return {};
   const out = {};
-  for (const [field, { env, required }] of Object.entries(envMap)) {
-    if (required && env[0]) out[field] = `\${${env[0]}}`;
+  for (const [field, { env, required, placeholder }] of Object.entries(envMap)) {
+    if ((required || placeholder) && env[0]) out[field] = `\${${env[0]}}`;
   }
   return out;
 }
@@ -156,7 +341,7 @@ function buildProviderFromEnv(providerName, projectName) {
     throw new UserError(`Unknown provider '${providerName}'. Registered: ${Array.from(registry.keys()).join(", ")}`);
   }
   const config = resolveProviderConfigFromEnv(providerName);
-  const parsed = def.configSchema.parse(config);
+  const parsed = parseProviderConfig(def, config);
   const adapter2 = def.createAdapter(parsed, projectName);
   validateProviderFacets(def, adapter2);
   return adapter2;
@@ -210,161 +395,6 @@ function skillNameFromFiles(files) {
   return match?.[1]?.replace(/^["']|["']$/g, "") || void 0;
 }
 
-// src/internal/providers/base-client.ts
-var ApiError = class _ApiError extends Error {
-  constructor(statusCode, responseBody, prefix) {
-    super(`${prefix} ${statusCode}: ${responseBody}`);
-    this.statusCode = statusCode;
-    this.responseBody = responseBody;
-  }
-  statusCode;
-  responseBody;
-  static isNotFound(err) {
-    return err instanceof _ApiError && err.statusCode === 404;
-  }
-};
-var ConflictError = class extends ApiError {
-};
-var BaseApiClient = class {
-  isConflict(_status, _body) {
-    return false;
-  }
-  async throwIfError(res) {
-    if (res.ok) return;
-    const body = await res.text();
-    if (this.isConflict(res.status, body)) throw new ConflictError(res.status, body, this.errorPrefix);
-    throw new ApiError(res.status, body, this.errorPrefix);
-  }
-  async post(path, body) {
-    const res = await fetch(`${this.baseUrl}${path}`, {
-      method: "POST",
-      headers: this.headers(),
-      body: JSON.stringify(body)
-    });
-    await this.throwIfError(res);
-    return res.json();
-  }
-  async put(path, body) {
-    const res = await fetch(`${this.baseUrl}${path}`, {
-      method: "PUT",
-      headers: this.headers(),
-      body: JSON.stringify(body)
-    });
-    await this.throwIfError(res);
-    return res.json();
-  }
-  async delete(path) {
-    const res = await fetch(`${this.baseUrl}${path}`, {
-      method: "DELETE",
-      headers: this.headers()
-    });
-    await this.throwIfError(res);
-  }
-  async get(path) {
-    const res = await fetch(`${this.baseUrl}${path}`, {
-      method: "GET",
-      headers: this.headers()
-    });
-    await this.throwIfError(res);
-    return res.json();
-  }
-  async getBuffer(path) {
-    const res = await fetch(`${this.baseUrl}${path}`, {
-      method: "GET",
-      headers: this.headers()
-    });
-    await this.throwIfError(res);
-    return Buffer.from(await res.arrayBuffer());
-  }
-  async *sse(path, options) {
-    const controller = new AbortController();
-    const res = await fetch(`${this.baseUrl}${path}`, {
-      method: "GET",
-      headers: { ...this.headers(), Accept: "text/event-stream", ...options?.headers },
-      signal: controller.signal
-    });
-    await this.throwIfError(res);
-    const reader = res.body.getReader();
-    const decoder = new TextDecoder();
-    let buffer = "";
-    try {
-      while (true) {
-        const { done, value } = await reader.read();
-        if (done) break;
-        buffer += decoder.decode(value, { stream: true });
-        let boundary = buffer.indexOf("\n\n");
-        while (boundary !== -1) {
-          const frame = buffer.slice(0, boundary);
-          buffer = buffer.slice(boundary + 2);
-          boundary = buffer.indexOf("\n\n");
-          const dataLines = [];
-          for (const line of frame.split("\n")) {
-            if (line.startsWith(":")) continue;
-            if (line.startsWith("event:") && line.slice(6).trim() === "heartbeat") {
-              dataLines.length = 0;
-              break;
-            }
-            if (line.startsWith("data:")) {
-              dataLines.push(line.slice(5).trimStart());
-            }
-          }
-          if (dataLines.length === 0) continue;
-          const json = dataLines.join("\n");
-          try {
-            yield JSON.parse(json);
-          } catch {
-          }
-        }
-      }
-    } finally {
-      try {
-        await reader.cancel();
-      } catch {
-      }
-      controller.abort();
-      reader.releaseLock();
-    }
-  }
-  async postFormData(path, formData) {
-    const { "Content-Type": _contentType, ...headers } = this.headers();
-    const res = await fetch(`${this.baseUrl}${path}`, {
-      method: "POST",
-      headers,
-      body: formData
-    });
-    await this.throwIfError(res);
-    return res.json();
-  }
-  async getAllPaged(path) {
-    const all = [];
-    let cursor;
-    for (; ; ) {
-      const sep = path.includes("?") ? "&" : "?";
-      const param = this.paginationStrategy === "page" ? "page" : "after_id";
-      const url = cursor ? `${path}${sep}limit=100&${param}=${encodeURIComponent(cursor)}` : `${path}${sep}limit=100`;
-      const res = await this.get(url);
-      const data = res.data ?? [];
-      all.push(...data);
-      if (data.length === 0) break;
-      if (this.paginationStrategy === "page") {
-        if (!res.next_page) break;
-        cursor = res.next_page;
-      } else {
-        if (!res.has_more || !res.last_id) break;
-        cursor = res.last_id;
-      }
-    }
-    return all;
-  }
-};
-function toRemoteResource(res) {
-  return {
-    id: res.id,
-    type: res.type,
-    version: res.version
-  };
-}
-
 // src/internal/providers/memory-api.ts
 function query(path, values) {
   const params = new URLSearchParams();
@@ -849,8 +879,193 @@ function stripAgentsMetadata(value) {
   return Object.keys(out).length > 0 ? out : void 0;
 }
 
+// src/internal/utils/sandbox-mount.ts
+var PROVIDER_MOUNT_PREFIXES = {
+  qoder: "/data",
+  claude: "/workspace",
+  bailian: "/mnt",
+  ark: "/mnt"
+};
+function joinAbsolute(prefix, sub) {
+  const left = prefix.replace(/\/+$/, "");
+  const right = sub.replace(/^\/+/, "");
+  return `${left}/${right}`;
+}
+function quoteShellWord(value) {
+  return `'${value.replaceAll("'", `'"'"'`)}'`;
+}
+function stripUrlQueryAndFragment(value) {
+  const queryIndex = value.indexOf("?");
+  const fragmentIndex = value.indexOf("#");
+  if (queryIndex === -1) {
+    return fragmentIndex === -1 ? value : value.slice(0, fragmentIndex);
+  }
+  if (fragmentIndex === -1) return value.slice(0, queryIndex);
+  return value.slice(0, Math.min(queryIndex, fragmentIndex));
+}
+function stripGitSuffix(value) {
+  return value.toLowerCase().endsWith(".git") ? value.slice(0, -4) : value;
+}
+function lastRemotePathSegment(value) {
+  const lastSlash = value.lastIndexOf("/");
+  const lastColon = value.lastIndexOf(":");
+  return value.slice(Math.max(lastSlash, lastColon) + 1).trim();
+}
+function providerMountPrefix(provider) {
+  return PROVIDER_MOUNT_PREFIXES[provider];
+}
+function resolveSandboxMountPath(provider, mountPath) {
+  const prefix = providerMountPrefix(provider);
+  if (!prefix) return mountPath;
+  if (mountPath === prefix || mountPath.startsWith(`${prefix}/`)) return mountPath;
+  if (mountPath.startsWith("/")) {
+    throw new UserError(`${provider} mount_path must start with '${prefix}/'; received '${mountPath}'.`);
+  }
+  return joinAbsolute(prefix, mountPath);
+}
+function resolveRepositoryMountPath(provider, resource) {
+  const prefix = providerMountPrefix(provider);
+  if (!prefix) throw new UserError(`Provider '${provider}' has no declared mount path prefix.`);
+  if (resource.mount_path) {
+    if (resource.mount_path !== prefix && !resource.mount_path.startsWith(`${prefix}/`)) {
+      throw new UserError(`${provider} Git repository Session resource mount_path must start with '${prefix}/'.`);
+    }
+    return resource.mount_path;
+  }
+  const repositoryName = stripGitSuffix(lastRemotePathSegment(stripUrlQueryAndFragment(resource.url)));
+  if (!repositoryName) {
+    throw new UserError(`Cannot derive a ${provider} Git repository mount path from URL '${resource.url}'.`);
+  }
+  return provider === "qoder" ? `${prefix}/workspace/${repositoryName}` : `${prefix}/${repositoryName}`;
+}
+function composeFileMountHint(files, provider) {
+  if (!files || files.length === 0) return "";
+  const lines = files.map((f) => `- ${resolveSandboxMountPath(provider, f.mount_path)}`);
+  return [
+    "The user uploaded files. They are available at the following sandbox paths:",
+    ...lines,
+    "Read them from these paths when relevant."
+  ].join("\n");
+}
+function prependFileHint(prompt, files, provider) {
+  const hint = composeFileMountHint(files, provider);
+  if (!hint) return prompt;
+  return `${hint}
+
+${prompt}`;
+}
+var FILE_MENTION_START = "\u27E6file:";
+var FILE_MENTION_END = "\u27E7";
+function rewriteFileMentions(prompt, provider) {
+  let cursor = 0;
+  let rewritten = "";
+  while (cursor < prompt.length) {
+    const start = prompt.indexOf(FILE_MENTION_START, cursor);
+    if (start === -1) {
+      rewritten += prompt.slice(cursor);
+      break;
+    }
+    const mountPathStart = start + FILE_MENTION_START.length;
+    const end = prompt.indexOf(FILE_MENTION_END, mountPathStart);
+    if (end === -1) {
+      rewritten += prompt.slice(cursor);
+      break;
+    }
+    rewritten += prompt.slice(cursor, start);
+    rewritten += resolveSandboxMountPath(provider, prompt.slice(mountPathStart, end));
+    cursor = end + FILE_MENTION_END.length;
+  }
+  return rewritten;
+}
+function preparePromptForProvider(prompt, files, provider) {
+  return prependFileHint(rewriteFileMentions(prompt, provider), files, provider);
+}
+function prepareInitialSessionPrompt(prompt, bindings, provider) {
+  const prepared = preparePromptForProvider(prompt, bindings.files, provider);
+  const repositories = (bindings.resources ?? []).filter(
+    (resource) => resource.type === "github_repository"
+  );
+  if (repositories.length === 0) return prepared;
+  const paths = repositories.map((resource) => resolveRepositoryMountPath(provider, resource));
+  if (paths.length === 1) {
+    const path = paths[0];
+    return [
+      `The Git working tree for this task is mounted at \`${path}\`.`,
+      "Work only inside this directory unless the user explicitly requests otherwise.",
+      "Prefix every shell command with:",
+      `cd -- ${quoteShellWord(path)} &&`,
+      `Use absolute paths under \`${path}\` for non-shell file tools.`,
+      "",
+      prepared
+    ].join("\n");
+  }
+  const lines = ["Git working trees for this task are mounted at:", ...paths.map((path) => `- ${path}`)];
+  lines.push("Choose the appropriate working tree for the task before inspecting or modifying files.");
+  return `${lines.join("\n")}
+
+${prepared}`;
+}
+
+// src/internal/utils/tool-permissions.ts
+function canonicalToolName(name) {
+  return name.trim().replace(/[^a-zA-Z0-9]+/g, "").toLowerCase();
+}
+function resolveBuiltinTools(tools, options = {}) {
+  const permissionByName = /* @__PURE__ */ new Map();
+  for (const [name, permission] of Object.entries(tools.permissions ?? {})) {
+    permissionByName.set(canonicalToolName(name), permission);
+  }
+  const supportedByName = options.supportedWireNames ? new Map([...options.supportedWireNames].map((name) => [canonicalToolName(name), name])) : void 0;
+  return tools.builtin.flatMap((configuredName) => {
+    const candidate = options.toWireName?.(configuredName) ?? configuredName;
+    const wireName = supportedByName?.get(canonicalToolName(candidate)) ?? (supportedByName ? void 0 : candidate);
+    if (!wireName) return [];
+    return [
+      {
+        configuredName,
+        wireName,
+        permission: permissionByName.get(canonicalToolName(configuredName)) ?? tools.default_permission ?? "allow"
+      }
+    ];
+  });
+}
+function toPermissionPolicy(permission) {
+  return { type: permission === "ask" ? "always_ask" : "always_allow" };
+}
+function permissionOverridesFromWire(configs, toConfigName = (name) => name) {
+  const permissions = {};
+  for (const config of configs) {
+    if (config.enabled === false) continue;
+    const rawPolicy = config.permission_policy;
+    const type = typeof rawPolicy === "string" ? rawPolicy : rawPolicy && typeof rawPolicy === "object" ? rawPolicy.type : void 0;
+    if (type === "always_ask") permissions[toConfigName(config.name)] = "ask";
+    else if (type === "always_allow") permissions[toConfigName(config.name)] = "allow";
+  }
+  return Object.keys(permissions).length ? permissions : void 0;
+}
+
+// src/internal/providers/session-resource-mapper.ts
+function resolveGithubRepositoryMountPath(provider, resource) {
+  return resolveRepositoryMountPath(provider, resource);
+}
+function mapGithubRepositorySessionResource(resource, options = {}) {
+  const entry = {
+    type: "github_repository",
+    url: options.mapUrl?.(resource.url) ?? resource.url,
+    authorization_token: resource.authorization_token
+  };
+  if (resource.checkout?.branch) entry.checkout = { type: "branch", name: resource.checkout.branch };
+  else if (resource.checkout?.commit) entry.checkout = { type: "commit", sha: resource.checkout.commit };
+  const mountPath = options.mapMountPath?.(resource) ?? resource.mount_path;
+  if (mountPath) entry.mount_path = mountPath;
+  return entry;
+}
+
 // src/internal/providers/claude/mapper.ts
 var CLAUDE_BUILTINS = /* @__PURE__ */ new Set(["read", "write", "edit", "bash", "glob", "grep", "web_search", "web_fetch"]);
+function normalizeGithubRepositoryUrlForClaude(url) {
+  return url.replace(/\.git\/?$/, "");
+}
 function credToDecl(raw, vaultName) {
   const auth = raw.auth ?? {};
   const name = raw.display_name || raw.id || "credential";
@@ -921,6 +1136,7 @@ function agentToDecl(raw) {
   const skills = raw.skills;
   const multiagent = raw.multiagent;
   let builtinTools;
+  let builtinPermissions;
   let allToolsEnabled = false;
   if (tools?.length) {
     const toolset = tools.find((t) => t.type === "agent_toolset_20260401");
@@ -929,6 +1145,7 @@ function agentToDecl(raw) {
       const configs = toolset.configs ?? [];
       if (configs.length > 0) {
         builtinTools = configs.filter((c) => c.enabled !== false).map((c) => c.name);
+        builtinPermissions = permissionOverridesFromWire(configs);
       } else if (defaultConfig?.enabled) {
         allToolsEnabled = true;
       }
@@ -955,7 +1172,7 @@ function agentToDecl(raw) {
   }
   let toolsDecl;
   if (builtinTools?.length) {
-    toolsDecl = { builtin: builtinTools };
+    toolsDecl = { builtin: builtinTools, permissions: builtinPermissions };
   } else if (allToolsEnabled) {
     toolsDecl = {
       builtin: ["read", "write", "edit", "bash", "glob", "grep", "web_search", "web_fetch"]
@@ -1015,16 +1232,11 @@ function mapAgent(name, decl, refs, version, projectName) {
     body.metadata = decl.metadata;
   }
   if (decl.tools) {
-    const toolConfigs = decl.tools.builtin.filter((toolName) => CLAUDE_BUILTINS.has(toolName)).map((toolName) => {
-      const permission = decl.tools?.permissions?.[toolName] ?? "allow";
-      return {
-        name: toolName,
-        enabled: true,
-        permission_policy: {
-          type: permission === "ask" ? "always_ask" : "always_allow"
-        }
-      };
-    });
+    const toolConfigs = resolveBuiltinTools(decl.tools, { supportedWireNames: CLAUDE_BUILTINS }).map((tool) => ({
+      name: tool.wireName,
+      enabled: true,
+      permission_policy: toPermissionPolicy(tool.permission)
+    }));
     body.tools = [
       {
         type: "agent_toolset_20260401",
@@ -1140,7 +1352,7 @@ function mapDeploymentResources(decl, refs, uploadedFiles) {
     } else if (r.type === "github_repository") {
       const entry = {
         type: "github_repository",
-        url: r.url
+        url: normalizeGithubRepositoryUrlForClaude(r.url)
       };
       if (r.authorization_token) entry.authorization_token = r.authorization_token;
       if (r.checkout?.branch) {
@@ -1269,8 +1481,16 @@ function mapSession(bindings) {
     resources.push({
       type: "file",
       file_id: f.file_id,
-      mount_path: f.mount_path
+      mount_path: resolveSandboxMountPath("claude", f.mount_path)
     });
+  for (const resource of bindings.resources ?? []) {
+    resources.push(
+      mapGithubRepositorySessionResource(resource, {
+        mapUrl: normalizeGithubRepositoryUrlForClaude,
+        mapMountPath: (item) => resolveGithubRepositoryMountPath("claude", item)
+      })
+    );
+  }
   if (resources.length) body.resources = resources;
   return body;
 }
@@ -1749,6 +1969,7 @@ registerProvider({
   name: "claude",
   configSchema: claudeConfigSchema,
   capabilities: CLAUDE_CAPABILITIES,
+  features: { tool_permissions: true, session_resources: ["github_repository"] },
   createAdapter: (config, projectName) => {
     const c = config;
     return new ClaudeAdapter(c.api_key, c.beta, projectName);
@@ -1757,7 +1978,7 @@ registerProvider({
 
 // src/internal/providers/qoder/adapter.ts
 import { readFileSync as readFileSync2 } from "fs";
-import { basename as basename3, dirname as dirname2, resolve as resolve2 } from "path";
+import { basename as basename2, dirname as dirname2, resolve as resolve2 } from "path";
 import JSZip2 from "jszip";
 
 // src/internal/providers/qoder/client.ts
@@ -1782,57 +2003,6 @@ var QoderClient = class extends BaseApiClient {
   }
 };
 
-// src/internal/utils/sandbox-mount.ts
-var AGENTS_SESSION_PREFIX = "/mnt/session";
-function joinAbsolute(prefix, sub) {
-  const left = prefix.replace(/\/+$/, "");
-  const right = sub.replace(/^\/+/, "");
-  return `${left}/${right}`;
-}
-function basename2(p) {
-  const trimmed = p.replace(/\/+$/, "");
-  const idx = trimmed.lastIndexOf("/");
-  return idx === -1 ? trimmed : trimmed.slice(idx + 1);
-}
-function resolveSandboxMountPath(provider, mountPath) {
-  switch (provider) {
-    case "ark":
-    case "bailian":
-    case "claude":
-      return joinAbsolute(AGENTS_SESSION_PREFIX, mountPath);
-    case "qoder":
-      return joinAbsolute("/data", basename2(mountPath));
-    default:
-      return mountPath;
-  }
-}
-function composeFileMountHint(files, provider) {
-  if (!files || files.length === 0) return "";
-  const lines = files.map((f) => `- ${resolveSandboxMountPath(provider, f.mount_path)}`);
-  return [
-    "The user uploaded files. They are available at the following sandbox paths:",
-    ...lines,
-    "Read them from these paths when relevant."
-  ].join("\n");
-}
-function prependFileHint(prompt, files, provider) {
-  const hint = composeFileMountHint(files, provider);
-  if (!hint) return prompt;
-  return `${hint}
-
-${prompt}`;
-}
-var FILE_MENTION_SENTINEL_RE = /\u27E6file:(.+?)\u27E7/g;
-function rewriteFileMentions(prompt, provider) {
-  return prompt.replace(
-    FILE_MENTION_SENTINEL_RE,
-    (_match, mountPath) => resolveSandboxMountPath(provider, mountPath)
-  );
-}
-function preparePromptForProvider(prompt, files, provider) {
-  return prependFileHint(rewriteFileMentions(prompt, provider), files, provider);
-}
-
 // src/internal/providers/qoder/mapper.ts
 function toPascalCase(name) {
   return name.replace(/([a-z])([A-Z])/g, "$1 $2").replace(/[^a-zA-Z0-9]+/g, " ").trim().split(/\s+/).map((part) => part.charAt(0).toUpperCase() + part.slice(1).toLowerCase()).join("");
@@ -1945,6 +2115,7 @@ function agentToDecl2(raw) {
   const mcpServers = raw.mcp_servers;
   const skills = raw.skills;
   let builtinTools;
+  let builtinPermissions;
   if (tools?.length) {
     const toolset = tools.find((t) => t.type === "agent_toolset_20260401");
     if (toolset && Array.isArray(toolset.enabled_tools)) {
@@ -1952,6 +2123,7 @@ function agentToDecl2(raw) {
     } else if (toolset) {
       const configs = toolset.configs ?? [];
       builtinTools = configs.filter((c) => c.enabled !== false).map((c) => normalizeToolNameFromQoder(c.name));
+      builtinPermissions = permissionOverridesFromWire(configs, normalizeToolNameFromQoder);
     }
   }
   let mcpServerDecls;
@@ -1973,7 +2145,7 @@ function agentToDecl2(raw) {
     description: raw.description,
     model: raw.model,
     instructions: raw.system,
-    tools: builtinTools?.length ? { builtin: builtinTools } : void 0,
+    tools: builtinTools?.length ? { builtin: builtinTools, permissions: builtinPermissions } : void 0,
     mcp_servers: mcpServerDecls,
     skills: skillDecls,
     metadata: stripAgentsMetadata(raw.metadata)
@@ -2106,11 +2278,14 @@ function mapAgent2(name, decl, refs, version, projectName) {
     body.metadata = decl.metadata;
   }
   if (decl.tools) {
-    const enabledTools = decl.tools.builtin.map((t) => normalizeToolNameForQoder(t));
     body.tools = [
       {
         type: "agent_toolset_20260401",
-        enabled_tools: enabledTools
+        configs: resolveBuiltinTools(decl.tools, { toWireName: normalizeToolNameForQoder }).map((tool) => ({
+          name: tool.wireName,
+          enabled: true,
+          permission_policy: toPermissionPolicy(tool.permission)
+        }))
       }
     ];
   } else {
@@ -2168,19 +2343,14 @@ function mapForwardTemplate(name, decl, refs, projectName) {
   if (projectName) body.metadata = injectMetadata(decl.metadata, projectName, name);
   else body.metadata = decl.metadata ?? {};
   if (decl.tools) {
-    const permissions = decl.tools.permissions ?? {};
     body.tools = [
       {
         type: "agent_toolset_20260401",
-        configs: decl.tools.builtin.map((tool) => {
-          const normalized = normalizeToolNameForQoder(tool);
-          const policy = permissions[tool] ?? permissions[tool.toLowerCase()] ?? permissions[normalized];
-          return {
-            name: normalized,
-            enabled: true,
-            ...policy ? { permission_policy: { type: policy === "ask" ? "always_ask" : "always_allow" } } : {}
-          };
-        })
+        configs: resolveBuiltinTools(decl.tools, { toWireName: normalizeToolNameForQoder }).map((tool) => ({
+          name: tool.wireName,
+          enabled: true,
+          permission_policy: toPermissionPolicy(tool.permission)
+        }))
       }
     ];
   } else {
@@ -2236,6 +2406,7 @@ function toSessionEvent3(raw) {
   const rawType = raw.type ?? "";
   const type = QODER_EVENT_MAP[rawType] ?? "unknown";
   const event = { type, raw_type: rawType, raw };
+  if (typeof raw.id === "string") event.id = raw.id;
   if (typeof raw.role === "string") event.role = raw.role;
   if (type === "message") {
     event.role = roleFromType2(rawType, raw.role);
@@ -2246,12 +2417,15 @@ function toSessionEvent3(raw) {
   } else if (type === "tool_result") {
     event.content = extractContentText2(raw);
   } else if (type === "status") {
+    const stopReason = extractStopReason2(raw.stop_reason);
     if (rawType === "session.thread_status_idle") {
       event.status = "running";
+    } else if (rawType === "session.status_idle" && stopReason === "requires_action") {
+      event.status = "running";
     } else {
       event.status = rawType.includes("idle") ? "idle" : rawType.includes("terminated") ? "terminated" : "running";
     }
-    event.stop_reason = extractStopReason2(raw.stop_reason);
+    event.stop_reason = stopReason;
   } else if (type === "error") {
     event.content = extractErrorMessage2(raw);
   }
@@ -2313,6 +2487,13 @@ function mapSession2(bindings) {
   for (const id of bindings.memory_store_ids) resources.push({ type: "memory_store", memory_store_id: id });
   for (const f of bindings.files ?? [])
     resources.push({ type: "file", file_id: f.file_id, mount_path: resolveSandboxMountPath("qoder", f.mount_path) });
+  for (const resource of bindings.resources ?? []) {
+    resources.push(
+      mapGithubRepositorySessionResource(resource, {
+        mapMountPath: (item) => resolveGithubRepositoryMountPath("qoder", item)
+      })
+    );
+  }
   if (resources.length) body.resources = resources;
   return body;
 }
@@ -2893,7 +3074,7 @@ var QoderAdapter = class _QoderAdapter {
     const fullPath = resolve2(dirname2(basePath), source);
     const content = readFileSync2(fullPath);
     const formData = new FormData();
-    formData.append("file", new File([new Uint8Array(content)], basename3(fullPath)));
+    formData.append("file", new File([new Uint8Array(content)], basename2(fullPath)));
     formData.append("purpose", "session_resource");
     const res = await this.client.postFormData("/files", formData);
     return res.file_id ?? res.id;
@@ -3066,7 +3247,7 @@ var QoderAdapter = class _QoderAdapter {
   async uploadFile(filePath, options) {
     const resolved = resolve2(filePath);
     const content = readFileSync2(resolved);
-    const fileName = options?.name ?? basename3(resolved);
+    const fileName = options?.name ?? basename2(resolved);
     return this.uploadFileContent(new Uint8Array(content), fileName, {
       purpose: options?.purpose
     });
@@ -3191,6 +3372,7 @@ registerProvider({
   name: "qoder",
   configSchema: qoderConfigSchema,
   capabilities: QODER_CAPABILITIES,
+  features: { tool_permissions: true, session_resources: ["github_repository"] },
   createAdapter: (config, projectName) => {
     const c = config;
     return new QoderAdapter(c.api_key, c.gateway, projectName, c.forward_gateway);
@@ -3199,7 +3381,7 @@ registerProvider({
 
 // src/internal/providers/bailian/adapter.ts
 import { readFileSync as readFileSync3 } from "fs";
-import { basename as basename4, dirname as dirname3, extname, resolve as resolve3 } from "path";
+import { basename as basename3, dirname as dirname3, extname, resolve as resolve3 } from "path";
 import JSZip3 from "jszip";
 
 // src/internal/providers/bailian/client.ts
@@ -3211,7 +3393,13 @@ var BailianClient = class extends BaseApiClient {
   constructor(config) {
     super();
     this.apiKey = config.apiKey;
-    this.baseUrl = config.baseUrl ?? `https://${config.workspaceId}.cn-beijing.maas.aliyuncs.com/api/v1/agentstudio`;
+    if (config.baseUrl) {
+      this.baseUrl = config.baseUrl;
+    } else if (config.workspaceId) {
+      this.baseUrl = `https://${config.workspaceId}.cn-beijing.maas.aliyuncs.com/api/v1/agentstudio`;
+    } else {
+      throw new UserError("bailian provider requires either base_url or workspace_id");
+    }
   }
   headers() {
     return {
@@ -3393,8 +3581,8 @@ function mapAgent3(name, decl, refs, version, projectName, skillVersions) {
   }
   const BAILIAN_BUILTINS = /* @__PURE__ */ new Set(["bash", "read", "write", "edit", "glob", "grep", "download_file"]);
   if (decl.tools) {
-    const toolConfigs = decl.tools.builtin.filter((t) => BAILIAN_BUILTINS.has(t)).map((toolName) => ({
-      name: toolName,
+    const toolConfigs = resolveBuiltinTools(decl.tools, { supportedWireNames: BAILIAN_BUILTINS }).map((tool) => ({
+      name: tool.wireName,
       enabled: true
     }));
     body.tools = [
@@ -3456,7 +3644,13 @@ function mapSession3(bindings) {
   if (bindings.metadata) body.metadata = bindings.metadata;
   if (bindings.vault_ids.length) body.vault_ids = bindings.vault_ids;
   const resources = [];
-  for (const f of bindings.files ?? []) resources.push({ type: "file", file_id: f.file_id, mount_path: f.mount_path });
+  for (const f of bindings.files ?? []) {
+    resources.push({
+      type: "file",
+      file_id: f.file_id,
+      mount_path: resolveSandboxMountPath("bailian", f.mount_path)
+    });
+  }
   if (resources.length) body.resources = resources;
   if (bindings.memory_store_ids.length) body.memory_store_ids = bindings.memory_store_ids;
   return body;
@@ -3904,7 +4098,7 @@ var BailianAdapter = class _BailianAdapter {
     const fullPath = resolve3(dirname3(basePath), source);
     const content = readFileSync3(fullPath);
     const formData = new FormData();
-    formData.append("file", new File([new Uint8Array(content)], basename4(fullPath)));
+    formData.append("file", new File([new Uint8Array(content)], basename3(fullPath)));
     const res = await this.client.postFormData("/files", formData);
     const fileId = res.id;
     await this.waitForFileAvailable(fileId);
@@ -3969,7 +4163,7 @@ var BailianAdapter = class _BailianAdapter {
   async uploadFile(filePath, options) {
     const resolved = resolve3(filePath);
     const content = readFileSync3(resolved);
-    const fileName = options?.name ?? basename4(resolved);
+    const fileName = options?.name ?? basename3(resolved);
     return this.uploadFileContent(new Uint8Array(content), fileName, {
       purpose: options?.purpose
     });
@@ -4105,8 +4299,10 @@ var BAILIAN_CAPABILITIES = {
 import { z as z3 } from "zod";
 var bailianConfigSchema = z3.object({
   api_key: z3.string(),
-  workspace_id: z3.string(),
+  workspace_id: z3.string().optional(),
   base_url: z3.string().optional()
+}).refine((config) => Boolean(config.workspace_id || config.base_url), {
+  message: "either workspace_id or base_url is required"
 });
 
 // src/internal/providers/bailian/index.ts
@@ -4114,6 +4310,7 @@ registerProvider({
   name: "bailian",
   configSchema: bailianConfigSchema,
   capabilities: BAILIAN_CAPABILITIES,
+  features: { tool_permissions: false, session_resources: [] },
   createAdapter: (config, projectName) => {
     const c = config;
     return new BailianAdapter(c.api_key, c.workspace_id, c.base_url, projectName);
@@ -4122,7 +4319,7 @@ registerProvider({
 
 // src/internal/providers/ark/adapter.ts
 import { readFileSync as readFileSync4 } from "fs";
-import { basename as basename5, dirname as dirname4, resolve as resolve4 } from "path";
+import { basename as basename4, dirname as dirname4, resolve as resolve4 } from "path";
 import JSZip4 from "jszip";
 
 // src/internal/providers/resource-naming.ts
@@ -4247,6 +4444,7 @@ function agentToDecl4(raw) {
   const skills = raw.skills;
   const multiagent = raw.multiagent;
   let builtinTools;
+  let builtinPermissions;
   let allToolsEnabled = false;
   if (tools?.length) {
     const toolset = tools.find((t) => t.type === "agent_toolset_20260701");
@@ -4255,6 +4453,7 @@ function agentToDecl4(raw) {
       const configs = toolset.configs ?? [];
       if (configs.length > 0) {
         builtinTools = configs.filter((c) => c.enabled !== false).map((c) => c.name);
+        builtinPermissions = permissionOverridesFromWire(configs);
       } else if (defaultConfig?.enabled) {
         allToolsEnabled = true;
       }
@@ -4285,7 +4484,7 @@ function agentToDecl4(raw) {
   }
   let toolsDecl;
   if (builtinTools?.length) {
-    toolsDecl = { builtin: builtinTools };
+    toolsDecl = { builtin: builtinTools, permissions: builtinPermissions };
   } else if (allToolsEnabled) {
     toolsDecl = {
       builtin: ["read", "write", "edit", "bash", "glob", "grep", "web_search", "web_fetch"]
@@ -4346,16 +4545,11 @@ function mapAgent4(name, decl, refs, version, projectName) {
     body.metadata = decl.metadata;
   }
   if (decl.tools) {
-    const toolConfigs = decl.tools.builtin.filter((toolName) => ARK_BUILTINS.has(toolName)).map((toolName) => {
-      const permission = decl.tools?.permissions?.[toolName] ?? "allow";
-      return {
-        name: toolName,
-        enabled: true,
-        permission_policy: {
-          type: permission === "ask" ? "always_ask" : "always_allow"
-        }
-      };
-    });
+    const toolConfigs = resolveBuiltinTools(decl.tools, { supportedWireNames: ARK_BUILTINS }).map((tool) => ({
+      name: tool.wireName,
+      enabled: true,
+      permission_policy: toPermissionPolicy(tool.permission)
+    }));
     body.tools = [
       {
         type: "agent_toolset_20260701",
@@ -4510,7 +4704,7 @@ function mapSession4(bindings) {
     resources.push({
       type: "file",
       file_id: f.file_id,
-      mount_path: f.mount_path
+      mount_path: resolveSandboxMountPath("ark", f.mount_path)
     });
   if (resources.length) body.resources = resources;
   return body;
@@ -4784,7 +4978,7 @@ var ArkAdapter = class _ArkAdapter {
     const fullPath = resolve4(dirname4(basePath), source);
     const content = readFileSync4(fullPath);
     const formData = new FormData();
-    formData.append("file", new File([new Uint8Array(content)], basename5(fullPath)));
+    formData.append("file", new File([new Uint8Array(content)], basename4(fullPath)));
     formData.append("purpose", "agent");
     const res = await this.client.postFormData("/files", formData);
     return res.file_id ?? res.id;
@@ -4833,7 +5027,7 @@ var ArkAdapter = class _ArkAdapter {
   async uploadFile(filePath, options) {
     const resolved = resolve4(filePath);
     const content = readFileSync4(resolved);
-    const fileName = options?.name ?? basename5(resolved);
+    const fileName = options?.name ?? basename4(resolved);
     return this.uploadFileContent(new Uint8Array(content), fileName, {
       purpose: options?.purpose
     });
@@ -4914,6 +5108,7 @@ registerProvider({
   name: "ark",
   configSchema: arkConfigSchema,
   capabilities: ARK_CAPABILITIES,
+  features: { tool_permissions: true, session_resources: [] },
   createAdapter: (config, projectName) => {
     const c = config;
     return new ArkAdapter(c.api_key, projectName);
@@ -5026,7 +5221,7 @@ async function resolveFileReferences(config, configPath) {
 }
 
 // src/internal/parser/resolve-project-config.ts
-import { basename as basename6, dirname as dirname7, resolve as resolve7 } from "path";
+import { basename as basename5, dirname as dirname7, resolve as resolve7 } from "path";
 
 // src/internal/parser/schema.ts
 import { z as z5 } from "zod";
@@ -5171,8 +5366,32 @@ var mcpToolkitSchema = z5.object({
 }));
 var toolsSchema = z5.object({
   builtin: z5.array(z5.string()),
+  default_permission: z5.enum(["allow", "ask"]).optional(),
   mcp: z5.array(mcpToolkitSchema).optional(),
   permissions: z5.record(z5.string(), z5.enum(["allow", "ask"])).optional()
+}).superRefine((tools, ctx) => {
+  const enabled = new Set(tools.builtin.map(canonicalToolName));
+  const seen = /* @__PURE__ */ new Map();
+  for (const key of Object.keys(tools.permissions ?? {})) {
+    const canonical = canonicalToolName(key);
+    const previous = seen.get(canonical);
+    if (previous) {
+      ctx.addIssue({
+        code: "custom",
+        path: ["permissions", key],
+        message: `duplicates permission key '${previous}' after tool-name normalization`
+      });
+    } else {
+      seen.set(canonical, key);
+    }
+    if (!enabled.has(canonical)) {
+      ctx.addIssue({
+        code: "custom",
+        path: ["permissions", key],
+        message: `references tool '${key}' which is not enabled in tools.builtin`
+      });
+    }
+  }
 });
 var multiagentSchema = z5.object({
   type: z5.literal("coordinator"),
@@ -5193,6 +5412,15 @@ var agentSkillRefSchema = z5.object({
 var agentDeliverySchema = z5.object({
   type: z5.enum(["managed", "forward"])
 });
+var sessionGithubRepoResourceSchema = z5.object({
+  type: z5.literal("github_repository"),
+  url: z5.string().url(),
+  checkout: z5.object({ branch: z5.string().min(1).optional(), commit: z5.string().min(1).optional() }).refine((value) => !(value.branch && value.commit), {
+    message: "checkout accepts either branch or commit, not both"
+  }).optional(),
+  mount_path: z5.string().optional(),
+  authorization_token: z5.string().min(1)
+});
 var agentSchema = z5.object({
   name: z5.string().optional(),
   description: z5.string().optional(),
@@ -5206,6 +5434,7 @@ var agentSchema = z5.object({
   skills: z5.array(z5.union([z5.string(), agentSkillRefSchema])).optional(),
   vault: z5.string().optional(),
   memory_stores: z5.array(z5.string()).optional(),
+  resources: z5.array(sessionGithubRepoResourceSchema).optional(),
   multiagent: multiagentSchema.optional(),
   metadata: z5.record(z5.string(), z5.string()).optional(),
   delivery: z5.record(z5.string(), agentDeliverySchema).optional()
@@ -5345,7 +5574,7 @@ async function loadConfig(filePath, resolveEnv = false) {
 // src/internal/parser/resolve-project-config.ts
 async function resolveProjectConfig(filePath, options = {}) {
   const configPath = resolve7(filePath);
-  const projectName = options.projectName ?? basename6(dirname7(configPath));
+  const projectName = options.projectName ?? basename5(dirname7(configPath));
   const { config: parsed, errors } = await loadConfig(configPath, options.resolveEnv ?? true);
   if (errors.length > 0) {
     throw new UserError(errors.join("\n"));
@@ -5757,7 +5986,7 @@ import { readFileSync as readFileSync7, statSync as statSync3 } from "fs";
 import { dirname as dirname9, resolve as resolve10 } from "path";
 async function resolveSkillFiles(decl, ctx) {
   if (/^https?:\/\//i.test(decl.source)) {
-    const res = await fetch(decl.source);
+    const res = await resolveFetch()(decl.source);
     if (!res.ok) throw new Error(`skill source \u4E0B\u8F7D\u5931\u8D25\uFF1A${res.status} ${decl.source}`);
     return extractSkillZipFiles(Buffer.from(await res.arrayBuffer()));
   }
@@ -6605,6 +6834,43 @@ function collectProviderCapabilities(config, providers, diagnostics) {
     for (const [name, agent] of Object.entries(config.agents ?? {})) {
       if (agent.provider && agent.provider !== providerName) continue;
       const delivery = agent.delivery?.[providerName]?.type ?? "managed";
+      const address = {
+        type: delivery === "forward" ? "template" : "agent",
+        name,
+        provider: providerName
+      };
+      const asksForApproval = agent.tools?.default_permission === "ask" || Object.values(agent.tools?.permissions ?? {}).some((permission) => permission === "ask");
+      if (asksForApproval && !def.features.tool_permissions) {
+        diagnostics.error(
+          `${providerName}.agent.tool_permissions.unsupported`,
+          `agent.${name}: provider '${providerName}' cannot enforce interactive tool permission 'ask'.`,
+          address
+        );
+      }
+      for (const resource of agent.resources ?? []) {
+        if (!def.features.session_resources.includes(resource.type)) {
+          diagnostics.error(
+            `${providerName}.agent.session_resource.${resource.type}.unsupported`,
+            `agent.${name}: provider '${providerName}' does not support Session resource type '${resource.type}'.`,
+            address
+          );
+        }
+        const mountPrefix = providerMountPrefix(providerName);
+        if (mountPrefix && resource.mount_path && resource.mount_path !== mountPrefix && !resource.mount_path.startsWith(`${mountPrefix}/`)) {
+          diagnostics.error(
+            `${providerName}.agent.session_resource.mount_path.invalid`,
+            `agent.${name}: ${providerName} Session resource mount_path must start with '${mountPrefix}/'.`,
+            address
+          );
+        }
+      }
+      if (delivery === "forward" && agent.resources?.length) {
+        diagnostics.error(
+          `${providerName}.template.session_resources.unsupported`,
+          `agent.${name}: Forward delivery cannot attach Agent Session resources; use managed delivery.`,
+          address
+        );
+      }
       if (delivery === "forward" && !isSupported(caps, "template")) {
         diagnostics.error(
           `${providerName}.agent.delivery.forward.unsupported`,
@@ -8107,7 +8373,21 @@ function buildSessionBindings(agentName, config, provider, state, options = {})
     const available = Object.keys(config.agents ?? {}).join(", ");
     throw new UserError(`Agent '${agentName}' not found in config. Available agents: ${available || "(none)"}`);
   }
+  const sessionResources = options.resources ?? agent.resources;
+  const providerFeatures = getProvider(provider)?.features;
+  for (const resource of sessionResources ?? []) {
+    if (!providerFeatures?.session_resources.includes(resource.type)) {
+      throw new UserError(
+        `Provider '${provider}' does not support Session resource type '${resource.type}' for agent '${agentName}'.`
+      );
+    }
+  }
   if (resolveAgentMaterialization(provider, agent).resourceType === "template") {
+    if (sessionResources?.length) {
+      throw new UserError(
+        `Forward session for '${agentName}' cannot attach Agent resources. Use managed delivery for GitHub repositories.`
+      );
+    }
     const templateId = requireRef(state, { type: "template", name: agentName, provider });
     const defaultIdentity = config.defaults?.identity;
     const identityId = options.identityId ?? (defaultIdentity ? requireRef(state, { type: "identity", name: defaultIdentity, provider }) : void 0);
@@ -8165,6 +8445,7 @@ function buildSessionBindings(agentName, config, provider, state, options = {})
     vault_ids: vaultIds,
     memory_store_ids: memoryStoreIds,
     files: (options.files ?? []).map((f) => ({ file_id: f.fileId, mount_path: f.mountPath })),
+    resources: sessionResources,
     title: options.title,
     metadata: options.metadata
   };
@@ -8534,6 +8815,7 @@ function toAgentSkillRef(skill) {
 var TERMINAL_SESSION_STATUSES = /* @__PURE__ */ new Set(["idle", "completed", "failed", "terminated", "deleted"]);
 var DEFAULT_POLL_INTERVAL_MS = 2e3;
 var DEFAULT_POLL_TIMEOUT_MS = 10 * 60 * 1e3;
+var POLL_INITIAL_INTERVAL_MS = 300;
 function resolveAgentName(agents, agentName) {
   if (agentName) return agentName;
   const names = Object.keys(agents ?? {});
@@ -8564,6 +8846,7 @@ async function createSessionForAgent(ctx, options = {}) {
     vaultIds: options.vaultIds,
     memoryStores: options.memoryStores,
     files: options.files,
+    resources: options.resources,
     title: options.title,
     metadata: options.metadata
   });
@@ -8582,6 +8865,7 @@ async function startSessionRun(ctx, prompt, options = {}) {
     vaultIds: options.vaultIds,
     memoryStores: options.memoryStores,
     files: options.files,
+    resources: options.resources,
     title: options.title,
     metadata: options.metadata
   });
@@ -8590,7 +8874,7 @@ async function startSessionRun(ctx, prompt, options = {}) {
     agentName,
     provider,
     session,
-    events: streamMessageEvents(adapter2, session.id, preparePromptForProvider(prompt, bindings.files, provider))
+    events: streamMessageEvents(adapter2, session.id, prepareInitialSessionPrompt(prompt, bindings, provider))
   };
 }
 function streamMessageEvents(adapter2, sessionId, message) {
@@ -8604,15 +8888,12 @@ async function sendSessionMessageStreaming(ctx, sessionId, message, options = {}
   return streamMessageEvents(adapter2, sessionId, message);
 }
 async function startSessionRunPolling(ctx, prompt, options = {}) {
-  const run = await createSessionForAgent(ctx, options);
-  const adapter2 = getRuntimeProvider(ctx, run.provider);
-  const hintedPrompt = preparePromptForProvider(
-    prompt,
-    options.files?.map((f) => ({ mount_path: f.mountPath })),
-    run.provider
-  );
-  const collected = await sendSessionMessageAndCollectEvents(adapter2, run.session.id, hintedPrompt, options);
-  return { ...run, ...collected };
+  const { agentName, provider, adapter: adapter2 } = resolveSessionRuntime(ctx, options);
+  const bindings = buildSessionBindings(agentName, ctx.config, provider, ctx.state, options);
+  const session = await adapter2.createSession(bindings);
+  const initialPrompt = prepareInitialSessionPrompt(prompt, bindings, provider);
+  const collected = await sendSessionMessageAndCollectEvents(adapter2, session.id, initialPrompt, options);
+  return { agentName, provider, session, ...collected };
 }
 async function sendSessionMessageAndCollectEvents(adapter2, sessionId, message, options = {}) {
   const eventId = await adapter2.sendSessionMessage(sessionId, message);
@@ -8628,8 +8909,9 @@ async function sendSessionMessagePolling(ctx, sessionId, message, options = {})
 }
 async function collectEventsUntilTerminal(adapter2, sessionId, options = {}) {
   const start = Date.now();
-  const pollIntervalMs = options.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
+  const maxPollIntervalMs = options.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
   const pollTimeoutMs = options.pollTimeoutMs ?? DEFAULT_POLL_TIMEOUT_MS;
+  let currentIntervalMs = Math.min(POLL_INITIAL_INTERVAL_MS, maxPollIntervalMs);
   let terminalStatus = "idle";
   let result;
   if (options.afterId) {
@@ -8646,7 +8928,8 @@ async function collectEventsUntilTerminal(adapter2, sessionId, options = {}) {
         terminalStatus = terminalEvent.status;
         break;
       }
-      await delay(pollIntervalMs);
+      await delay(currentIntervalMs);
+      currentIntervalMs = Math.min(currentIntervalMs * 2, maxPollIntervalMs);
     }
   } else {
     while (true) {
@@ -8656,7 +8939,8 @@ async function collectEventsUntilTerminal(adapter2, sessionId, options = {}) {
         terminalStatus = session.status;
         break;
       }
-      await delay(pollIntervalMs);
+      await delay(currentIntervalMs);
+      currentIntervalMs = Math.min(currentIntervalMs * 2, maxPollIntervalMs);
     }
     result = await adapter2.listSessionEvents(sessionId, { limit: 100 });
   }
@@ -8804,7 +9088,28 @@ function buildAgentNameByRemoteId(ctx, provider) {
 }
 async function* streamWithResume(adapter2, sessionId, message) {
   const eventId = await adapter2.sendSessionMessage(sessionId, message);
-  yield* adapter2.streamSessionEvents(sessionId, eventId ? { after_id: eventId } : void 0);
+  let lastEventId = eventId;
+  let reachedTerminal = false;
+  let reconnectIntervalMs = POLL_INITIAL_INTERVAL_MS;
+  const start = Date.now();
+  while (!reachedTerminal) {
+    assertNotTimedOut(start, DEFAULT_POLL_TIMEOUT_MS);
+    for await (const event of adapter2.streamSessionEvents(
+      sessionId,
+      lastEventId ? { after_id: lastEventId } : void 0
+    )) {
+      if (event.id) lastEventId = event.id;
+      yield event;
+      if (event.type === "status" && isTerminalSessionStatus(event.status)) {
+        reachedTerminal = true;
+        break;
+      }
+    }
+    if (!reachedTerminal) {
+      await delay(reconnectIntervalMs);
+      reconnectIntervalMs = Math.min(reconnectIntervalMs * 2, DEFAULT_POLL_INTERVAL_MS);
+    }
+  }
 }
 async function* streamConnectBeforeSend(adapter2, sessionId, message) {
   const iterator = adapter2.streamSessionEvents(sessionId)[Symbol.asyncIterator]();
@@ -8861,7 +9166,11 @@ function resolveActiveProvider() {
 }
 function areRuntimeCredentialsReady() {
   const provider = resolveActiveProvider();
-  return AGENTS_PROVIDER_FIELDS[provider].every((field) => process.env[field.key]?.trim());
+  return AGENTS_PROVIDER_FIELDS[provider].every((field) => {
+    if (process.env[field.key]?.trim()) return true;
+    if (field.key === "BAILIAN_WORKSPACE_ID") return Boolean(process.env.BAILIAN_BASE_URL?.trim());
+    return false;
+  });
 }
 function isProvider(value) {
   return AGENTS_CONFIG_PROVIDERS.includes(value);
@@ -9458,9 +9767,11 @@ export {
   AgentSyncRunSchema,
   AgentSyncStatusSchema,
   AgentWithReadinessSchema,
+  ApiError,
   CloudAgentSchema,
   CloudEnvironmentSchema,
   CloudVaultSchema,
+  ConflictError,
   CreateSessionRequestSchema,
   CreateSessionResponseSchema,
   DiagnosticSchema,
@@ -9551,6 +9862,7 @@ export {
   pauseDeploymentForContext,
   planDestroyProjectContext,
   planProjectContext,
+  prepareInitialSessionPrompt,
   preparePromptForProvider,
   prependFileHint,
   providerConfigPath,
@@ -9560,12 +9872,14 @@ export {
   resolveProjectConfig,
   resolveProjectConfigFromObject,
   resolveProviderConfigFromEnv,
+  resolveRepositoryMountPath,
   resolveSessionProvider,
   resolveSyncProvider,
   rewriteFileMentions,
   runDeploymentForContext,
   sendSessionMessagePolling,
   sendSessionMessageStreaming,
+  setDefaultFetch,
   startSessionRun,
   startSessionRunPolling,
   streamSessionEvents,