Merge branch 'dev' into fix/placeholder-color-5088

Author: ariane-emory

packages/desktop/src/components/prompt-input.tsx

@@ -14,15 +14,43 @@ import { Button } from "@opencode-ai/ui/button"
 import { Icon } from "@opencode-ai/ui/icon"
 import { Tooltip } from "@opencode-ai/ui/tooltip"
 import { IconButton } from "@opencode-ai/ui/icon-button"
+import { ProviderIcon } from "@opencode-ai/ui/provider-icon"
 import { Select } from "@opencode-ai/ui/select"
 import { getDirectory, getFilename } from "@opencode-ai/util/path"
+import { type IconName } from "@opencode-ai/ui/icons/provider"
 
 interface PromptInputProps {
   class?: string
   ref?: (el: HTMLDivElement) => void
 }
 
-const PLACEHOLDERS = ["Fix a TODO in the codebase", "What is the tech stack of this project?", "Fix broken tests"]
+const PLACEHOLDERS = [
+  "Fix a TODO in the codebase",
+  "What is the tech stack of this project?",
+  "Fix broken tests",
+  "Explain how authentication works",
+  "Find and fix security vulnerabilities",
+  "Add unit tests for the user service",
+  "Refactor this function to be more readable",
+  "What does this error mean?",
+  "Help me debug this issue",
+  "Generate API documentation",
+  "Optimize database queries",
+  "Add input validation",
+  "Create a new component for...",
+  "How do I deploy this project?",
+  "Review my code for best practices",
+  "Add error handling to this function",
+  "Explain this regex pattern",
+  "Convert this to TypeScript",
+  "Add logging throughout the codebase",
+  "What dependencies are outdated?",
+  "Help me write a migration script",
+  "Implement caching for this endpoint",
+  "Add pagination to this list",
+  "Create a CLI command for...",
+  "How do environment variables work here?",
+]
 
 export const PromptInput: Component<PromptInputProps> = (props) => {
   const navigate = useNavigate()
@@ -43,7 +71,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
   onMount(() => {
     const interval = setInterval(() => {
       setPlaceholder((prev) => (prev + 1) % PLACEHOLDERS.length)
-    }, 5000)
+    }, 6500)
     onCleanup(() => clearInterval(interval))
   })
 
