agor-live 0.22.0 → 0.23.2

package/dist/daemon/widgets/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/widgets/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH,YAAY,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAC1E,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC3E,YAAY,EACV,mBAAmB,EACnB,sBAAsB,EACtB,sBAAsB,EACtB,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEnE;;;GAGG;AACH,wBAAgB,kBAAkB,IAAI,IAAI,CAEzC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/widgets/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAKH,YAAY,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAC1E,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC3E,YAAY,EACV,mBAAmB,EACnB,sBAAsB,EACtB,sBAAsB,EACtB,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEnE;;;GAGG;AACH,wBAAgB,kBAAkB,IAAI,IAAI,CAGzC"}

package/dist/daemon/widgets/index.js

@@ -5,7 +5,12 @@ var __export = (target, all) => {
 };
 
 // src/widgets/env-vars/index.ts
-import { ENV_VAR_CONSTRAINTS, isEnvVarAllowed, validateEnvVar } from "@agor/core/config";
+import {
+  ENV_VAR_CONSTRAINTS,
+  isEnvVarAllowed,
+  validateEnvVar
+} from "@agor/core/config";
+import { SessionEnvSelectionRepository } from "@agor/core/db";
 import { BadRequest } from "@agor/core/feathers";
 
 // ../../node_modules/.pnpm/zod@4.4.3/node_modules/zod/v4/classic/external.js
