Merge pull request #2944 from protoLabsAI/staging

Promote staging to main (v0.79.0)

Author: mabry1985

.automaker/settings.json

@@ -0,0 +1,94 @@
+{
+  "version": 1,
+  "worktreePanelVisible": false,
+  "gtmEnabled": true,
+  "integrations": {
+    "linear": {
+      "teamId": "185e7caa-2855-4c67-a347-2011016bdddf"
+    },
+    "discord": {
+      "enabled": true,
+      "serverId": "1070606339363049492",
+      "channelId": "1469080556720623699",
+      "createThreadsForAgents": true,
+      "notifyOnCompletion": true,
+      "notifyOnError": true,
+      "notifyOnAutoModeComplete": true,
+      "useWebhook": false,
+      "channels": {
+        "primary": "1469195643590541353",
+        "dev": "1469080556720623699",
+        "infra": "1469109809939742814",
+        "bugs": "1477837770704814162",
+        "ceremonies": "1469080556720623699",
+        "contentBriefs": "1472072098238431342"
+      },
+      "channelWorkflows": [
+        {
+          "channelId": "1477837770704814162",
+          "channelName": "#bug-reports",
+          "workflow": "bug_triage",
+          "createThread": true,
+          "aiInvestigation": true,
+          "enabled": true
+        },
+        {
+          "channelId": "1469195643590541353",
+          "channelName": "#ava",
+          "workflow": "agent_conversation",
+          "agentRole": "ava",
+          "createThread": false,
+          "aiInvestigation": false,
+          "enabled": true
+        }
+      ]
+    }
+  },
+  "ceremonySettings": {
+    "enabled": true,
+    "enableMilestoneUpdates": true,
+    "enableProjectRetros": true,
+    "enableStandups": true,
+    "enableEpicKickoff": true,
+    "enableEpicDelivery": true,
+    "enableContentBriefs": true,
+    "discordChannelId": "1469080556720623699"
+  },
+  "defaultDeleteBranch": true,
+  "enabledPersonas": [
+    "board-janitor",
+    "backend-engineer",
+    "matt",
+    "sam",
+    "kai",
+    "frank",
+    "product-manager",
+    "engineering-manager",
+    "ava",
+    "cindi",
+    "linear-specialist",
+    "jon",
+    "calendar-assistant",
+    "pr-maintainer"
+  ],
+  "boardBackground": {
+    "imagePath": null,
+    "cardOpacity": 100,
+    "columnOpacity": 100,
+    "columnBorderEnabled": true,
+    "cardGlassmorphism": true,
+    "cardBorderEnabled": true,
+    "cardBorderOpacity": 100,
+    "hideScrollbar": false,
+    "imageVersion": 1772603872769
+  },
+  "workflow": {
+    "agentConfig": {
+      "autoAssignEnabled": true
+    },
+    "gitWorkflow": {
+      "prBaseBranch": "dev"
+    }
+  },
+  "docsPath": "docs/internal"
+}

apps/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@protolabsai/server",
-  "version": "0.77.6",
+  "version": "0.79.0",
   "description": "Backend server for protoLabs Studio - provides API for both web and Electron modes",
   "author": "protoLabs Studio",
   "license": "SEE LICENSE IN LICENSE",
@@ -45,19 +45,19 @@
     "@opentelemetry/exporter-trace-otlp-http": "^0.212.0",
     "@opentelemetry/sdk-node": "^0.212.0",
     "@opentelemetry/sdk-trace-base": "^2.0.0",
-    "@protolabsai/context-engine": "^0.68.9",
-    "@protolabsai/dependency-resolver": "^0.77.6",
-    "@protolabsai/error-tracking": "^0.53.24",
-    "@protolabsai/flows": "^0.77.6",
-    "@protolabsai/git-utils": "^0.77.6",
-    "@protolabsai/model-resolver": "^0.77.6",
-    "@protolabsai/observability": "^0.77.6",
-    "@protolabsai/platform": "^0.77.6",
-    "@protolabsai/prompts": "^0.77.6",
+    "@protolabsai/context-engine": "^0.68.11",
+    "@protolabsai/dependency-resolver": "^0.79.0",
+    "@protolabsai/error-tracking": "^0.53.26",
+    "@protolabsai/flows": "^0.79.0",
+    "@protolabsai/git-utils": "^0.79.0",
+    "@protolabsai/model-resolver": "^0.79.0",
+    "@protolabsai/observability": "^0.79.0",
+    "@protolabsai/platform": "^0.79.0",
+    "@protolabsai/prompts": "^0.79.0",
     "@protolabsai/templates": "^0.56.0",
