Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 40 additions & 2 deletions apps/control-plane/src/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1213,9 +1213,12 @@
);
}

// Inject workspace env vars if daemon is linked to a workspace
const wsEnv = injectWorkspaceEnv(workload.env, workspaceStore, daemon.workspace);

const sessionRequest = {
snapshot: daemon.snapshot,
workload,
workload: { ...workload, env: wsEnv },
resources: daemon.resources,
timeoutMs: 600_000,
network: daemon.network,
Expand Down Expand Up @@ -1436,7 +1439,7 @@

// Build env vars — common + event-type-specific
const envVars: Record<string, string> = {
...((fullDaemon ?? daemon).workload?.env ?? {}),

Check warning on line 1442 in apps/control-plane/src/app.ts

View workflow job for this annotation

GitHub Actions / check

eslint-plugin-unicorn(no-useless-fallback-in-spread)

Empty fallbacks in spreads are unnecessary
TRIGGER_PAYLOAD: JSON.stringify(event),
TRIGGER_TYPE: event.type,
GITHUB_REPO: event.repo,
Expand Down Expand Up @@ -1466,12 +1469,13 @@
}

const prNumber = event.type === 'pull_request' ? event.prNumber : event.prNumber;
const enrichedEnv = injectWorkspaceEnv(envVars, workspaceStore, daemon.workspace);
const sessionRequest = {
snapshot: src.snapshot,
workload: {
type: 'script' as const,
script: src.workload.script,
env: envVars,
env: enrichedEnv,
},
resources: src.resources,
timeoutMs: 600_000,
Expand Down Expand Up @@ -2190,6 +2194,40 @@
// Dispatch helpers
// ---------------------------------------------------------------------------

/** Inject workspace env vars into a session's workload env. */
function injectWorkspaceEnv(
env: Record<string, string>,
wsStore: { get(id: string): import('@paws/domain-workspace').Workspace | undefined },
workspaceId: string | undefined,
): Record<string, string> {
if (!workspaceId) return env;
const ws = wsStore.get(workspaceId);
if (!ws) return env;

const primary = ws.repos.find((r) => r.role === 'primary') ?? ws.repos[0];
if (!primary) return env;

const extra: Record<string, string> = {
PAWS_WORKSPACE_NAME: ws.name,
PAWS_WORKSPACE_TYPE: ws.type,
PAWS_WORKSPACE_REPO: primary.repo,
PAWS_WORKSPACE_ROOT_DIR: primary.rootDir,
PAWS_WORKSPACE_BRANCH: primary.branch,
PAWS_CLONE_URL: `https://github.com/${primary.repo}.git`,
};

if (ws.type === 'multi-repo') {
extra['PAWS_WORKSPACE_REPOS'] = ws.repos.map((r) => r.repo).join(',');
}
if (ws.settings.language) extra['PAWS_WORKSPACE_LANGUAGE'] = ws.settings.language;
if (ws.settings.packageManager)
extra['PAWS_WORKSPACE_PACKAGE_MANAGER'] = ws.settings.packageManager;
if (ws.settings.testCommand) extra['PAWS_WORKSPACE_TEST_COMMAND'] = ws.settings.testCommand;
if (ws.settings.buildCommand) extra['PAWS_WORKSPACE_BUILD_COMMAND'] = ws.settings.buildCommand;

return { ...env, ...extra };
}

/**
* Fire-and-forget session dispatch.
*
Expand Down
1 change: 1 addition & 0 deletions apps/control-plane/src/store/daemons.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export interface StoredDaemon {
status: DaemonStatus;
snapshot: string;
trigger: Trigger;
workspace?: string | undefined;
workload?: Workload | undefined;
agent?: AgentConfig | undefined;
resources?: Resources | undefined;
Expand Down
1 change: 1 addition & 0 deletions packages/integrations/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export interface GitHubDaemon {
events: string[];
command?: string;
};
workspace?: string | undefined;
snapshot: string;
workload: { type: string; script: string; env: Record<string, string> };
resources?: { vcpus: number; memoryMB: number };
Expand Down
Loading