@@ -460,7 +488,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
               {(i) => (
                 <div class="w-full flex items-center justify-between gap-x-3">
                   <div class="flex items-center gap-x-2.5 text-text-muted grow min-w-0">
-                    <img src={`https://models.dev/logos/${i.provider.id}.svg`} class="size-6 p-0.5 shrink-0" />
+                    <ProviderIcon name={i.provider.id as IconName} class="size-6 p-0.5 shrink-0" />
                     <div class="flex gap-x-3 items-baseline flex-[1_0_0]">
                       <span class="text-14-medium text-text-strong overflow-hidden text-ellipsis">{i.name}</span>
                       <Show when={false}>

packages/desktop/src/context/global-sync.tsx

@@ -31,13 +31,20 @@ const PASTEL_COLORS = [
   "#C1E1C1", // pastel mint
 ]
 
-function randomPastelColor() {
-  return PASTEL_COLORS[Math.floor(Math.random() * PASTEL_COLORS.length)]
+function pickAvailableColor(usedColors: Set<string>) {
+  const available = PASTEL_COLORS.filter((c) => !usedColors.has(c))
+  if (available.length === 0) return PASTEL_COLORS[Math.floor(Math.random() * PASTEL_COLORS.length)]
+  return available[Math.floor(Math.random() * available.length)]
 }
 
-async function ensureProjectColor(project: Project, sdk: ReturnType<typeof useGlobalSDK>): Promise<Project> {
+async function ensureProjectColor(
+  project: Project,
+  sdk: ReturnType<typeof useGlobalSDK>,
+  usedColors: Set<string>,
+): Promise<Project> {
   if (project.icon?.color) return project
-  const color = randomPastelColor()
+  const color = pickAvailableColor(usedColors)
+  usedColors.add(color)
   const updated = { ...project, icon: { ...project.icon, color } }
   sdk.client.project.update({ projectID: project.id, icon: { color } })
   return updated
@@ -117,7 +124,8 @@ export const { use: useGlobalSync, provider: GlobalSyncProvider } = createSimple
       if (directory === "global") {
         switch (event.type) {
           case "project.updated": {
-            ensureProjectColor(event.properties, sdk).then((project) => {
+            const usedColors = new Set(globalStore.projects.map((p) => p.icon?.color).filter(Boolean) as string[])
+            ensureProjectColor(event.properties, sdk, usedColors).then((project) => {
               const result = Binary.search(globalStore.projects, project.id, (s) => s.id)
               if (result.found) {
                 setGlobalStore("projects", result.index, reconcile(project))
@@ -209,7 +217,8 @@ export const { use: useGlobalSync, provider: GlobalSyncProvider } = createSimple
     Promise.all([
       sdk.client.project.list().then(async (x) => {
         const filtered = x.data!.filter((p) => !p.worktree.includes("opencode-test") && p.vcs)
-        const projects = await Promise.all(filtered.map((p) => ensureProjectColor(p, sdk)))
+        const usedColors = new Set(filtered.map((p) => p.icon?.color).filter(Boolean) as string[])
+        const projects = await Promise.all(filtered.map((p) => ensureProjectColor(p, sdk, usedColors)))
         setGlobalStore(
           "projects",
           projects.sort((a, b) => a.id.localeCompare(b.id)),

packages/enterprise/src/routes/share/[shareID].tsx

@@ -8,6 +8,7 @@ import { createEffect, createMemo, ErrorBoundary, For, Match, Show, Switch } fro
 import { Share } from "~/core/share"
 import { Logo, Mark } from "@opencode-ai/ui/logo"
 import { IconButton } from "@opencode-ai/ui/icon-button"
+import { ProviderIcon } from "@opencode-ai/ui/provider-icon"
 import { createDefaultOptions } from "@opencode-ai/ui/pierre"
 import { iife } from "@opencode-ai/util/iife"
 import { Binary } from "@opencode-ai/util/binary"
@@ -21,6 +22,7 @@ import { Tabs } from "@opencode-ai/ui/tabs"
 import { preloadMultiFileDiff, PreloadMultiFileDiffResult } from "@pierre/precision-diffs/ssr"
 import { Diff as SSRDiff } from "@opencode-ai/ui/diff-ssr"
 import { clientOnly } from "@solidjs/start"
+import { type IconName } from "@opencode-ai/ui/icons/provider"
 
 const ClientOnlyDiff = clientOnly(() => import("@opencode-ai/ui/diff").then((m) => ({ default: m.Diff })))
 
@@ -210,10 +212,7 @@ export default function () {
                           <div class="text-12-mono text-text-base">v{info().version}</div>
                         </div>
                         <div class="flex gap-2 items-center">
-                          <img
-                            src={`https://models.dev/logos/${provider()}.svg`}
-                            class="size-3.5 shrink-0 dark:invert"
-                          />
+                          <ProviderIcon name={provider() as IconName} class="size-3.5 shrink-0 text-icon-strong-base" />
                           <div class="text-12-regular text-text-base">{model()?.name ?? modelID()}</div>
                         </div>
                         <div class="text-12-regular text-text-weaker">

packages/opencode/src/plugin/index.ts

@@ -61,14 +61,10 @@ export namespace Plugin {
     for (const hook of await state().then((x) => x.hooks)) {
       const fn = hook[name]
       if (!fn) continue
-      try {
-        // @ts-expect-error if you feel adventurous, please fix the typing, make sure to bump the try-counter if you
-        // give up.
-        // try-counter: 2
-        await fn(input, output)
-      } catch (e) {
-        log.error("failed to trigger hook", { name, error: e })
-      }
+      // @ts-expect-error if you feel adventurous, please fix the typing, make sure to bump the try-counter if you
+      // give up.
+      // try-counter: 2
+      await fn(input, output)
     }
     return output
   }

packages/opencode/src/session/prompt.ts

@@ -1231,8 +1231,8 @@ export namespace SessionPrompt {
       },
     }
     await Session.updatePart(part)
-    const shell = process.env["SHELL"] ?? "bash"
-    const shellName = path.basename(shell)
+    const shell = process.env["SHELL"] ?? (process.platform === "win32" ? process.env["COMSPEC"] || "cmd.exe" : "bash")
+    const shellName = path.basename(shell).toLowerCase()
 
     const invocations: Record<string, { args: string[] }> = {
       nu: {
@@ -1262,6 +1262,14 @@ export namespace SessionPrompt {
           `,
         ],
       },
+      // Windows cmd.exe
+      "cmd.exe": {
+        args: ["/c", input.command],
+      },
+      // Windows PowerShell
+      "powershell.exe": {
+        args: ["-NoProfile", "-Command", input.command],
+      },
       // Fallback: any shell that doesn't match those above
       "": {
         args: ["-c", "-l", `${input.command}`],
@@ -1273,7 +1281,7 @@ export namespace SessionPrompt {
 
     const proc = spawn(shell, args, {
       cwd: Instance.directory,
-      detached: true,
+      detached: process.platform !== "win32",
       stdio: ["ignore", "pipe", "pipe"],
       env: {
         ...process.env,

packages/ui/package.json

@@ -10,6 +10,8 @@
     "./context/*": "./src/context/*.tsx",
     "./styles": "./src/styles/index.css",
     "./styles/tailwind": "./src/styles/tailwind/index.css",
+    "./icons/provider": "./src/components/provider-icons/types.ts",
+    "./icons/file-type": "./src/components/file-icons/types.ts",
     "./fonts/*": "./src/assets/fonts/*"
   },
   "scripts": {