-    "@protolabsai/tools": "^0.77.6",
-    "@protolabsai/types": "^0.77.6",
-    "@protolabsai/utils": "^0.77.6",
+    "@protolabsai/tools": "^0.79.0",
+    "@protolabsai/types": "^0.79.0",
+    "@protolabsai/utils": "^0.79.0",
     "@twurple/api": "^8.0.3",
     "@twurple/auth": "^8.0.3",
     "@twurple/chat": "^8.0.3",

apps/server/src/lib/git-staging-utils.ts

@@ -16,27 +16,49 @@ import { join } from 'path';
  */
 export const DEFAULT_STAGING_EXCLUSIONS = ['.automaker/', '.claude/worktrees/', '.worktrees/'];
 
+/**
+ * Directories that are already excluded by `.gitignore`.
+ * Using `:!dir/` pathspec exclusions for gitignored directories causes git to
+ * error: "The following paths are ignored by one of your .gitignore files: dir"
+ * These entries should still appear in `excludeFromStaging` to signal that
+ * their subdirectories (e.g. `.automaker/memory/`) may need re-inclusion,
+ * but they must NOT be emitted as pathspec arguments.
+ */
+const GITIGNORE_MANAGED_EXCLUSIONS = new Set(['.automaker/', '.worktrees/']);
+
 /**
  * Builds a git add command that stages all changes except the directories in
  * `excludeFromStaging`, then re-includes `.automaker/memory/` and
  * `.automaker/skills/` only if `.automaker/` is excluded and those directories
  * exist in the working tree. This prevents a fatal pathspec error when a
  * directory is absent (e.g. in a fresh worktree).
+ *
+ * Directories already covered by `.gitignore` are intentionally omitted from
+ * the pathspec exclusion list — git would throw an error if a gitignored path
+ * appeared in the pathspec (even as a `:!` exclude).
  */
 export function buildGitAddCommand(workDir: string, excludeFromStaging?: string[]): string {
   const exclusions = excludeFromStaging ?? DEFAULT_STAGING_EXCLUSIONS;
-  const exclusionPathspecs = exclusions.map((dir) => `':!${dir}'`).join(' ');
-  const parts = [`git add -A -- ${exclusionPathspecs}`];
 
-  // Re-include .automaker/memory/ and .automaker/skills/ when .automaker/ is excluded
+  // Collect all pathspec arguments into one array, then join at the end.
+  // Only emit exclusion pathspecs for dirs NOT already handled by .gitignore:
+  // using `:!dir/` for a gitignored path causes:
+  //   fatal: The following paths are ignored by one of your .gitignore files: dir
+  const pathspecArgs: string[] = exclusions
+    .filter((dir) => !GITIGNORE_MANAGED_EXCLUSIONS.has(dir))
+    .map((dir) => `':!${dir}'`);
+
+  // Re-include .automaker/memory/ and .automaker/skills/ when .automaker/ is excluded.
+  // These subdirs are git-tracked agent memory files that live under a gitignored
+  // parent directory and must be staged explicitly.
   if (exclusions.includes('.automaker/')) {
     if (existsSync(join(workDir, '.automaker/memory'))) {
-      parts.push("'.automaker/memory/'");
+      pathspecArgs.push("'.automaker/memory/'");
     }
     if (existsSync(join(workDir, '.automaker/skills'))) {
-      parts.push("'.automaker/skills/'");
+      pathspecArgs.push("'.automaker/skills/'");
     }
   }
 
-  return parts.join(' ');
+  return `git add -A -- ${pathspecArgs.join(' ')}`;
 }

apps/server/src/lib/settings-helpers.ts

@@ -801,6 +801,7 @@ export async function getWorkflowSettings(
           ...DEFAULT_WORKFLOW_SETTINGS.gitWorkflow,
           ...projectSettings.workflow.gitWorkflow,
         },
+        ciClassification: projectSettings.workflow.ciClassification,
       };
     }
     return DEFAULT_WORKFLOW_SETTINGS;