create-interview-cockpit 0.23.0 → 0.23.2

package/template/client/src/githubActionsLab.ts

@@ -1,4 +1,5 @@
 import type { GithubActionsLabWorkspace } from "./types";
+import type { GithubActionsLabEnvironment } from "./types";
 
 // ─── Default Lab Template ────────────────────────────────────────────────
 //
@@ -401,6 +402,41 @@ export const REACT_VITE_TYPESCRIPT_GHA_LAB: GithubActionsLabWorkspace = {
 
 // ─── Helpers (mirror infraLab.ts API surface) ────────────────────────────
 
+function cloneGhaLabEnvironment(
+  environment?: GithubActionsLabEnvironment,
+): GithubActionsLabEnvironment | undefined {
+  if (!environment || typeof environment !== "object") return undefined;
+
+  const cloneEntries = (entries: GithubActionsLabEnvironment["variables"]) =>
+    Array.isArray(entries)
+      ? entries
+          .filter(
+            (entry) =>
+              entry &&
+              typeof entry.name === "string" &&
+              typeof entry.value === "string",
+          )
+          .map((entry) => ({
+            name: entry.name,
+            value: entry.value,
+            ...(entry.enabled === false ? { enabled: false } : {}),
+          }))
+      : [];
+
+  const variables = cloneEntries(environment.variables);
+  const secrets = cloneEntries(environment.secrets);
+  const env = cloneEntries(environment.env);
+  if (variables.length === 0 && secrets.length === 0 && env.length === 0) {
+    return undefined;
+  }
+
+  return {
+    ...(variables.length ? { variables } : {}),
+    ...(secrets.length ? { secrets } : {}),
+    ...(env.length ? { env } : {}),
+  };
+}
+
 export function cloneGhaLabWorkspace(
   workspace?: GithubActionsLabWorkspace | null,
 ): GithubActionsLabWorkspace {
@@ -415,6 +451,7 @@ export function cloneGhaLabWorkspace(
   )
     ? source.activeFile
     : (Object.keys(sourceFiles)[0] ?? ".github/workflows/ci.yml");
+  const environment = cloneGhaLabEnvironment(source.environment);
 
   return {
     version: 1,
@@ -433,6 +470,7 @@ export function cloneGhaLabWorkspace(
     ...(source.includeRunHistoryInContext
       ? { includeRunHistoryInContext: true }
       : {}),
+    ...(environment ? { environment } : {}),
   };
 }
 
@@ -517,6 +555,9 @@ export function parseGhaLabWorkspace(
       ...(parsed.includeRunHistoryInContext === true
         ? { includeRunHistoryInContext: true }
         : {}),
+      ...(parsed.environment && typeof parsed.environment === "object"
+        ? { environment: parsed.environment as GithubActionsLabEnvironment }
+        : {}),
     });
   } catch {
     return null;

package/template/client/src/types.ts

@@ -49,6 +49,21 @@ export interface InfraLabWorkspace {
   files: Record<string, string>;
 }
 
+export interface GithubActionsLabEnvironmentEntry {
+  name: string;
+  value: string;
+  enabled?: boolean;
+}
+
+export interface GithubActionsLabEnvironment {
+  /** Values available to workflows as `${{ vars.NAME }}` through act's --var-file. */
+  variables?: GithubActionsLabEnvironmentEntry[];
+  /** Values available to workflows as `${{ secrets.NAME }}` through act's --secret-file. */
+  secrets?: GithubActionsLabEnvironmentEntry[];
+  /** Runner/container environment values available to shell steps as `$NAME`. */
+  env?: GithubActionsLabEnvironmentEntry[];
+}
+
 export interface GithubActionsLabWorkspace {
   version: 1;
   label: string;
@@ -64,6 +79,8 @@ export interface GithubActionsLabWorkspace {
    * (job statuses, durations, exit codes) instead of just the YAML.
    */
   includeRunHistoryInContext?: boolean;
+  /** Local act inputs mirroring GitHub repository variables, secrets, and runner env. */
+  environment?: GithubActionsLabEnvironment;
 }
 
 export interface WorkspaceMeta {

package/template/client/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/app.tsx","./src/api.ts","./src/browsersecuritytemplates.ts","./src/enterpriselocallab.ts","./src/githubactionslab.ts","./src/infralab.ts","./src/main.tsx","./src/reactlab.ts","./src/store.ts","./src/types.ts","./src/vite-env.d.ts","./src/components/aisettingsmodal.tsx","./src/components/annotationdialog.tsx","./src/components/browsersecuritylabmodal.tsx","./src/components/canvaslabmodal.tsx","./src/components/chatmessage.tsx","./src/components/chatview.tsx","./src/components/codecontextpanel.tsx","./src/components/codelineannotationpopup.tsx","./src/components/coderunnermodal.tsx","./src/components/deploymentlabmodal.tsx","./src/components/docrefmodal.tsx","./src/components/fileattachments.tsx","./src/components/filepickermodal.tsx","./src/components/fileviewermodal.tsx","./src/components/ghahistorypanel.tsx","./src/components/ghajobspanel.tsx","./src/components/gitdiffpanel.tsx","./src/components/gitdiffviewermodal.tsx","./src/components/githubactionslabmodal.tsx","./src/components/infralabmodal.tsx","./src/components/labspanel.tsx","./src/components/linkedconvospicker.tsx","./src/components/markdownrenderer.tsx","./src/components/mermaiddiagram.tsx","./src/components/notesmodal.tsx","./src/components/plotembed.tsx","./src/components/sidebar.tsx","./src/components/textannotator.tsx","./src/components/vizcraftembed.tsx","./src/components/workspaceswitcher.tsx"],"version":"5.9.3"}
+{"root":["./src/app.tsx","./src/api.ts","./src/browsersecuritytemplates.ts","./src/enterpriselocallab.ts","./src/ghaconcurrency.ts","./src/githubactionslab.ts","./src/infralab.ts","./src/main.tsx","./src/reactlab.ts","./src/store.ts","./src/types.ts","./src/vite-env.d.ts","./src/components/aisettingsmodal.tsx","./src/components/annotationdialog.tsx","./src/components/browsersecuritylabmodal.tsx","./src/components/canvaslabmodal.tsx","./src/components/chatmessage.tsx","./src/components/chatview.tsx","./src/components/codecontextpanel.tsx","./src/components/codelineannotationpopup.tsx","./src/components/coderunnermodal.tsx","./src/components/deploymentlabmodal.tsx","./src/components/docrefmodal.tsx","./src/components/fileattachments.tsx","./src/components/filepickermodal.tsx","./src/components/fileviewermodal.tsx","./src/components/ghaconcurrencypanel.tsx","./src/components/ghahistorypanel.tsx","./src/components/ghajobspanel.tsx","./src/components/gitdiffpanel.tsx","./src/components/gitdiffviewermodal.tsx","./src/components/githubactionslabmodal.tsx","./src/components/infralabmodal.tsx","./src/components/labspanel.tsx","./src/components/linkedconvospicker.tsx","./src/components/markdownrenderer.tsx","./src/components/mermaiddiagram.tsx","./src/components/notesmodal.tsx","./src/components/plotembed.tsx","./src/components/sidebar.tsx","./src/components/textannotator.tsx","./src/components/vizcraftembed.tsx","./src/components/workspaceswitcher.tsx"],"version":"5.9.3"}

package/template/cockpit.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.21.0"
+  "version": "0.23.0"
 }

package/template/server/src/gha-runner.ts

@@ -13,6 +13,19 @@ interface GithubActionsLabWorkspace {
   files: Record<string, string>;
   defaultEvent?: string;
   defaultWorkflow?: string;
+  environment?: GithubActionsLabEnvironment;
+}
+
+interface GithubActionsLabEnvironmentEntry {
+  name: string;
+  value: string;
+  enabled?: boolean;
+}
+
+interface GithubActionsLabEnvironment {
+  variables?: GithubActionsLabEnvironmentEntry[];
+  secrets?: GithubActionsLabEnvironmentEntry[];
+  env?: GithubActionsLabEnvironmentEntry[];
 }
 
 type OutputKind = "stdout" | "stderr" | "info";
@@ -69,8 +82,11 @@ export type GhaStreamMessage =
 
 const MAX_FILE_COUNT = 60;
 const MAX_TOTAL_SOURCE_BYTES = 1_000_000;
+const MAX_GHA_ENV_ENTRY_COUNT = 80;
+const MAX_GHA_ENV_TOTAL_BYTES = 100_000;
 const MAX_LOG_CHARS = 400_000;
 const SOURCE_MANIFEST = ".gha-source-files.json";
+const GHA_ENV_NAME_RE = /^[A-Za-z_][A-Za-z0-9_]*$/;
 
 // `act` accepts these events; we restrict to common ones so the console
 // can't be used to run arbitrary subcommands.
@@ -155,6 +171,69 @@ function assertSafeRelativePath(filePath: string, label: string): void {
   }
 }
 
+function parseEnvironmentEntries(
+  input: unknown,
+  label: string,
+): GithubActionsLabEnvironmentEntry[] {
+  if (!Array.isArray(input)) return [];
+  if (input.length > MAX_GHA_ENV_ENTRY_COUNT) {
+    throw new Error(
+      `${label} exceeds the ${MAX_GHA_ENV_ENTRY_COUNT} item limit`,
+    );
+  }
+
+  let totalBytes = 0;
+  return input
+    .filter((entry): entry is Record<string, unknown> => {
+      return !!entry && typeof entry === "object";
+    })
+    .map((entry) => {
+      const name = typeof entry.name === "string" ? entry.name.trim() : "";
+      if (!name) return null;
+      if (!GHA_ENV_NAME_RE.test(name)) {
+        throw new Error(
+          `${label} name '${name}' is invalid. Use letters, numbers, and underscores; do not start with a number.`,
+        );
+      }
+      const value = typeof entry.value === "string" ? entry.value : "";
+      totalBytes += Buffer.byteLength(name, "utf8");
+      totalBytes += Buffer.byteLength(value, "utf8");
+      if (totalBytes > MAX_GHA_ENV_TOTAL_BYTES) {
+        throw new Error(`${label} values exceed the allowed size limit`);
+      }
+      return {
+        name,
+        value,
+        ...(entry.enabled === false ? { enabled: false } : {}),
+      };
+    })
+    .filter((entry): entry is GithubActionsLabEnvironmentEntry => !!entry);
+}
+
+function parseWorkspaceEnvironment(
+  input: unknown,
+): GithubActionsLabEnvironment | undefined {
+  if (!input || typeof input !== "object") return undefined;
+  const candidate = input as Record<string, unknown>;
+  const variables = parseEnvironmentEntries(
+    candidate.variables,
+    "GitHub Actions variable",
+  );
+  const secrets = parseEnvironmentEntries(
+    candidate.secrets,
+    "GitHub Actions secret",
+  );
+  const env = parseEnvironmentEntries(candidate.env, "GitHub Actions env");
+  if (variables.length === 0 && secrets.length === 0 && env.length === 0) {
+    return undefined;
+  }
+  return {
+    ...(variables.length ? { variables } : {}),
+    ...(secrets.length ? { secrets } : {}),
+    ...(env.length ? { env } : {}),
+  };
+}
+
 function parseWorkspace(input: unknown): GithubActionsLabWorkspace {
   if (!input || typeof input !== "object") {
     throw new Error("workspace payload is required");
@@ -188,6 +267,7 @@ function parseWorkspace(input: unknown): GithubActionsLabWorkspace {
   if (totalBytes > MAX_TOTAL_SOURCE_BYTES) {
     throw new Error("workspace source exceeds the allowed size limit");
   }
+  const environment = parseWorkspaceEnvironment(candidate.environment);
   return {
     version: 1,
     label:
@@ -207,6 +287,7 @@ function parseWorkspace(input: unknown): GithubActionsLabWorkspace {
       typeof candidate.defaultWorkflow === "string"
         ? candidate.defaultWorkflow
         : undefined,
+    ...(environment ? { environment } : {}),
     files,
   };
 }
@@ -273,6 +354,72 @@ async function syncWorkspaceToSession(
   return workspaceDir;
 }
 
+function escapeDotenvValue(value: string): string {
+  return `"${value
+    .replace(/\\/g, "\\\\")
+    .replace(/\r/g, "")
+    .replace(/\n/g, "\\n")
+    .replace(/"/g, '\\"')}"`;
+}
+
+function formatEnvironmentFile(
+  entries: GithubActionsLabEnvironmentEntry[],
+): string {
+  return `${entries
+    .filter((entry) => entry.enabled !== false)
+    .map((entry) => `${entry.name}=${escapeDotenvValue(entry.value)}`)
+    .join("\n")}\n`;
+}
+
+async function buildActEnvironmentArgs(
+  runDir: string,
+  workspace: GithubActionsLabWorkspace,
+): Promise<{ args: string[]; summary: string[] }> {
+  const args: string[] = [];
+  const summary: string[] = [];
+  const specs: Array<{
+    key: keyof GithubActionsLabEnvironment;
+    flag: string;
+    fileName: string;
+    label: string;
+  }> = [
+    {
+      key: "variables",
+      flag: "--var-file",
+      fileName: "act-vars.env",
+      label: "variable",
+    },
+    {
+      key: "secrets",
+      flag: "--secret-file",
+      fileName: "act-secrets.env",
+      label: "secret",
+    },
+    {
+      key: "env",
+      flag: "--env-file",
+      fileName: "act-env.env",
+      label: "runner env",
+    },
+  ];
+
+  for (const spec of specs) {
+    const entries = (workspace.environment?.[spec.key] ?? []).filter(
+      (entry) => entry.enabled !== false,
+    );
+    if (entries.length === 0) continue;
+
+    const filePath = path.join(runDir, spec.fileName);
+    await fs.writeFile(filePath, formatEnvironmentFile(entries), "utf8");
+    args.push(spec.flag, filePath);
+    summary.push(
+      `${entries.length} ${spec.label}${entries.length === 1 ? "" : "s"}`,
+    );
+  }
+
+  return { args, summary };
+}
+
 // ─── Command parsing ────────────────────────────────────────────────────
 
 function splitCommand(command: string): string[] {
@@ -722,6 +869,8 @@ export async function streamGhaCommand(
   const runDir = path.join(getGhaRunsDir(), runId);
   const workspaceDir = await syncWorkspaceToSession(sessionKey, workspace);
   await fs.mkdir(runDir, { recursive: true });
+  const environmentArgs = await buildActEnvironmentArgs(runDir, workspace);
+  const actArgs = [...platformArgs.args, ...environmentArgs.args];
 
   let logs = "";
   let status: "completed" | "failed" = "completed";
@@ -737,12 +886,19 @@ export async function streamGhaCommand(
       text: "[info] Using default Medium act runner image mappings. Pass -P/--platform to override.\n",
     });
   }
+  if (environmentArgs.summary.length > 0) {
+    emit({
+      type: "output",
+      kind: "info",
+      text: `[info] Injected ${environmentArgs.summary.join(", ")} into act via temporary files.\n`,
+    });
+  }
 
   // Track per-job status from act's prefixed stdout/stderr lines so the
   // client can render a live DAG in addition to the raw console.
   const tracker = new JobTracker((job) => emit({ type: "job", job }));
 
-  const child = spawn("act", platformArgs.args, {
+  const child = spawn("act", actArgs, {
     cwd: workspaceDir,
     env: {
       ...process.env,

package/template/server/src/google-drive.ts

@@ -1163,6 +1163,34 @@ async function getOrCreateFolder(
   return folderId;
 }
 
+async function resolveExportFolderId(
+  drive: drive_v3.Drive,
+  ws: storage.WorkspaceMeta,
+  targetFolderId?: string,
+): Promise<string> {
+  const requestedTarget = targetFolderId?.trim();
+  if (requestedTarget) return requestedTarget;
+
+  // If the workspace is currently scoped to a Drive subfolder (for example
+  // Shared Questions/SBD), push back into that same folder. Falling back to
+  // _export here made topic-level pushes from a selected subfolder land in
+  // Shared Questions/_export instead of beside the original topic folders.
+  const selectedSubfolder = ws.driveConfig?.subFolderId?.trim();
+  if (selectedSubfolder) return selectedSubfolder;
+
+  if (!ws.driveConfig?.folderId) {
+    throw new Error("No Drive folder linked to this workspace");
+  }
+
+  // Local workspaces do not have a Drive-navigation state, so a missing
+  // target should mean "the linked folder itself" rather than silently
+  // creating/using _export. The UI now prompts for a destination, but this
+  // server-side fallback protects older/stale clients too.
+  if (ws.type === "local") return ws.driveConfig.folderId;
+
+  return getOrCreateFolder(drive, ws.driveConfig.folderId, EXPORT_FOLDER_NAME);
+}
+
 async function uploadFileToFolder(
   drive: drive_v3.Drive,
   folderId: string,
@@ -1342,7 +1370,6 @@ export async function exportWorkspace(
   }
 
   const drive = await getExportDriveClient();
-  const { folderId } = ws.driveConfig;
   const result: ExportResult = {
     topicsExported: 0,
     questionsExported: 0,
@@ -1350,10 +1377,9 @@ export async function exportWorkspace(
     errors: [],
   };
 
-  // Use the chosen subfolder directly, or fall back to an "_export" subfolder
-  const exportFolderId =
-    targetFolderId ??
-    (await getOrCreateFolder(drive, folderId, EXPORT_FOLDER_NAME));
+  // Use the chosen subfolder directly. If none was passed, use the workspace's
+  // selected Drive subfolder before falling back to root/_export.
+  const exportFolderId = await resolveExportFolderId(drive, ws, targetFolderId);
   const topics = await storage.getTopicsForWorkspace(workspaceId);
   const ctxDir = storage.getContextFilesDirForWorkspace(workspaceId);
 
@@ -1415,10 +1441,7 @@ export async function exportTopic(
   }
 
   const drive = await getExportDriveClient();
-  const { folderId } = ws.driveConfig;
-  const exportFolderId =
-    targetFolderId ??
-    (await getOrCreateFolder(drive, folderId, EXPORT_FOLDER_NAME));
+  const exportFolderId = await resolveExportFolderId(drive, ws, targetFolderId);
   const topic = (await storage.getTopicsForWorkspace(workspaceId)).find(
     (t) => t.id === topicId,
   );