@@ -14542,6 +14547,23 @@ function listWidgetTypes() {
 
 // src/widgets/env-vars/index.ts
 var ENV_VAR_NAME_REGEX = ENV_VAR_CONSTRAINTS.NAME_PATTERN;
+function orderedEnvVarNames(names) {
+  return [...names].sort();
+}
+var envVarFieldMetadataSchema = external_exports.object({
+  description: external_exports.string().max(200).optional(),
+  placeholder: external_exports.string().max(120).optional(),
+  format_hint: external_exports.string().max(80).optional(),
+  input_type: external_exports.enum(["password", "text", "textarea"]).default("password").optional()
+}).strict();
+function orderedRecord(record2) {
+  if (!record2) return void 0;
+  const out = {};
+  for (const key of orderedEnvVarNames(Object.keys(record2))) {
+    out[key] = record2[key];
+  }
+  return out;
+}
 var envVarsParamsSchema = external_exports.object({
   names: external_exports.array(external_exports.string().regex(ENV_VAR_NAME_REGEX)).min(1).max(10).refine((names) => new Set(names).size === names.length, {
     message: "Env var names must be unique"
@@ -14549,50 +14571,136 @@ var envVarsParamsSchema = external_exports.object({
   reason: external_exports.string().min(1).max(200).describe(
     "One sentence explaining why you need the value(s). Keep it tight \u2014 this renders in a small muted line under the input. NOT a place to restate what the widget does."
   ),
+  variable_metadata: external_exports.record(external_exports.string().regex(ENV_VAR_NAME_REGEX), envVarFieldMetadataSchema).optional().describe(
+    "Optional per-variable display metadata keyed by requested name. Allowed keys per variable: description, placeholder, format_hint, input_type (password|text|textarea). Do not include values, defaults, examples containing secrets, or anything secret-like."
+  ),
   auto_resume: external_exports.boolean().default(true).describe(
     "When true (default), a system-authored prompt is auto-queued back into the agent on submit/dismiss."
   )
+}).superRefine((params, ctx) => {
+  const requested = new Set(params.names);
+  for (const key of Object.keys(params.variable_metadata ?? {})) {
+    if (!requested.has(key)) {
+      ctx.addIssue({
+        code: external_exports.ZodIssueCode.custom,
+        path: ["variable_metadata", key],
+        message: `Metadata key ${key} must match a requested env var name`
+      });
+    }
+  }
 });
 var envVarsSubmitSchema = external_exports.object({
   values: external_exports.record(
     external_exports.string().regex(ENV_VAR_NAME_REGEX),
     external_exports.string().min(1).max(ENV_VAR_CONSTRAINTS.MAX_VALUE_LENGTH)
-  ).refine((v) => Object.keys(v).length >= 1 && Object.keys(v).length <= 10, {
-    message: "Must submit between 1 and 10 env vars"
-  }),
+  ).default({}),
+  use_existing: external_exports.array(external_exports.string().regex(ENV_VAR_NAME_REGEX)).max(10).default([]).describe("Requested names whose already-saved global values should be used."),
   scope: external_exports.enum(["global", "session"])
+}).superRefine((submit, ctx) => {
+  const valueNames = Object.keys(submit.values);
+  const existingNames = submit.use_existing;
+  const total = valueNames.length + existingNames.length;
+  if (total < 1 || total > 10) {
+    ctx.addIssue({
+      code: external_exports.ZodIssueCode.custom,
+      message: "Must submit between 1 and 10 env vars"
+    });
+  }
+  const duplicates = existingNames.filter((name) => valueNames.includes(name));
+  for (const name of duplicates) {
+    ctx.addIssue({
+      code: external_exports.ZodIssueCode.custom,
+      path: ["use_existing"],
+      message: `Cannot both submit and use existing value for ${name}`
+    });
+  }
+  if (new Set(existingNames).size !== existingNames.length) {
+    ctx.addIssue({
+      code: external_exports.ZodIssueCode.custom,
+      path: ["use_existing"],
+      message: "use_existing names must be unique"
+    });
+  }
 });
+function fieldBadRequest(message, fieldErrors) {
+  return new BadRequest(message, { field_errors: orderedRecord(fieldErrors) });
+}
+function validationMessage(errors) {
+  return errors.map((e) => e.message).join("; ");
+}
 async function applyEnvVarsSubmit(ctx, submit, params) {
   const requestedNames = new Set(params.names);
-  const submittedNames = Object.keys(submit.values);
-  if (submittedNames.length !== params.names.length || submittedNames.some((name) => !requestedNames.has(name))) {
-    throw new BadRequest(
-      "Submitted env var names must exactly match the widget request: expected " + params.names.join(", ")
+  const submittedNames = orderedEnvVarNames(Object.keys(submit.values));
+  const useExistingNames = orderedEnvVarNames(submit.use_existing ?? []);
+  const coveredNames = orderedEnvVarNames([...submittedNames, ...useExistingNames]);
+  if (coveredNames.length !== params.names.length || coveredNames.some((name) => !requestedNames.has(name))) {
+    const missing = params.names.filter((name) => !coveredNames.includes(name));
+    const extra = coveredNames.filter((name) => !requestedNames.has(name));
+    const fieldErrors = {};
+    for (const name of missing)
+      fieldErrors[name] = "Required value or saved global value selection missing";
+    for (const name of extra) fieldErrors[name] = "This env var was not requested";
+    throw fieldBadRequest(
+      "Submitted env var names must exactly match the widget request: expected " + params.names.join(", "),
+      fieldErrors
     );
   }
   for (const name of submittedNames) {
     if (!isEnvVarAllowed(name)) {
-      throw new Error(`Cannot set environment variable "${name}": blocked by allow-list`);
+      throw fieldBadRequest(`Cannot set environment variable "${name}": blocked by allow-list`, {
+        [name]: "Blocked by allow-list"
+      });
     }
     const errors = validateEnvVar(name, submit.values[name]);
     if (errors.length > 0) {
-      throw new Error(`Invalid env var ${name}: ${errors.map((e) => e.message).join("; ")}`);
+      const message = validationMessage(errors);
+      throw fieldBadRequest(`Invalid env var ${name}: ${message}`, { [name]: message });
     }
   }
   const usersService = ctx.app.service("users");
+  if (useExistingNames.length > 0) {
+    const creator = await usersService.get(ctx.sessionCreatorUserId, {
+      user: { user_id: ctx.submitterUserId, role: ctx.submitterRole },
+      authenticated: true
+    });
+    const fieldErrors = {};
+    for (const name of useExistingNames) {
+      const meta3 = creator.env_vars?.[name];
+      if (!meta3?.set) {
+        fieldErrors[name] = "No saved value is set for this env var";
+      } else if (meta3.scope !== "global") {
+        fieldErrors[name] = "Only global saved values can be used from this widget";
+      }
+    }
+    if (Object.keys(fieldErrors).length > 0) {
+      throw fieldBadRequest("One or more saved values cannot be used", fieldErrors);
+    }
+  }
+  const orderedValues = {};
   const env_var_scopes = {};
   for (const name of submittedNames) {
+    orderedValues[name] = submit.values[name];
     env_var_scopes[name] = submit.scope;
   }
-  await usersService.patch(
-    ctx.sessionCreatorUserId,
-    { env_vars: submit.values, env_var_scopes },
-    {
-      user: { user_id: ctx.submitterUserId, role: ctx.submitterRole },
-      authenticated: true,
-      trustedEnvVarWrite: true
+  if (submittedNames.length > 0) {
+    await usersService.patch(
+      ctx.sessionCreatorUserId,
+      { env_vars: orderedValues, env_var_scopes },
+      {
+        user: { user_id: ctx.submitterUserId, role: ctx.submitterRole },
+        authenticated: true,
+        trustedEnvVarWrite: true
+      }
+    );
+  }
+  if (submit.scope === "session" && submittedNames.length > 0) {
+    const db = ctx.app.get?.("database");
+    if (db) {
+      const repo = new SessionEnvSelectionRepository(db);
+      const existing = await repo.asSet(ctx.sessionId);
+      await repo.setAll(ctx.sessionId, orderedEnvVarNames([...existing, ...submittedNames]));
     }
-  );
+  }
 }
 var envVarsWidget = {
   type: "env_vars",
@@ -14600,27 +14708,205 @@ var envVarsWidget = {
   paramsSchema: envVarsParamsSchema,
   submitSchema: envVarsSubmitSchema,
   buildResultMeta: (submit) => ({
-    names_submitted: Object.keys(submit.values),
+    names_submitted: orderedEnvVarNames(Object.keys(submit.values)),
+    ...submit.use_existing.length > 0 ? { names_used_existing: orderedEnvVarNames(submit.use_existing) } : {},
     scope: submit.scope
   }),
   applySubmit: applyEnvVarsSubmit,
-  buildAutoResumePrompt: (rm) => `[Agor] User submitted ${rm.names_submitted.join(", ")} (scope: ${rm.scope}). You can now retry the operation that needed ${rm.names_submitted.length === 1 ? "it" : "them"}.`,
-  buildDismissedPrompt: (params) => `[Agor] User dismissed the request for ${params.names.join(", ")}. Do not re-request immediately \u2014 ask whether to proceed without, or move on to other work.`
+  buildAutoResumePrompt: (rm) => {
+    const existing = orderedEnvVarNames(rm.names_used_existing ?? []);
+    const names = orderedEnvVarNames([...rm.names_submitted, ...existing]);
+    const savedPart = rm.names_submitted.length > 0 ? `saved ${orderedEnvVarNames(rm.names_submitted).join(", ")} (scope: ${rm.scope})` : "";
+    const existingPart = existing.length > 0 ? `used existing ${existing.join(", ")} (scope: global)` : "";
+    const action = [savedPart, existingPart].filter(Boolean).join(" and ");
+    return `[Agor] User ${action}. You can now retry the operation that needed ${names.length === 1 ? "it" : "them"}.`;
+  },
+  buildDismissedPrompt: (params) => `[Agor] User dismissed the request for ${orderedEnvVarNames(params.names).join(", ")}. Do not re-request immediately \u2014 ask whether to proceed without, or move on to other work.`
 };
 function registerEnvVarsWidget() {
   registerWidget(envVarsWidget);
 }
 
+// src/widgets/gateway-token/index.ts
+import { Forbidden } from "@agor/core/feathers";
+import {
+  GATEWAY_SENSITIVE_CONFIG_FIELDS,
+  hasMinimumRole,
+  ROLES
+} from "@agor/core/types";
+var SUPPORTED_CHANNEL_TYPES = [
+  "slack",
+  "github",
+  "teams"
+];
+function isSupportedGatewayTokenChannelType(channelType) {
+  return SUPPORTED_CHANNEL_TYPES.includes(channelType);
+}
+var MAX_TOKEN_LENGTH = 8192;
+function orderedFields(fields) {
+  return [...fields].sort();
+}
+var gatewayTokenParamsSchema = external_exports.object({
+  gatewayChannelId: external_exports.string().min(1).describe("Gateway channel whose credentials are being set."),
+  channelType: external_exports.enum(["slack", "discord", "whatsapp", "telegram", "github", "teams"]).describe("Platform type of the channel; drives per-field placeholders."),
+  channelName: external_exports.string().min(1).max(200).describe("Human-readable channel name for the form heading and prompts."),
+  fields: external_exports.array(external_exports.enum(GATEWAY_SENSITIVE_CONFIG_FIELDS)).min(1).max(GATEWAY_SENSITIVE_CONFIG_FIELDS.length).refine((fields) => new Set(fields).size === fields.length, {
+    message: "Token field names must be unique"
+  }).describe("Secret config field names to collect (subset of the sensitive fields)."),
+  reason: external_exports.string().min(1).max(200).describe("One sentence explaining why the tokens are needed. Renders as a muted line.")
+}).strict();
+var gatewayTokenSubmitSchema = external_exports.object({
+  tokens: external_exports.partialRecord(
+    external_exports.enum(GATEWAY_SENSITIVE_CONFIG_FIELDS),
+    external_exports.string().min(1).max(MAX_TOKEN_LENGTH)
+  ).describe("Map of sensitive field name \u2192 credential value.")
+}).strict();
+var submitOutcomes = /* @__PURE__ */ new WeakMap();
+var HARD_CREDENTIAL_SLACK_ERRORS = /* @__PURE__ */ new Set([
+  "invalid_auth",
+  "account_inactive",
+  "token_revoked",
+  "token_expired",
+  "not_authed",
+  "no_permission"
+]);
+function classifyGatewayTokenTest(result, appTokenExpected) {
+  const unprobable = result.failures.some((failure) => failure.capability === "connector");
+  if (unprobable) {
+    return {
+      enable: false,
+      status: "unverifiable",
+      summary: "credentials cannot be auto-verified for this channel type yet"
+    };
+  }
+  const isAppTokenFailure = (failure) => failure.capability === "app_token";
+  const hardFailure = result.failures.find(
+    (failure) => failure.slackError && HARD_CREDENTIAL_SLACK_ERRORS.has(failure.slackError) || failure.capability === "config" || appTokenExpected && isAppTokenFailure(failure)
+  );
+  if (hardFailure) {
+    return { enable: false, status: "failed", summary: hardFailure.reason };
+  }
+  if (appTokenExpected && result.appTokenValid === false) {
+    return {
+      enable: false,
+      status: "failed",
+      summary: "The app-level token is missing or invalid; Socket Mode cannot connect."
+    };
+  }
+  if (result.ok) {
+    return { enable: true, status: "verified", summary: "passed" };
+  }
+  const followUps = result.failures.filter((failure) => appTokenExpected || !isAppTokenFailure(failure)).map((failure) => failure.reason).filter(Boolean);
+  return {
+    enable: true,
+    status: "verified",
+    summary: followUps.length > 0 ? `passed, with follow-ups: ${followUps.join("; ")}` : "passed"
+  };
+}
+function assertGatewayTokenAdmin(ctx) {
+  if (!hasMinimumRole(ctx.submitterRole, ROLES.ADMIN)) {
+    throw new Forbidden("Only admins can set gateway channel tokens");
+  }
+}
+async function applyGatewayTokenSubmit(ctx, submit, params) {
+  assertGatewayTokenAdmin(ctx);
+  const channelsService = ctx.app.service("gateway-channels");
+  const channel = await channelsService.get(params.gatewayChannelId);
+  if (!channel) {
+    throw new Forbidden(`Gateway channel ${params.gatewayChannelId} not found`);
+  }
+  if (!isSupportedGatewayTokenChannelType(channel.channel_type)) {
+    throw new Forbidden(
+      `Gateway channel type "${channel.channel_type}" does not support token entry`
+    );
+  }
+  if (channel.channel_type !== params.channelType) {
+    throw new Forbidden("Gateway channel type does not match the widget request");
+  }
+  const sessionsService = ctx.app.service("sessions");
+  const session = await sessionsService.get(ctx.sessionId);
+  if (!session.branch_id || channel.target_branch_id !== session.branch_id) {
+    throw new Forbidden("Gateway channel is not bound to this session's branch");
+  }
+  const requested = new Set(params.fields);
+  const extra = Object.keys(submit.tokens).filter((field) => !requested.has(field));
+  if (extra.length > 0) {
+    throw new Forbidden(
+      `Submitted token fields were not requested: ${orderedFields(extra).join(", ")}`
+    );
+  }
+  const testService = ctx.app.service(
+    "gateway-channels/test"
+  );
+  const testResult = await testService.create({
+    gatewayChannelId: params.gatewayChannelId,
+    config: submit.tokens
+  });
+  const appTokenExpected = params.fields.includes("app_token");
+  const { enable, status, summary } = classifyGatewayTokenTest(testResult, appTokenExpected);
+  await channelsService.patch(
+    params.gatewayChannelId,
+    { config: submit.tokens, enabled: enable },
+    { user: { user_id: ctx.submitterUserId, role: ctx.submitterRole } }
+  );
+  submitOutcomes.set(submit, {
+    channelId: channel.id,
+    channelName: channel.name,
+    channelType: channel.channel_type,
+    enabled: enable,
+    unverified: status === "unverifiable",
+    test: { ok: testResult.ok, summary }
+  });
+}
+var gatewayTokenWidget = {
+  type: "gateway_token",
+  schemaVersion: 1,
+  paramsSchema: gatewayTokenParamsSchema,
+  submitSchema: gatewayTokenSubmitSchema,
+  buildResultMeta: (submit) => {
+    const outcome = submitOutcomes.get(submit);
+    return {
+      channelId: outcome?.channelId ?? "",
+      channelName: outcome?.channelName ?? "",
+      channelType: outcome?.channelType ?? "slack",
+      fieldsSet: orderedFields(Object.keys(submit.tokens)),
+      enabled: outcome?.enabled ?? false,
+      unverified: outcome?.unverified ?? false,
+      test: outcome?.test ?? { ok: false, summary: "" }
+    };
+  },
+  applySubmit: applyGatewayTokenSubmit,
+  buildAutoResumePrompt: (rm, params) => {
+    const fields = orderedFields(rm.fieldsSet).join(", ");
+    const name = rm.channelName || params.channelName;
+    const channelType = rm.channelType || params.channelType;
+    if (rm.enabled) {
+      return `[Agor] User set the ${channelType} tokens (${fields}) for channel "${name}". Channel enabled. Connection test: ${rm.test.summary || "passed"}.`;
+    }
+    if (rm.unverified) {
+      return `[Agor] Tokens saved for "${name}" (${fields}); ${channelType} credentials can't be auto-verified yet, so the channel is left disabled \u2014 enable it manually once confirmed.`;
+    }
+    return `[Agor] User set the ${channelType} tokens (${fields}) for channel "${name}", but it was left disabled; test failed: ${rm.test.summary || "unknown error"}. Ask the user to double-check the tokens/scopes.`;
+  },
+  buildDismissedPrompt: (params) => `[Agor] User declined to provide tokens for "${params.channelName}"; it stays disabled. Don't immediately re-ask.`,
+  // Dismissal is admin-only too — otherwise a member could terminally decline
+  // an admin-only credential flow via the generic dismiss endpoint.
+  authorizeDismiss: (ctx) => assertGatewayTokenAdmin(ctx)
+};
+function registerGatewayTokenWidget() {
+  registerWidget(gatewayTokenWidget);
+}
+
 // src/widgets/submissions.ts
-import { Forbidden as Forbidden2, NotAuthenticated as NotAuthenticated2, NotFound as NotFound2 } from "@agor/core/feathers";
+import { Forbidden as Forbidden3, NotAuthenticated as NotAuthenticated2, NotFound as NotFound2 } from "@agor/core/feathers";
 
 // src/utils/branch-authorization.ts
 import { shortId } from "@agor/core/db";
-import { Forbidden, NotAuthenticated, NotFound } from "@agor/core/feathers";
-import { BRANCH_PERMISSION_LEVELS, hasMinimumRole, ROLES } from "@agor/core/types";
+import { Forbidden as Forbidden2, NotAuthenticated, NotFound } from "@agor/core/feathers";
+import { BRANCH_PERMISSION_LEVELS, hasMinimumRole as hasMinimumRole2, ROLES as ROLES2 } from "@agor/core/types";
 function isSuperAdmin(role, allowSuperadmin = true) {
   if (!allowSuperadmin) return false;
-  return role === ROLES.SUPERADMIN || role === "owner";
+  return role === ROLES2.SUPERADMIN || role === "owner";
 }
 var PERMISSION_RANK = Object.fromEntries(
   BRANCH_PERMISSION_LEVELS.map((level, i) => [level, i - 1])
@@ -14687,18 +14973,26 @@ async function doResolveWidget(widgetId, action, caller, deps) {
   const isOwner = await deps.isBranchOwner(branch.branch_id, caller.user_id);
   const effectivePermission = await deps.resolveBranchPermission?.(branch, caller.user_id);
   if (!canResolveWidget(caller, session, branch, isOwner, effectivePermission)) {
-    throw new Forbidden2(
+    throw new Forbidden3(
       `You need to be the session creator, a branch owner, or have 'prompt' permission on the branch to resolve this widget.`
     );
   }
   if (widget.status !== "pending") {
-    throw new Forbidden2(
+    throw new Forbidden3(
       `Widget ${widgetId} is already ${widget.status}; cannot ${action.kind} again.`
     );
   }
   const entry = getWidget(widget.widget_type);
   let resultMeta;
   let autoResumePrompt;
+  const ctx = {
+    // biome-ignore lint/suspicious/noExplicitAny: Pass-through Feathers Application
+    app: deps.app,
+    sessionId: message.session_id,
+    submitterUserId: caller.user_id,
+    submitterRole: caller.role,
+    sessionCreatorUserId: session.created_by
+  };
   if (action.kind === "submit") {
     if (!entry) {
       throw new NotFound2(
@@ -14707,21 +15001,16 @@ async function doResolveWidget(widgetId, action, caller, deps) {
     }
     const parsed = entry.submitSchema.safeParse(action.body);
     if (!parsed.success) {
-      throw new Forbidden2(`Invalid submit payload: ${parsed.error.message}`);
+      throw new Forbidden3(`Invalid submit payload: ${parsed.error.message}`);
     }
     const submit = parsed.data;
-    const submitCtx = {
-      // biome-ignore lint/suspicious/noExplicitAny: Pass-through Feathers Application
-      app: deps.app,
-      sessionId: message.session_id,
-      submitterUserId: caller.user_id,
-      submitterRole: caller.role,
-      sessionCreatorUserId: session.created_by
-    };
-    await entry.applySubmit(submitCtx, submit, widget.params);
+    await entry.applySubmit(ctx, submit, widget.params);
     resultMeta = entry.buildResultMeta(submit);
     autoResumePrompt = entry.buildAutoResumePrompt(resultMeta, widget.params);
   } else {
+    if (entry?.authorizeDismiss) {
+      await entry.authorizeDismiss(ctx, widget.params);
+    }
     autoResumePrompt = entry ? entry.buildDismissedPrompt(widget.params) : `[Agor] User dismissed a widget request. Do not re-request immediately \u2014 ask whether to proceed without, or move on to other work.`;
   }
   const newStatus = action.kind === "submit" ? "submitted" : "dismissed";
@@ -14779,6 +15068,7 @@ async function doResolveWidget(widgetId, action, caller, deps) {
 // src/widgets/index.ts
 function registerAllWidgets() {
   registerEnvVarsWidget();
+  registerGatewayTokenWidget();
 }
 export {
   canResolveWidget,

package/dist/daemon/widgets/registry.d.ts

@@ -84,6 +84,13 @@ export interface WidgetRegistryEntry<TParams, TSubmit, TResultMeta> {
      * explicit ("don't immediately re-ask") to avoid agent loops.
      */
     buildDismissedPrompt: (params: TParams) => string;
+    /**
+     * Optional gate on WHO may dismiss this widget, run before the message is
+     * marked 'dismissed'; throw (e.g. Forbidden) to reject. Absent means any
+     * caller allowed to reach the resolve endpoint may dismiss. Admin-only
+     * widgets set this so a dismissal can't sidestep the submit-side role check.
+     */
+    authorizeDismiss?: (ctx: WidgetSubmitCtx, params: TParams) => void | Promise<void>;
 }
 type AnyWidgetEntry = WidgetRegistryEntry<unknown, unknown, unknown>;
 /**

package/dist/daemon/widgets/registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/widgets/registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACtE,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAE7B;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,WAAW,CAAC;IACjB,yCAAyC;IACzC,SAAS,EAAE,SAAS,CAAC;IACrB,2EAA2E;IAC3E,eAAe,EAAE,MAAM,CAAC;IACxB;;;;mEAI+D;IAC/D,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,kEAAkE;IAClE,oBAAoB,EAAE,MAAM,CAAC;CAC9B;AAED;;;;;GAKG;AACH,MAAM,WAAW,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW;IAChE,2DAA2D;IAC3D,IAAI,EAAE,UAAU,CAAC;IACjB,yEAAyE;IACzE,aAAa,EAAE,MAAM,CAAC;IACtB,wEAAwE;IACxE,YAAY,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACjC,wDAAwD;IACxD,YAAY,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACjC;;;;OAIG;IACH,eAAe,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,WAAW,CAAC;IAClD;;;;;;;;OAQG;IACH,WAAW,EAAE,CAAC,GAAG,EAAE,eAAe,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACvF;;;;OAIG;IACH,qBAAqB,EAAE,CAAC,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,KAAK,MAAM,CAAC;IAC5E;;;OAGG;IACH,oBAAoB,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,MAAM,CAAC;CACnD;AAID,KAAK,cAAc,GAAG,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AAIrE;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,EAC1D,KAAK,EAAE,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,GACxD,IAAI,CASN;AAED,uEAAuE;AACvE,wBAAgB,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,cAAc,GAAG,SAAS,CAEtE;AAED,6DAA6D;AAC7D,wBAAgB,eAAe,IAAI,UAAU,EAAE,CAE9C;AAED;;GAEG;AACH,wBAAgB,4BAA4B,IAAI,IAAI,CAEnD"}
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/widgets/registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACtE,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAE7B;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,WAAW,CAAC;IACjB,yCAAyC;IACzC,SAAS,EAAE,SAAS,CAAC;IACrB,2EAA2E;IAC3E,eAAe,EAAE,MAAM,CAAC;IACxB;;;;mEAI+D;IAC/D,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,kEAAkE;IAClE,oBAAoB,EAAE,MAAM,CAAC;CAC9B;AAED;;;;;GAKG;AACH,MAAM,WAAW,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW;IAChE,2DAA2D;IAC3D,IAAI,EAAE,UAAU,CAAC;IACjB,yEAAyE;IACzE,aAAa,EAAE,MAAM,CAAC;IACtB,wEAAwE;IACxE,YAAY,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACjC,wDAAwD;IACxD,YAAY,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACjC;;;;OAIG;IACH,eAAe,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,WAAW,CAAC;IAClD;;;;;;;;OAQG;IACH,WAAW,EAAE,CAAC,GAAG,EAAE,eAAe,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACvF;;;;OAIG;IACH,qBAAqB,EAAE,CAAC,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,KAAK,MAAM,CAAC;IAC5E;;;OAGG;IACH,oBAAoB,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,MAAM,CAAC;IAClD;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,CAAC,GAAG,EAAE,eAAe,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACpF;AAID,KAAK,cAAc,GAAG,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AAIrE;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,EAC1D,KAAK,EAAE,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,GACxD,IAAI,CASN;AAED,uEAAuE;AACvE,wBAAgB,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,cAAc,GAAG,SAAS,CAEtE;AAED,6DAA6D;AAC7D,wBAAgB,eAAe,IAAI,UAAU,EAAE,CAE9C;AAED;;GAEG;AACH,wBAAgB,4BAA4B,IAAI,IAAI,CAEnD"}

package/dist/daemon/widgets/submissions.js

@@ -92,6 +92,14 @@ async function doResolveWidget(widgetId, action, caller, deps) {
   const entry = getWidget(widget.widget_type);
   let resultMeta;
   let autoResumePrompt;
+  const ctx = {
+    // biome-ignore lint/suspicious/noExplicitAny: Pass-through Feathers Application
+    app: deps.app,
+    sessionId: message.session_id,
+    submitterUserId: caller.user_id,
+    submitterRole: caller.role,
+    sessionCreatorUserId: session.created_by
+  };
   if (action.kind === "submit") {
     if (!entry) {
       throw new NotFound2(
@@ -103,18 +111,13 @@ async function doResolveWidget(widgetId, action, caller, deps) {
       throw new Forbidden2(`Invalid submit payload: ${parsed.error.message}`);
     }
     const submit = parsed.data;
-    const submitCtx = {
-      // biome-ignore lint/suspicious/noExplicitAny: Pass-through Feathers Application
-      app: deps.app,
-      sessionId: message.session_id,
-      submitterUserId: caller.user_id,
-      submitterRole: caller.role,
-      sessionCreatorUserId: session.created_by
-    };
-    await entry.applySubmit(submitCtx, submit, widget.params);
+    await entry.applySubmit(ctx, submit, widget.params);
     resultMeta = entry.buildResultMeta(submit);
     autoResumePrompt = entry.buildAutoResumePrompt(resultMeta, widget.params);
   } else {
+    if (entry?.authorizeDismiss) {
+      await entry.authorizeDismiss(ctx, widget.params);
+    }
     autoResumePrompt = entry ? entry.buildDismissedPrompt(widget.params) : `[Agor] User dismissed a widget request. Do not re-request immediately \u2014 ask whether to proceed without, or move on to other work.`;
   }
   const newStatus = action.kind === "submit" ? "submitted" : "dismissed";

package/dist/executor/commands/environment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../src/commands/environment.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,KAAK,EACV,2BAA2B,EAC3B,sBAAsB,EACtB,cAAc,EACf,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAgHjD,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CA6CzB;AAED,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,2BAA2B,EACpC,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CA6JzB"}
+{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../src/commands/environment.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,KAAK,EACV,2BAA2B,EAC3B,sBAAsB,EACtB,cAAc,EACf,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAgHjD,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CA6CzB;AAED,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,2BAA2B,EACpC,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CAiKzB"}

package/dist/executor/commands/environment.js

@@ -180,9 +180,11 @@ export async function handleEnvironmentLifecycle(payload, options) {
                     ...(branch.environment_instance?.process ?? {}),
                     started_at: startedAt,
                 },
-                last_health_check: undefined,
-                last_error: undefined,
-                last_command: undefined,
+                // This update crosses the Feathers/WebSocket JSON boundary; use null
+                // as an explicit clear sentinel because JSON drops undefined values.
+                last_health_check: null,
+                last_error: null,
+                last_command: null,
                 ...(payload.params.appUrl
                     ? { access_urls: [{ name: 'App', url: payload.params.appUrl }] }
                     : {}),
@@ -222,7 +224,9 @@ export async function handleEnvironmentLifecycle(payload, options) {
         });
         await updateBranchEnvironment(client, branchId, {
             status: 'stopped',
-            process: undefined,
+            // This update crosses the Feathers/WebSocket JSON boundary; use null
+            // as an explicit clear sentinel because JSON drops undefined values.
+            process: null,
             last_health_check: {
                 timestamp: new Date().toISOString(),
                 status: 'unknown',
@@ -230,7 +234,7 @@ export async function handleEnvironmentLifecycle(payload, options) {
                     ? 'Environment nuked - all data and volumes destroyed'
                     : 'Environment stopped',
             },
-            last_error: undefined,
+            last_error: null,
             last_command: {
                 action: payload.params.action,
                 status: 'succeeded',

package/dist/executor/commands/git.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../src/commands/git.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAuBH,OAAO,KAAK,EACV,0BAA0B,EAC1B,0BAA0B,EAC1B,sBAAsB,EACtB,oBAAoB,EACpB,cAAc,EACd,mBAAmB,EACnB,qBAAqB,EACrB,sBAAsB,EACtB,eAAe,EACf,oBAAoB,EACpB,2BAA2B,EAC5B,MAAM,qBAAqB,CAAC;AAG7B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AA2FjD;;;GAGG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CA4DzB;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CA6DzB;AAkID;;;GAGG;AACH,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,0BAA0B,EACnC,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CAuCzB;AAED;;;GAGG;AACH,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,0BAA0B,EACnC,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CAuCzB;AAED;;;GAGG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,2BAA2B,EACpC,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CA6DzB;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CA+EzB;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CA8OzB;AAyFD;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CA+TzB;AAED;;;;;GAKG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CAkMzB;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,qBAAqB,EAC9B,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CA6CzB"}
+{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../src/commands/git.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAuBH,OAAO,KAAK,EACV,0BAA0B,EAC1B,0BAA0B,EAC1B,sBAAsB,EACtB,oBAAoB,EACpB,cAAc,EACd,mBAAmB,EACnB,qBAAqB,EACrB,sBAAsB,EACtB,eAAe,EACf,oBAAoB,EACpB,2BAA2B,EAC5B,MAAM,qBAAqB,CAAC;AAG7B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AA2FjD;;;GAGG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CA4DzB;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CA6DzB;AAkID;;;GAGG;AACH,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,0BAA0B,EACnC,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CAuCzB;AAED;;;GAGG;AACH,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,0BAA0B,EACnC,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CAuCzB;AAED;;;GAGG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,2BAA2B,EACpC,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CA6DzB;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CA+EzB;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CA8OzB;AA2FD;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CA+TzB;AAED;;;;;GAKG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CAkMzB;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,qBAAqB,EAC9B,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CA6CzB"}

package/dist/executor/commands/git.js

@@ -20,7 +20,7 @@ import { existsSync, mkdirSync } from 'node:fs';
 import { join } from 'node:path';
 import { parseAgorYml, writeAgorYml } from '@agor/core/config';
 import { shortId } from '@agor/core/db';
-import { categorizeGitError, cleanBranch, cloneRepo, createBranch, createBranchAsClone, createGit, deleteBranch, deleteBranchDirectory, deleteRepoDirectory, ensureGitRemoteUrl, getReposDir, redactGitUrlCredentials, removeGitWorktree, restoreBranchFilesystem, stripGitUrlCredentials, } from '@agor/core/git';
+import { categorizeGitError, cleanBranch, cloneRepo, createBranch, createBranchAsClone, createGit, deleteBranch, deleteBranchDirectory, deleteRepoDirectory, ensureGitRemoteUrl, getReposDir, redactGitUrlCredentials, removeGitWorktree, restoreBranchFilesystem, stripGitUrlCredentials, } from '../git/index.js';
 import { createExecutorClient } from '../services/feathers-client.js';
 import { fixBranchGitDirPermissionsBasic } from './unix.js';
 /**
@@ -792,6 +792,8 @@ async function renderEnvironmentTemplates(client, branchId, repoId, unixGroup, c
             custom_context: branch.custom_context,
             unix_gid: unixGid,
             host_ip_address: hostIpAddress,
+            base_ref: branch.base_ref,
+            ref_type: branch.ref_type,
         }, branch.environment_variant);
     }
     catch (err) {

package/dist/executor/db/feathers-repositories.d.ts

@@ -71,7 +71,7 @@ export declare class FeathersSessionMCPServersRepository {
      * Executors use the session-scoped route so session-token callers can receive
      * the raw config needed to launch only their own session's MCP servers.
      */
-    listEffectiveServers(sessionId: SessionID, enabledOnly?: boolean): Promise<MCPServer[]>;
+    listEffectiveServers(sessionId: SessionID, enabledOnly?: boolean, forUserId?: string): Promise<MCPServer[]>;
     /**
      * List MCP servers for a session with relationship metadata (added_at timestamp)
      * Used to detect if servers were added after session creation
@@ -85,6 +85,22 @@ export declare class FeathersSessionMCPServersRepository {
         enabled: boolean;
     }>>;
 }
+/**
+ * MCP OAuth auth headers repository - proxies to the trusted executor route.
+ *
+ * Session-scoped MCP server reads intentionally redact OAuth access tokens in
+ * normal API payloads. Executors use this narrow route to retrieve just the
+ * launch-time Authorization header for OAuth servers that are already in the
+ * session's effective MCP scope.
+ */
+export declare class FeathersMCPOAuthAuthHeadersRepository {
+    private client;
+    constructor(client: AgorClient);
+    getAuthHeaders(mcpServerIds: MCPServerID[]): Promise<Record<string, {
+        authorization?: string;
+        error?: string;
+    }>>;
+}
 /**
  * Users Repository - proxies to 'users' Feathers service
  */
@@ -103,6 +119,7 @@ export type BranchRepository = FeathersBranchesRepository;
 export type RepoRepository = FeathersReposRepository;
 export type MCPServerRepository = FeathersMCPServersRepository;
 export type SessionMCPServerRepository = FeathersSessionMCPServersRepository;
+export type MCPOAuthAuthHeadersRepository = FeathersMCPOAuthAuthHeadersRepository;
 export type UsersRepository = FeathersUsersRepository;
 /**
  * Create all Feathers-backed repositories and services
@@ -115,6 +132,7 @@ export declare function createFeathersBackedRepositories(client: AgorClient): {
     users: FeathersUsersRepository;
     mcpServers: FeathersMCPServersRepository;
     sessionMCP: FeathersSessionMCPServersRepository;
+    mcpOAuthAuthHeaders: FeathersMCPOAuthAuthHeadersRepository;
     messagesService: import("@agor/core").MessagesService;
     tasksService: import("@agor/core").TasksService;
     tasksStreamingService: import("@agor/core").AgorService<unknown, Partial<unknown>, unknown, import("@agor/core").PatchPayload<unknown>>;