Merge branch 'main' into new-project-from-template

apps/app/src/components/views/analysis-view.tsx

@@ -399,7 +399,7 @@ ${Object.entries(projectAnalysis.filesByExtension)
 `;
 
       // Write the spec file
-      const specPath = `${currentProject.path}/app_spec.txt`;
+      const specPath = `${currentProject.path}/.automaker/app_spec.txt`;
       const writeResult = await api.writeFile(specPath, specContent);
 
       if (writeResult.success) {

apps/app/src/components/views/context-view.tsx

@@ -17,6 +17,8 @@ import {
   File,
   X,
   BookOpen,
+  EditIcon,
+  Eye,
 } from "lucide-react";
 import {
   useKeyboardShortcuts,
@@ -34,6 +36,7 @@ import {
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import { cn } from "@/lib/utils";
+import { Markdown } from "../ui/markdown";
 
 interface ContextFile {
   name: string;
@@ -60,6 +63,7 @@ export function ContextView() {
   );
   const [newFileContent, setNewFileContent] = useState("");
   const [isDropHovering, setIsDropHovering] = useState(false);
+  const [isPreviewMode, setIsPreviewMode] = useState(false);
 
   // Keyboard shortcuts for this view
   const contextShortcuts: KeyboardShortcut[] = useMemo(
@@ -80,6 +84,11 @@ export function ContextView() {
     return `${currentProject.path}/.automaker/context`;
   }, [currentProject]);
 
+  const isMarkdownFile = (filename: string): boolean => {
+    const ext = filename.toLowerCase().substring(filename.lastIndexOf("."));
+    return ext === ".md" || ext === ".markdown";
+  };
+
   // Determine if a file is an image based on extension
   const isImageFile = (filename: string): boolean => {
     const imageExtensions = [
@@ -151,6 +160,7 @@ export function ContextView() {
       // Could add a confirmation dialog here
     }
     loadFileContent(file);
+    setIsPreviewMode(isMarkdownFile(file.name));
   };
 
   // Save current file
@@ -448,6 +458,27 @@ export function ContextView() {
                   </span>
                 </div>
                 <div className="flex gap-2">
+                  {selectedFile.type === "text" &&
+                    isMarkdownFile(selectedFile.name) && (
+                      <Button
+                        variant={"outline"}
+                        size="sm"
+                        onClick={() => setIsPreviewMode(!isPreviewMode)}
+                        data-testid="toggle-preview-mode"
+                      >
+                        {isPreviewMode ? (
+                          <>
+                            <EditIcon className="w-4 h-4 mr-2" />
+                            Edit
+                          </>
+                        ) : (
+                          <>
+                            <Eye className="w-4 h-4 mr-2" />
+                            Preview
+                          </>
+                        )}
+                      </Button>
+                    )}
                   {selectedFile.type === "text" && (
                     <Button
                       size="sm"
@@ -484,6 +515,10 @@ export function ContextView() {
                       className="max-w-full max-h-full object-contain"
                     />
                   </div>
+                ) : isPreviewMode ? (
+                  <Card className="h-full overflow-auto p-4" data-testid="markdown-preview">
+                    <Markdown>{editedContent}</Markdown>
+                  </Card>
                 ) : (
                   <Card className="h-full overflow-hidden">
                     <textarea

apps/app/src/components/views/kanban-card.tsx

@@ -207,10 +207,12 @@ export const KanbanCard = memo(function KanbanCard({
   // - Backlog items can always be dragged
   // - skipTests items can be dragged even when in_progress or verified (unless currently running)
   // - waiting_approval items can always be dragged (to allow manual verification via drag)
-  // - Non-skipTests (TDD) items in progress or verified cannot be dragged
+  // - verified items can always be dragged (to allow moving back to waiting_approval or backlog)
+  // - Non-skipTests (TDD) items in progress cannot be dragged (they are running)
   const isDraggable =
     feature.status === "backlog" ||
     feature.status === "waiting_approval" ||
+    feature.status === "verified" ||
     (feature.skipTests && !isCurrentAutoTask);
   const {
     attributes,

apps/app/src/components/views/settings-view.tsx

@@ -82,12 +82,14 @@ export function SettingsView() {
   // Compute the effective theme for the current project
   const effectiveTheme = (settingsProject?.theme || theme) as Theme;
 
-  // Handler to set theme - saves to project if one is selected, otherwise to global
+  // Handler to set theme - always updates global theme (user's preference),
+  // and also sets per-project theme if a project is selected
   const handleSetTheme = (newTheme: typeof theme) => {
+    // Always update global theme so user's preference persists across all projects
+    setTheme(newTheme);
+    // Also set per-project theme if a project is selected
     if (currentProject) {
       setProjectTheme(currentProject.id, newTheme);
-    } else {
-      setTheme(newTheme);
     }
   };
 

apps/app/src/components/views/settings-view/api-keys/authentication-status-display.tsx

@@ -61,13 +61,15 @@ export function AuthenticationStatusDisplay({
                     {claudeAuthStatus.method === "oauth_token_env"
                       ? "Using CLAUDE_CODE_OAUTH_TOKEN"
                       : claudeAuthStatus.method === "oauth_token"
-                      ? "Using stored OAuth token (claude login)"
+                      ? "Using stored OAuth token (subscription)"
                       : claudeAuthStatus.method === "api_key_env"
                       ? "Using ANTHROPIC_API_KEY"
                       : claudeAuthStatus.method === "api_key"
                       ? "Using stored API key"
                       : claudeAuthStatus.method === "credentials_file"
                       ? "Using credentials file"
+                      : claudeAuthStatus.method === "cli_authenticated"
+                      ? "Using Claude CLI authentication"
                       : `Using ${claudeAuthStatus.method || "detected"} authentication`}
                   </span>
                 </div>

apps/app/src/components/views/settings-view/hooks/use-cli-status.ts

@@ -74,8 +74,8 @@ export function useCliStatus() {
               apiKeyValid?: boolean;
             };
             // Map server method names to client method types
-            // Server returns: oauth_token_env, oauth_token, api_key_env, api_key, credentials_file, none
-            const validMethods = ["oauth_token_env", "oauth_token", "api_key", "api_key_env", "credentials_file", "none"] as const;
+            // Server returns: oauth_token_env, oauth_token, api_key_env, api_key, credentials_file, cli_authenticated, none
+            const validMethods = ["oauth_token_env", "oauth_token", "api_key", "api_key_env", "credentials_file", "cli_authenticated", "none"] as const;
             type AuthMethod = typeof validMethods[number];
             const method: AuthMethod = validMethods.includes(auth.method as AuthMethod)
               ? (auth.method as AuthMethod)

apps/app/src/components/views/setup-view/hooks/use-cli-status.ts

@@ -40,6 +40,8 @@ export function useCliStatus({
               "oauth_token",
               "api_key",
               "api_key_env",
+              "credentials_file",
+              "cli_authenticated",
               "none",
             ] as const;
             type AuthMethod = (typeof validMethods)[number];

apps/app/src/components/views/spec-view.tsx

@@ -14,7 +14,8 @@ import {
   DialogHeader,
   DialogTitle,
 } from "@/components/ui/dialog";
-import { Save, RefreshCw, FileText, Sparkles, Loader2, FilePlus2, AlertCircle, ListPlus } from "lucide-react";
+import { Save, RefreshCw, FileText, Sparkles, Loader2, FilePlus2, AlertCircle, ListPlus, CheckCircle2 } from "lucide-react";
+import { toast } from "sonner";
 import { Checkbox } from "@/components/ui/checkbox";
 import { XmlSyntaxEditor } from "@/components/ui/xml-syntax-editor";
 import type { SpecRegenerationEvent } from "@/types/electron";
@@ -311,14 +312,22 @@ export function SpecView() {
         // The backend sends explicit signals for completion:
         // 1. "All tasks completed" in the message
         // 2. [Phase: complete] marker in logs
+        // 3. "Spec regeneration complete!" for regeneration
+        // 4. "Initial spec creation complete!" for creation without features
         const isFinalCompletionMessage = event.message?.includes("All tasks completed") ||
                                          event.message === "All tasks completed!" ||
-                                         event.message === "All tasks completed";
+                                         event.message === "All tasks completed" ||
+                                         event.message === "Spec regeneration complete!" ||
+                                         event.message === "Initial spec creation complete!";
         
         const hasCompletePhase = logsRef.current.includes("[Phase: complete]");
         
+        // Intermediate completion means features are being generated after spec creation
+        const isIntermediateCompletion = event.message?.includes("Features are being generated") ||
+                                         event.message?.includes("features are being generated");
+        
         // Rely solely on explicit backend signals
-        const shouldComplete = isFinalCompletionMessage || hasCompletePhase;
+        const shouldComplete = (isFinalCompletionMessage || hasCompletePhase) && !isIntermediateCompletion;
         
         if (shouldComplete) {
           // Fully complete - clear all states immediately
@@ -337,9 +346,29 @@ export function SpecView() {
           setProjectOverview("");
           setErrorMessage("");
           stateRestoredRef.current = false;
-          // Reload the spec to show the new content
-          loadSpec();
-        } else {
+          
+          // Reload the spec with delay to ensure file is written to disk
+          setTimeout(() => {
+            loadSpec();
+          }, SPEC_FILE_WRITE_DELAY);
+          
+          // Show success toast notification
+          const isRegeneration = event.message?.includes("regeneration");
+          const isFeatureGeneration = event.message?.includes("Feature generation");
+          toast.success(
+            isFeatureGeneration 
+              ? "Feature Generation Complete" 
+              : isRegeneration 
+                ? "Spec Regeneration Complete" 
+                : "Spec Creation Complete",
+            {
+              description: isFeatureGeneration 
+                ? "Features have been created from the app specification."
+                : "Your app specification has been saved.",
+              icon: <CheckCircle2 className="w-4 h-4" />,
+            }
+          );
+        } else if (isIntermediateCompletion) {
           // Intermediate completion - keep state active for feature generation
           setIsCreating(true);
           setIsRegenerating(true);