doer-agent 0.5.1 → 0.5.2

package/dist/agent-settings.js

@@ -34,13 +34,6 @@ export function createDefaultAgentSettingsConfig() {
             oauthLogin: null,
             oauthScope: null,
         },
-        aws: {
-            enabled: true,
-            accessKeyId: null,
-            defaultRegion: null,
-            secretAccessKey: null,
-            sessionToken: null,
-        },
         jira: {
             baseUrl: null,
             email: null,
@@ -63,6 +56,9 @@ export function createDefaultAgentSettingsConfig() {
             enabled: false,
             apiToken: null,
         },
+        env: {
+            variables: [],
+        },
         databases: {
             defaultConnectionId: null,
             connections: [],
@@ -167,6 +163,38 @@ function normalizeAgentDatabaseSettings(value, fallback) {
         connections,
     };
 }
+function normalizeAgentEnvironmentVariable(value) {
+    if (!value || typeof value !== "object" || Array.isArray(value)) {
+        return null;
+    }
+    const raw = value;
+    const key = normalizeEnvVarName(raw.key);
+    if (!key || typeof raw.value !== "string") {
+        return null;
+    }
+    return {
+        key,
+        value: raw.value.replace(/\r/g, ""),
+    };
+}
+function normalizeAgentEnvironmentSettings(value, fallback) {
+    if (!value || typeof value !== "object" || Array.isArray(value)) {
+        return fallback;
+    }
+    const raw = value;
+    const variablesRaw = Array.isArray(raw.variables) ? raw.variables : [];
+    const variables = [];
+    const seenKeys = new Set();
+    for (const item of variablesRaw) {
+        const normalized = normalizeAgentEnvironmentVariable(item);
+        if (!normalized || seenKeys.has(normalized.key)) {
+            continue;
+        }
+        seenKeys.add(normalized.key);
+        variables.push(normalized);
+    }
+    return { variables };
+}
 export function getAgentDatabaseConnectionById(config, connectionId) {
     const normalizedId = normalizeDatabaseConnectionId(connectionId);
     if (!normalizedId) {
@@ -188,11 +216,11 @@ export function normalizeAgentSettingsConfig(value, fallback) {
     const codex = raw.codex && typeof raw.codex === "object" ? raw.codex : {};
     const realtime = raw.realtime && typeof raw.realtime === "object" ? raw.realtime : {};
     const git = raw.git && typeof raw.git === "object" ? raw.git : {};
-    const aws = raw.aws && typeof raw.aws === "object" ? raw.aws : {};
     const jira = raw.jira && typeof raw.jira === "object" ? raw.jira : {};
     const notion = raw.notion && typeof raw.notion === "object" ? raw.notion : {};
     const slack = raw.slack && typeof raw.slack === "object" ? raw.slack : {};
     const figma = raw.figma && typeof raw.figma === "object" ? raw.figma : {};
+    const env = raw.env && typeof raw.env === "object" ? raw.env : null;
     const databases = raw.databases && typeof raw.databases === "object" ? raw.databases : null;
     return {
         general: {
@@ -218,15 +246,6 @@ export function normalizeAgentSettingsConfig(value, fallback) {
             oauthLogin: git.oauthLogin === null ? null : normalizeNullableString(git.oauthLogin) ?? base.git.oauthLogin,
             oauthScope: git.oauthScope === null ? null : normalizeNullableString(git.oauthScope) ?? base.git.oauthScope,
         },
-        aws: {
-            enabled: typeof aws.enabled === "boolean" ? aws.enabled : base.aws.enabled,
-            accessKeyId: aws.accessKeyId === null ? null : normalizeNullableString(aws.accessKeyId) ?? base.aws.accessKeyId,
-            defaultRegion: aws.defaultRegion === null ? null : normalizeNullableString(aws.defaultRegion) ?? base.aws.defaultRegion,
-            secretAccessKey: aws.secretAccessKey === null
-                ? null
-                : normalizeNullableString(aws.secretAccessKey) ?? base.aws.secretAccessKey,
-            sessionToken: aws.sessionToken === null ? null : normalizeNullableString(aws.sessionToken) ?? base.aws.sessionToken,
-        },
         jira: {
             baseUrl: jira.baseUrl === null ? null : normalizeNullableString(jira.baseUrl) ?? base.jira.baseUrl,
             email: jira.email === null ? null : normalizeNullableString(jira.email) ?? base.jira.email,
@@ -249,6 +268,7 @@ export function normalizeAgentSettingsConfig(value, fallback) {
             enabled: typeof figma.enabled === "boolean" ? figma.enabled : base.figma.enabled,
             apiToken: figma.apiToken === null ? null : normalizeNullableString(figma.apiToken) ?? base.figma.apiToken,
         },
+        env: normalizeAgentEnvironmentSettings(env, base.env),
         databases: normalizeAgentDatabaseSettings(databases, base.databases),
     };
 }
@@ -300,8 +320,6 @@ function toMaskedSecret(value) {
 export async function toAgentSettingsPublic(args) {
     const realtimeKey = toMaskedSecret(args.config.realtime.apiKey);
     const gitOauth = toMaskedSecret(args.config.git.oauthToken);
-    const awsSecret = toMaskedSecret(args.config.aws.secretAccessKey);
-    const awsSession = toMaskedSecret(args.config.aws.sessionToken);
     const jiraToken = toMaskedSecret(args.config.jira.apiToken);
     const notionToken = toMaskedSecret(args.config.notion.apiToken);
     const slackToken = toMaskedSecret(args.config.slack.botToken);
@@ -339,17 +357,6 @@ export async function toAgentSettingsPublic(args) {
             oauthLogin: args.config.git.oauthLogin,
             oauthScope: args.config.git.oauthScope,
         },
-        aws: {
-            enabled: args.config.aws.enabled,
-            accessKeyId: args.config.aws.accessKeyId,
-            defaultRegion: args.config.aws.defaultRegion,
-            hasSecretAccessKey: awsSecret.has,
-            secretAccessKeyMasked: awsSecret.masked,
-            secretAccessKeyLength: awsSecret.length,
-            hasSessionToken: awsSession.has,
-            sessionTokenMasked: awsSession.masked,
-            sessionTokenLength: awsSession.length,
-        },
         jira: {
             baseUrl: args.config.jira.baseUrl,
             email: args.config.jira.email,
@@ -380,6 +387,12 @@ export async function toAgentSettingsPublic(args) {
             apiTokenMasked: figmaToken.masked,
             apiTokenLength: figmaToken.length,
         },
+        env: {
+            variables: args.config.env.variables.map((variable) => ({
+                key: variable.key,
+                value: variable.value,
+            })),
+        },
         databases: {
             defaultConnectionId: args.config.databases.defaultConnectionId,
             connections: args.config.databases.connections.map((connection) => ({
@@ -436,11 +449,6 @@ export function normalizeAgentSettingsPatch(value) {
     move("gitOauthToken", "git", "oauthToken");
     move("gitOauthLogin", "git", "oauthLogin");
     move("gitOauthScope", "git", "oauthScope");
-    move("awsEnabled", "aws", "enabled");
-    move("awsAccessKeyId", "aws", "accessKeyId");
-    move("awsDefaultRegion", "aws", "defaultRegion");
-    move("awsSecretAccessKey", "aws", "secretAccessKey");
-    move("awsSessionToken", "aws", "sessionToken");
     move("jiraBaseUrl", "jira", "baseUrl");
     move("jiraEmail", "jira", "email");
     move("jiraEnabled", "jira", "enabled");
@@ -455,6 +463,7 @@ export function normalizeAgentSettingsPatch(value) {
     move("figmaBaseUrl", "figma", "baseUrl");
     move("figmaEnabled", "figma", "enabled");
     move("figmaApiToken", "figma", "apiToken");
+    move("environmentVariables", "env", "variables");
     return patch;
 }
 export function buildAgentSettingsEnvPatch(config) {
@@ -477,18 +486,6 @@ export function buildAgentSettingsEnvPatch(config) {
         if (config.git.oauthScope)
             envPatch.DOER_GIT_OAUTH_SCOPE = config.git.oauthScope;
     }
-    if (config.aws.enabled) {
-        if (config.aws.accessKeyId)
-            envPatch.AWS_ACCESS_KEY_ID = config.aws.accessKeyId;
-        if (config.aws.defaultRegion)
-            envPatch.AWS_DEFAULT_REGION = config.aws.defaultRegion;
-        if (config.aws.defaultRegion)
-            envPatch.AWS_REGION = config.aws.defaultRegion;
-        if (config.aws.secretAccessKey)
-            envPatch.AWS_SECRET_ACCESS_KEY = config.aws.secretAccessKey;
-        if (config.aws.sessionToken)
-            envPatch.AWS_SESSION_TOKEN = config.aws.sessionToken;
-    }
     if (config.jira.enabled) {
         if (config.jira.baseUrl)
             envPatch.JIRA_BASE_URL = config.jira.baseUrl;
@@ -517,5 +514,8 @@ export function buildAgentSettingsEnvPatch(config) {
         if (config.figma.apiToken)
             envPatch.FIGMA_API_TOKEN = config.figma.apiToken;
     }
+    for (const variable of config.env.variables) {
+        envPatch[variable.key] = variable.value;
+    }
     return envPatch;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doer-agent",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "Reverse-polling agent runtime for doer",
   "type": "module",
   "main": "dist/agent.js",