From 8b034f0476b104a026e13129c2d0e041ae3bab55 Mon Sep 17 00:00:00 2001
From: Igor <igor.levochkin@xrtc.io>
Date: Sun, 10 May 2026 06:45:59 +0700
Subject: [PATCH 01/14] Add project automation management

---
 .../raw/features/project-cron-automations.md  |  13 ++
 .../wiki/concepts/project-cron-automations.md |  23 +++
 llm-wiki/wiki/index.md                        |   2 +
 llm-wiki/wiki/log.md                          |   3 +
 src/api/codexGateway.ts                       |  51 +++++
 src/components/sidebar/SidebarThreadTree.vue  | 146 ++++++++++++--
 src/server/codexAppServerBridge.ts            | 190 +++++++++++++++++-
 src/types/codex.ts                            |   1 +
 tests.md                                      | 106 +++++-----
 9 files changed, 464 insertions(+), 71 deletions(-)
 create mode 100644 llm-wiki/raw/features/project-cron-automations.md
 create mode 100644 llm-wiki/wiki/concepts/project-cron-automations.md

diff --git a/llm-wiki/raw/features/project-cron-automations.md b/llm-wiki/raw/features/project-cron-automations.md
new file mode 100644
index 000000000..66689c13d
--- /dev/null
+++ b/llm-wiki/raw/features/project-cron-automations.md
@@ -0,0 +1,13 @@
+# Project cron automations source
+
+Date: 2026-05-10
+
+Project-scoped automations are represented as Codex cron automations with a `cwds` array containing the project folder path. Thread automations remain heartbeat automations keyed by `target_thread_id`.
+
+Implementation facts:
+- `src/server/codexAppServerBridge.ts` parses and serializes `cwds` in automation TOML records.
+- `GET /codex-api/project-automations` returns project cron automations grouped by project cwd.
+- `GET`, `PUT`, and `DELETE /codex-api/project-automation` read, save, and remove automations for one project cwd.
+- `src/api/codexGateway.ts` exposes project automation helpers mirroring the thread automation helpers.
+- `src/components/sidebar/SidebarThreadTree.vue` adds project menu `Add automation…` / `Manage automations…`, project row `Auto` chips, and reuses the existing automation dialog with project-specific copy.
+- Project automations intentionally do not expose `Run now`; the existing manual run behavior remains thread-heartbeat-only.
diff --git a/llm-wiki/wiki/concepts/project-cron-automations.md b/llm-wiki/wiki/concepts/project-cron-automations.md
new file mode 100644
index 000000000..e24182a0a
--- /dev/null
+++ b/llm-wiki/wiki/concepts/project-cron-automations.md
@@ -0,0 +1,23 @@
+# Project Cron Automations
+
+Project automations extend the existing sidebar automation UI from thread-scoped heartbeat records to project-scoped cron records.
+
+## Storage
+
+Project automations use Codex cron automation TOML records with `cwds = ["<project path>"]`. This matches Codex's project/folder automation shape while preserving thread heartbeat records that use `target_thread_id`.
+
+Source: [project-cron-automations.md](../../raw/features/project-cron-automations.md)
+
+## UI
+
+The sidebar project row dots menu exposes `Add automation…` or `Manage automations…`. The dialog reuses the thread automation manager style, including multiple automation selection, schedule presets, status, and remove/save behavior.
+
+Project rows show the same compact `Auto` chip when at least one project automation is attached.
+
+Source: [project-cron-automations.md](../../raw/features/project-cron-automations.md)
+
+## Boundaries
+
+`Run now` remains available only for thread heartbeat automations because it queues a heartbeat message into a concrete thread. Project cron automations are scheduled against one or more working directories instead.
+
+Source: [project-cron-automations.md](../../raw/features/project-cron-automations.md)
diff --git a/llm-wiki/wiki/index.md b/llm-wiki/wiki/index.md
index 94b762bd3..21349b557 100644
--- a/llm-wiki/wiki/index.md
+++ b/llm-wiki/wiki/index.md
@@ -14,6 +14,7 @@
 - [concepts/realtime-chat-rendering.md](./concepts/realtime-chat-rendering.md): realtime chat rendering, sync-churn reduction, and inline media sanitization.
 - [concepts/skills-route-ui.md](./concepts/skills-route-ui.md): Skills route naming, first-launch Plugins card persistence, dark-theme fixes, and verification lessons.
 - [concepts/thread-heartbeat-automations.md](./concepts/thread-heartbeat-automations.md): thread-scoped heartbeat automation storage, multi-automation management, and manual run behavior.
+- [concepts/project-cron-automations.md](./concepts/project-cron-automations.md): project-scoped cron automation storage and sidebar management UI.
 
 ## Sources
 - [../raw/features/integrated-terminal.md](../raw/features/integrated-terminal.md): source facts for the integrated terminal implementation and follow-up tests.
@@ -21,6 +22,7 @@
 - [../raw/features/realtime-chat-rendering-inline-media.md](../raw/features/realtime-chat-rendering-inline-media.md): source facts for realtime chat rendering and inline media sanitization.
 - [../raw/features/skills-route-ui-and-first-launch-card.md](../raw/features/skills-route-ui-and-first-launch-card.md): source facts for the Skills route rename, first-launch Plugins card, dark-theme fix, and dev-server workflow adjustment.
 - [../raw/features/thread-heartbeat-automations.md](../raw/features/thread-heartbeat-automations.md): source facts for thread heartbeat automations, multiple automations per thread, and Run now queue behavior.
+- [../raw/features/project-cron-automations.md](../raw/features/project-cron-automations.md): source facts for project cron automations in the sidebar.
 - [../raw/projects/codex-web-local.md](../raw/projects/codex-web-local.md): immutable source snapshot for project facts.
 - [../raw/fixes/opencode-zen-big-pickle-codex-cli.md](../raw/fixes/opencode-zen-big-pickle-codex-cli.md): Big Pickle + Codex CLI fix details.
 - [../raw/fixes/opencode-zen-reasoning-content-proxy.md](../raw/fixes/opencode-zen-reasoning-content-proxy.md): Codex Web Local Zen proxy reasoning_content round-trip fix and Docker verification.
diff --git a/llm-wiki/wiki/log.md b/llm-wiki/wiki/log.md
index 6f1bc3d43..11da0e02e 100644
--- a/llm-wiki/wiki/log.md
+++ b/llm-wiki/wiki/log.md
@@ -46,3 +46,6 @@
 - Updated wiki page: `concepts/opencode-zen-big-pickle.md`.
 - Documents: DeepSeek thinking-mode `reasoning_content` round-trip requirement, Chat-shaped Zen proxy endpoint selection, streaming reasoning preservation, Docker validation, and the `/tmp/app.tar` restart gotcha.
 - Updated `index.md`.
+## 2026-05-10
+
+- Added project cron automation notes for sidebar project-level automation management.
diff --git a/src/api/codexGateway.ts b/src/api/codexGateway.ts
index 11146893f..b5eb53a42 100644
--- a/src/api/codexGateway.ts
+++ b/src/api/codexGateway.ts
@@ -1039,6 +1039,7 @@ function asAutomation(record: unknown): UiThreadAutomation | null {
     rrule,
     status,
     targetThreadId: readString(row.targetThreadId),
+    cwds: Array.isArray(row.cwds) ? row.cwds.filter((item): item is string => typeof item === 'string' && item.trim().length > 0) : [],
     createdAtMs: readNumber(row.createdAtMs),
     updatedAtMs: readNumber(row.updatedAtMs),
     nextRunAtMs: readNumber(row.nextRunAtMs),
@@ -1070,6 +1071,22 @@ export async function getThreadAutomationMap(): Promise<Record<string, UiThreadA
   return next
 }
 
+export async function getProjectAutomationMap(): Promise<Record<string, UiThreadAutomation[]>> {
+  const response = await fetch('/codex-api/project-automations')
+  const payload = await response.json().catch(() => null)
+  if (!response.ok) {
+    throw new Error(extractErrorMessage(payload, 'Failed to load project automations'))
+  }
+  const data = asRecord(asRecord(payload)?.data)
+  const next: Record<string, UiThreadAutomation[]> = {}
+  if (!data) return next
+  for (const [projectName, value] of Object.entries(data)) {
+    const automations = asAutomationArray(value)
+    if (automations.length > 0) next[projectName] = automations
+  }
+  return next
+}
+
 export async function getThreadAutomation(threadId: string, automationId?: string): Promise<UiThreadAutomation | null> {
   const query = new URLSearchParams({ threadId })
   if (automationId) query.set('automationId', automationId)
@@ -1105,6 +1122,28 @@ export async function upsertThreadAutomation(input: {
   return automation
 }
 
+export async function upsertProjectAutomation(input: {
+  projectName: string
+  id?: string
+  name: string
+  prompt: string
+  rrule: string
+  status: UiThreadAutomationStatus
+}): Promise<UiThreadAutomation> {
+  const response = await fetch('/codex-api/project-automation', {
+    method: 'PUT',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify(input),
+  })
+  const payload = await response.json().catch(() => null)
+  if (!response.ok) {
+    throw new Error(extractErrorMessage(payload, 'Failed to save project automation'))
+  }
+  const automation = asAutomation(asRecord(payload)?.data)
+  if (!automation) throw new Error('Project automation response was malformed')
+  return automation
+}
+
 export async function deleteThreadAutomation(threadId: string, automationId?: string): Promise<void> {
   const query = new URLSearchParams({ threadId })
   if (automationId) query.set('automationId', automationId)
@@ -1117,6 +1156,18 @@ export async function deleteThreadAutomation(threadId: string, automationId?: st
   }
 }
 
+export async function deleteProjectAutomation(projectName: string, automationId?: string): Promise<void> {
+  const query = new URLSearchParams({ projectName })
+  if (automationId) query.set('automationId', automationId)
+  const response = await fetch(`/codex-api/project-automation?${query.toString()}`, {
+    method: 'DELETE',
+  })
+  const payload = await response.json().catch(() => null)
+  if (!response.ok) {
+    throw new Error(extractErrorMessage(payload, 'Failed to delete project automation'))
+  }
+}
+
 export async function runThreadAutomationNow(threadId: string, automationId: string): Promise<void> {
   const response = await fetch('/codex-api/thread-automation/run', {
     method: 'POST',
diff --git a/src/components/sidebar/SidebarThreadTree.vue b/src/components/sidebar/SidebarThreadTree.vue
index 6609a7040..4a00f42e9 100644
--- a/src/components/sidebar/SidebarThreadTree.vue
+++ b/src/components/sidebar/SidebarThreadTree.vue
@@ -293,6 +293,13 @@
               <span class="project-title" :title="getProjectTooltipTitle(group.projectName)">
                 {{ getProjectVisibleName(group) }}
               </span>
+              <span
+                v-if="projectHasAutomation(group.projectName)"
+                class="thread-row-automation-chip"
+                :title="projectAutomationTooltip(group.projectName)"
+              >
+                Auto
+              </span>
             </span>
             <template #right>
               <div class="project-hover-controls">
@@ -316,6 +323,9 @@
                       <button class="project-menu-item" type="button" @click="onBrowseProjectFiles(group.projectName)">
                         Browse files
                       </button>
+                      <button class="project-menu-item" type="button" @click="openProjectAutomationDialog(group.projectName)">
+                        {{ projectHasAutomation(group.projectName) ? 'Manage automations…' : 'Add automation…' }}
+                      </button>
                       <button
                         v-if="projectGitRepoByName[group.projectName]"
                         class="project-menu-item"
@@ -655,11 +665,11 @@
 
     <Teleport to="body">
       <div v-if="automationDialogVisible" class="rename-thread-overlay" @click.self="closeAutomationDialog">
-        <div class="rename-thread-panel automation-thread-panel" role="dialog" aria-modal="true" aria-label="Thread automation">
+        <div class="rename-thread-panel automation-thread-panel" role="dialog" aria-modal="true" :aria-label="automationDialogScope === 'project' ? 'Project automation' : 'Thread automation'">
           <h3 class="rename-thread-title">{{ automationDialogMode === 'edit' ? 'Edit automation' : 'Add automation' }}</h3>
-          <p class="rename-thread-subtitle">This creates heartbeat automations attached to the selected thread.</p>
+          <p class="rename-thread-subtitle">{{ automationDialogSubtitle }}</p>
 
-          <div v-if="automationDialogAutomations.length > 0" class="automation-thread-list" aria-label="Thread automations">
+          <div v-if="automationDialogAutomations.length > 0" class="automation-thread-list" :aria-label="automationDialogScope === 'project' ? 'Project automations' : 'Thread automations'">
             <button
               v-for="automation in automationDialogAutomations"
               :key="automation.id"
@@ -770,7 +780,7 @@
 
           <div class="rename-thread-actions">
             <button
-              v-if="automationDialogMode === 'edit'"
+              v-if="automationDialogMode === 'edit' && automationDialogScope === 'thread'"
               class="rename-thread-button"
               type="button"
               :disabled="isSavingAutomation || isRunningAutomation"
@@ -805,11 +815,14 @@ import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 import type { ComponentPublicInstance } from 'vue'
 import {
   deleteThreadAutomation,
+  deleteProjectAutomation,
+  getProjectAutomationMap,
   getPinnedThreadState,
   getThreadAutomationMap,
   getThreadSummary,
   persistPinnedThreadIds,
   runThreadAutomationNow,
+  upsertProjectAutomation,
   upsertThreadAutomation,
 } from '../../api/codexGateway'
 import type { UiProjectGroup, UiThread, UiThreadAutomation, UiThreadAutomationStatus } from '../../types/codex'
@@ -930,8 +943,11 @@ const deleteThreadDialogVisible = ref(false)
 const deleteThreadDialogThreadId = ref('')
 const deleteThreadTitle = ref('')
 const automationByThreadId = ref<Record<string, UiThreadAutomation[]>>({})
+const automationByProjectName = ref<Record<string, UiThreadAutomation[]>>({})
 const automationDialogVisible = ref(false)
+const automationDialogScope = ref<'thread' | 'project'>('thread')
 const automationDialogThreadId = ref('')
+const automationDialogProjectName = ref('')
 const automationDialogAutomationId = ref('')
 const automationDialogMode = ref<'create' | 'edit'>('create')
 const automationDialogError = ref('')
@@ -956,10 +972,19 @@ const automationScheduleDraft = ref<AutomationScheduleDraft>({
   intervalUnit: 'hours',
 })
 const automationDialogAutomations = computed(() => {
+  if (automationDialogScope.value === 'project') {
+    const projectName = automationDialogProjectName.value
+    return projectName ? (automationByProjectName.value[projectName] ?? []) : []
+  }
   const threadId = automationDialogThreadId.value
   return threadId ? (automationByThreadId.value[threadId] ?? []) : []
 })
 const automationSchedulePreview = computed(() => describeAutomationSchedule(automationDraft.value.rrule))
+const automationDialogSubtitle = computed(() =>
+  automationDialogScope.value === 'project'
+    ? 'This creates project automations attached to the selected project folder.'
+    : 'This creates heartbeat automations attached to the selected thread.',
+)
 const groupsContainerRef = ref<HTMLElement | null>(null)
 const pendingProjectDrag = ref<PendingProjectDrag | null>(null)
 const activeProjectDrag = ref<ActiveProjectDrag | null>(null)
@@ -1233,6 +1258,11 @@ onMounted(async () => {
   } catch {
     automationByThreadId.value = {}
   }
+  try {
+    automationByProjectName.value = await getProjectAutomationMap()
+  } catch {
+    automationByProjectName.value = {}
+  }
   hasLoadedPinnedThreadState = true
   void hydrateMissingPinnedThreads()
 })
@@ -1394,8 +1424,11 @@ function threadHasAutomation(threadId: string): boolean {
   return (automationByThreadId.value[threadId]?.length ?? 0) > 0
 }
 
-function threadAutomationTooltip(threadId: string): string {
-  const automations = automationByThreadId.value[threadId] ?? []
+function projectHasAutomation(projectName: string): boolean {
+  return (automationByProjectName.value[projectName]?.length ?? 0) > 0
+}
+
+function automationTooltip(automations: UiThreadAutomation[]): string {
   if (automations.length === 0) return ''
   if (automations.length > 1) {
     const activeCount = automations.filter((automation) => automation.status === 'ACTIVE').length
@@ -1410,6 +1443,14 @@ function threadAutomationTooltip(threadId: string): string {
   return `${automation.name} • Next run: ${nextRunLabel}`
 }
 
+function threadAutomationTooltip(threadId: string): string {
+  return automationTooltip(automationByThreadId.value[threadId] ?? [])
+}
+
+function projectAutomationTooltip(projectName: string): string {
+  return automationTooltip(automationByProjectName.value[projectName] ?? [])
+}
+
 function padRruleNumber(value: number): string {
   return String(Math.max(0, value)).padStart(2, '0')
 }
@@ -1665,7 +1706,9 @@ function deleteThreadById(threadId: string): void {
 }
 
 function openAutomationDialog(threadId: string): void {
+  automationDialogScope.value = 'thread'
   automationDialogThreadId.value = threadId
+  automationDialogProjectName.value = ''
   automationDialogError.value = ''
   automationDialogNotice.value = ''
   const existing = automationByThreadId.value[threadId]?.[0]
@@ -1678,13 +1721,29 @@ function openAutomationDialog(threadId: string): void {
   closeThreadMenu()
 }
 
+function openProjectAutomationDialog(projectName: string): void {
+  automationDialogScope.value = 'project'
+  automationDialogThreadId.value = ''
+  automationDialogProjectName.value = projectName
+  automationDialogError.value = ''
+  automationDialogNotice.value = ''
+  const existing = automationByProjectName.value[projectName]?.[0]
+  if (existing) {
+    selectAutomationForEditing(existing.id)
+  } else {
+    startNewAutomationDraft()
+  }
+  automationDialogVisible.value = true
+  closeProjectMenu()
+}
+
 function startNewAutomationDraft(): void {
   automationDialogAutomationId.value = ''
   automationDialogMode.value = 'create'
   automationDialogError.value = ''
   automationDialogNotice.value = ''
   automationDraft.value = {
-    name: 'Thread automation',
+    name: automationDialogScope.value === 'project' ? 'Project automation' : 'Thread automation',
     prompt: '',
     rrule: 'FREQ=DAILY;BYHOUR=9;BYMINUTE=0',
     status: 'ACTIVE',
@@ -1710,7 +1769,9 @@ function selectAutomationForEditing(automationId: string): void {
 
 function closeAutomationDialog(): void {
   automationDialogVisible.value = false
+  automationDialogScope.value = 'thread'
   automationDialogThreadId.value = ''
+  automationDialogProjectName.value = ''
   automationDialogAutomationId.value = ''
   automationDialogError.value = ''
   automationDialogNotice.value = ''
@@ -1747,23 +1808,60 @@ function removeAutomationForThread(
   return next.length > 0 ? { ...state, [threadId]: next } : omitAutomationThread(state, threadId)
 }
 
+function omitAutomationProject(state: Record<string, UiThreadAutomation[]>, projectName: string): Record<string, UiThreadAutomation[]> {
+  return Object.fromEntries(Object.entries(state).filter(([name]) => name !== projectName))
+}
+
+function updateAutomationForProject(
+  state: Record<string, UiThreadAutomation[]>,
+  projectName: string,
+  saved: UiThreadAutomation,
+): Record<string, UiThreadAutomation[]> {
+  const existing = state[projectName] ?? []
+  const index = existing.findIndex((automation) => automation.id === saved.id)
+  const next = [...existing]
+  if (index >= 0) {
+    next.splice(index, 1, saved)
+  } else {
+    next.push(saved)
+  }
+  return { ...state, [projectName]: next }
+}
+
+function removeAutomationForProject(
+  state: Record<string, UiThreadAutomation[]>,
+  projectName: string,
+  automationId: string,
+): Record<string, UiThreadAutomation[]> {
+  const next = (state[projectName] ?? []).filter((automation) => automation.id !== automationId)
+  return next.length > 0 ? { ...state, [projectName]: next } : omitAutomationProject(state, projectName)
+}
+
 async function submitAutomationDialog(): Promise<void> {
   const threadId = automationDialogThreadId.value
-  if (!threadId) return
+  const projectName = automationDialogProjectName.value
+  if (automationDialogScope.value === 'thread' && !threadId) return
+  if (automationDialogScope.value === 'project' && !projectName) return
   isSavingAutomation.value = true
   automationDialogError.value = ''
   automationDialogNotice.value = ''
   try {
     syncAutomationRruleFromScheduleDraft()
-    const saved = await upsertThreadAutomation({
-      threadId,
+    const input = {
       id: automationDialogAutomationId.value || undefined,
       name: automationDraft.value.name,
       prompt: automationDraft.value.prompt,
       rrule: automationDraft.value.rrule,
       status: automationDraft.value.status,
-    })
-    automationByThreadId.value = updateAutomationForThread(automationByThreadId.value, threadId, saved)
+    }
+    const saved = automationDialogScope.value === 'project'
+      ? await upsertProjectAutomation({ ...input, projectName })
+      : await upsertThreadAutomation({ ...input, threadId })
+    if (automationDialogScope.value === 'project') {
+      automationByProjectName.value = updateAutomationForProject(automationByProjectName.value, projectName, saved)
+    } else {
+      automationByThreadId.value = updateAutomationForThread(automationByThreadId.value, threadId, saved)
+    }
     selectAutomationForEditing(saved.id)
     automationDialogNotice.value = 'Automation saved.'
     isSavingAutomation.value = false
@@ -1775,15 +1873,23 @@ async function submitAutomationDialog(): Promise<void> {
 
 async function onDeleteAutomationFromDialog(): Promise<void> {
   const threadId = automationDialogThreadId.value
+  const projectName = automationDialogProjectName.value
   const automationId = automationDialogAutomationId.value
-  if (!threadId || !automationId) return
+  if (!automationId) return
+  if (automationDialogScope.value === 'thread' && !threadId) return
+  if (automationDialogScope.value === 'project' && !projectName) return
   isSavingAutomation.value = true
   automationDialogError.value = ''
   automationDialogNotice.value = ''
   try {
-    await deleteThreadAutomation(threadId, automationId)
-    automationByThreadId.value = removeAutomationForThread(automationByThreadId.value, threadId, automationId)
-    const nextAutomation = automationByThreadId.value[threadId]?.[0]
+    if (automationDialogScope.value === 'project') {
+      await deleteProjectAutomation(projectName, automationId)
+      automationByProjectName.value = removeAutomationForProject(automationByProjectName.value, projectName, automationId)
+    } else {
+      await deleteThreadAutomation(threadId, automationId)
+      automationByThreadId.value = removeAutomationForThread(automationByThreadId.value, threadId, automationId)
+    }
+    const nextAutomation = automationDialogAutomations.value[0]
     if (nextAutomation) {
       selectAutomationForEditing(nextAutomation.id)
     } else {
@@ -1956,6 +2062,10 @@ function onProjectNameInput(projectName: string): void {
 
 function onRemoveProject(projectName: string): void {
   emit('remove-project', projectName)
+  if (projectHasAutomation(projectName)) {
+    void deleteProjectAutomation(projectName).catch(() => undefined)
+    automationByProjectName.value = omitAutomationProject(automationByProjectName.value, projectName)
+  }
   closeProjectMenu()
 }
 
@@ -2726,7 +2836,7 @@ onBeforeUnmount(() => {
 }
 
 .project-main-button {
-  @apply min-w-0 w-full text-left rounded px-0 py-0 flex items-center min-h-5 cursor-grab;
+  @apply min-w-0 w-full text-left rounded px-0 py-0 flex items-center gap-1.5 min-h-5 cursor-grab;
 }
 
 .project-main-button[data-dragging-handle='true'] {
@@ -2746,7 +2856,7 @@ onBeforeUnmount(() => {
 }
 
 .project-title {
-  @apply text-sm font-normal text-zinc-700 truncate select-none;
+  @apply min-w-0 flex-1 text-sm font-normal text-zinc-700 truncate select-none;
 }
 
 .project-menu-wrap {
diff --git a/src/server/codexAppServerBridge.ts b/src/server/codexAppServerBridge.ts
index 93c0bf849..10879690d 100644
--- a/src/server/codexAppServerBridge.ts
+++ b/src/server/codexAppServerBridge.ts
@@ -3167,6 +3167,7 @@ type ThreadAutomationRecord = {
   rrule: string
   status: ThreadAutomationStatus
   targetThreadId: string | null
+  cwds: string[]
   createdAtMs: number | null
   updatedAtMs: number | null
   nextRunAtMs: number | null
@@ -3188,6 +3189,23 @@ function serializeTomlString(value: string): string {
   return JSON.stringify(value)
 }
 
+function parseTomlStringArray(value: string): string[] {
+  const trimmed = value.trim()
+  if (!trimmed.startsWith('[') || !trimmed.endsWith(']')) return []
+  try {
+    const parsed = JSON.parse(trimmed)
+    return Array.isArray(parsed)
+      ? parsed.filter((item): item is string => typeof item === 'string' && item.trim().length > 0)
+      : []
+  } catch {
+    return []
+  }
+}
+
+function serializeTomlStringArray(values: string[]): string {
+  return `[${values.map((value) => serializeTomlString(value)).join(', ')}]`
+}
+
 function parseAutomationToml(raw: string): ThreadAutomationRecord | null {
   const values: Record<string, string> = {}
   for (const line of raw.split(/\r?\n/u)) {
@@ -3200,12 +3218,13 @@ function parseAutomationToml(raw: string): ThreadAutomationRecord | null {
   }
 
   const id = readTomlString(values.id ?? '')
-  const kindValue = readTomlString(values.kind ?? 'heartbeat')
+  const kindValue = readTomlString(values.kind ?? (values.cwds ? 'cron' : 'heartbeat'))
   const name = readTomlString(values.name ?? '')
   const prompt = readTomlString(values.prompt ?? '')
   const rrule = readTomlString(values.rrule ?? '')
   const statusValue = readTomlString(values.status ?? 'ACTIVE')
   const targetThreadId = readTomlString(values.target_thread_id ?? '') || null
+  const cwds = parseTomlStringArray(values.cwds ?? '')
   const createdAtMs = Number.parseInt(values.created_at ?? '', 10)
   const updatedAtMs = Number.parseInt(values.updated_at ?? '', 10)
 
@@ -3221,6 +3240,7 @@ function parseAutomationToml(raw: string): ThreadAutomationRecord | null {
     rrule,
     status: statusValue,
     targetThreadId,
+    cwds,
     createdAtMs: Number.isFinite(createdAtMs) ? createdAtMs : null,
     updatedAtMs: Number.isFinite(updatedAtMs) ? updatedAtMs : null,
     nextRunAtMs: null,
@@ -3236,10 +3256,17 @@ function serializeAutomationToml(record: ThreadAutomationRecord): string {
     `prompt = ${serializeTomlString(record.prompt)}`,
     `status = ${serializeTomlString(record.status)}`,
     `rrule = ${serializeTomlString(record.rrule)}`,
-    `target_thread_id = ${serializeTomlString(record.targetThreadId ?? '')}`,
+  ]
+  if (record.targetThreadId) {
+    lines.push(`target_thread_id = ${serializeTomlString(record.targetThreadId)}`)
+  }
+  if (record.cwds.length > 0) {
+    lines.push(`cwds = ${serializeTomlStringArray(record.cwds)}`)
+  }
+  lines.push(
     `created_at = ${String(record.createdAtMs ?? Date.now())}`,
     `updated_at = ${String(record.updatedAtMs ?? Date.now())}`,
-  ]
+  )
   return `${lines.join('\n')}\n`
 }
 
@@ -3340,6 +3367,7 @@ async function writeThreadHeartbeatAutomation(input: {
     rrule,
     status: input.status,
     targetThreadId: threadId,
+    cwds: [],
     createdAtMs: existing?.createdAtMs ?? now,
     updatedAtMs: now,
     nextRunAtMs: null,
@@ -3372,6 +3400,113 @@ async function deleteThreadHeartbeatAutomation(threadId: string, automationId =
   return true
 }
 
+async function listProjectCronAutomations(): Promise<Record<string, ThreadAutomationRecord[]>> {
+  const automationRoot = getCodexAutomationsDir()
+  const next: Record<string, ThreadAutomationRecord[]> = {}
+  let entries
+  try {
+    entries = await readdir(automationRoot, { withFileTypes: true })
+  } catch {
+    return next
+  }
+
+  for (const entry of entries) {
+    if (!entry.isDirectory()) continue
+    const automation = await readAutomationRecordFromFile(join(automationRoot, entry.name, 'automation.toml'))
+    if (!automation || automation.kind !== 'cron' || automation.cwds.length === 0) continue
+    for (const cwd of automation.cwds) {
+      next[cwd] = [...(next[cwd] ?? []), automation]
+    }
+  }
+
+  for (const automations of Object.values(next)) {
+    automations.sort((first, second) => {
+      const firstCreatedAt = first.createdAtMs ?? 0
+      const secondCreatedAt = second.createdAtMs ?? 0
+      if (firstCreatedAt !== secondCreatedAt) return firstCreatedAt - secondCreatedAt
+      return first.id.localeCompare(second.id)
+    })
+  }
+
+  return next
+}
+
+async function readProjectCronAutomations(projectName: string): Promise<ThreadAutomationRecord[]> {
+  const all = await listProjectCronAutomations()
+  return all[projectName] ?? []
+}
+
+async function readProjectCronAutomation(projectName: string, automationId = ''): Promise<ThreadAutomationRecord | null> {
+  const automations = await readProjectCronAutomations(projectName)
+  if (automationId) return automations.find((automation) => automation.id === automationId) ?? null
+  return automations[0] ?? null
+}
+
+async function writeProjectCronAutomation(input: {
+  projectName: string
+  id?: string
+  name: string
+  prompt: string
+  rrule: string
+  status: ThreadAutomationStatus
+}): Promise<ThreadAutomationRecord> {
+  const projectName = input.projectName.trim()
+  const name = input.name.trim()
+  const prompt = input.prompt.trim()
+  const rrule = input.rrule.trim()
+  if (!projectName || !name || !prompt || !rrule) {
+    throw new Error('projectName, name, prompt, and rrule are required')
+  }
+
+  const automationRoot = getCodexAutomationsDir()
+  await mkdir(automationRoot, { recursive: true })
+  const existing = input.id ? await readProjectCronAutomation(projectName, input.id.trim()) : null
+  const entries = await readdir(automationRoot, { withFileTypes: true }).catch(() => [])
+  const existingIds = new Set(entries.filter((entry) => entry.isDirectory()).map((entry) => entry.name))
+  const id = existing?.id ?? resolveUniqueAutomationId(existingIds, projectName, name)
+  const automationDir = join(automationRoot, id)
+  const now = Date.now()
+  const record: ThreadAutomationRecord = {
+    id,
+    kind: 'cron',
+    name,
+    prompt,
+    rrule,
+    status: input.status,
+    targetThreadId: null,
+    cwds: [projectName],
+    createdAtMs: existing?.createdAtMs ?? now,
+    updatedAtMs: now,
+    nextRunAtMs: null,
+  }
+
+  await mkdir(automationDir, { recursive: true })
+  await writeFile(join(automationDir, 'automation.toml'), serializeAutomationToml(record), 'utf8')
+  const memoryPath = join(automationDir, 'memory.md')
+  try {
+    await stat(memoryPath)
+  } catch {
+    await writeFile(memoryPath, '', 'utf8')
+  }
+  return record
+}
+
+async function deleteProjectCronAutomation(projectName: string, automationId = ''): Promise<boolean> {
+  const normalizedProjectName = projectName.trim()
+  const normalizedAutomationId = automationId.trim()
+  if (normalizedAutomationId) {
+    const automation = await readProjectCronAutomation(normalizedProjectName, normalizedAutomationId)
+    if (!automation) return false
+    await rm(join(getCodexAutomationsDir(), automation.id), { recursive: true, force: true })
+    return true
+  }
+
+  const automations = await readProjectCronAutomations(normalizedProjectName)
+  if (automations.length === 0) return false
+  await Promise.all(automations.map((automation) => rm(join(getCodexAutomationsDir(), automation.id), { recursive: true, force: true })))
+  return true
+}
+
 type ThreadTitleCache = { titles: Record<string, string>; order: string[] }
 const MAX_THREAD_TITLES = 500
 const EMPTY_THREAD_TITLE_CACHE: ThreadTitleCache = { titles: {}, order: [] }
@@ -6879,6 +7014,12 @@ export function createCodexBridgeMiddleware(): CodexBridgeMiddleware {
         return
       }
 
+      if (req.method === 'GET' && url.pathname === '/codex-api/project-automations') {
+        const automationsByProjectName = await listProjectCronAutomations()
+        setJson(res, 200, { data: automationsByProjectName })
+        return
+      }
+
       if (req.method === 'GET' && url.pathname === '/codex-api/thread-automation') {
         const threadId = url.searchParams.get('threadId')?.trim() ?? ''
         const automationId = url.searchParams.get('automationId')?.trim() ?? ''
@@ -6893,6 +7034,20 @@ export function createCodexBridgeMiddleware(): CodexBridgeMiddleware {
         return
       }
 
+      if (req.method === 'GET' && url.pathname === '/codex-api/project-automation') {
+        const projectName = url.searchParams.get('projectName')?.trim() ?? ''
+        const automationId = url.searchParams.get('automationId')?.trim() ?? ''
+        if (!projectName) {
+          setJson(res, 400, { error: 'Missing projectName' })
+          return
+        }
+        const automation = automationId
+          ? await readProjectCronAutomation(projectName, automationId)
+          : await readProjectCronAutomations(projectName)
+        setJson(res, 200, { data: automation })
+        return
+      }
+
       if (req.method === 'POST' && url.pathname === '/codex-api/thread-search') {
         const payload = asRecord(await readJsonBody(req))
         const query = typeof payload?.query === 'string' ? payload.query.trim() : ''
@@ -6961,6 +7116,23 @@ export function createCodexBridgeMiddleware(): CodexBridgeMiddleware {
         return
       }
 
+      if (req.method === 'PUT' && url.pathname === '/codex-api/project-automation') {
+        const payload = asRecord(await readJsonBody(req))
+        const projectName = typeof payload?.projectName === 'string' ? payload.projectName.trim() : ''
+        const id = typeof payload?.id === 'string' ? payload.id.trim() : ''
+        const name = typeof payload?.name === 'string' ? payload.name.trim() : ''
+        const prompt = typeof payload?.prompt === 'string' ? payload.prompt.trim() : ''
+        const rrule = typeof payload?.rrule === 'string' ? payload.rrule.trim() : ''
+        const status = payload?.status === 'PAUSED' ? 'PAUSED' : 'ACTIVE'
+        if (!projectName || !name || !prompt || !rrule) {
+          setJson(res, 400, { error: 'projectName, name, prompt, and rrule are required' })
+          return
+        }
+        const automation = await writeProjectCronAutomation({ projectName, id, name, prompt, rrule, status })
+        setJson(res, 200, { data: automation })
+        return
+      }
+
       if (req.method === 'POST' && url.pathname === '/codex-api/thread-automation/run') {
         const payload = asRecord(await readJsonBody(req))
         const threadId = typeof payload?.threadId === 'string' ? payload.threadId.trim() : ''
@@ -6992,6 +7164,18 @@ export function createCodexBridgeMiddleware(): CodexBridgeMiddleware {
         return
       }
 
+      if (req.method === 'DELETE' && url.pathname === '/codex-api/project-automation') {
+        const projectName = url.searchParams.get('projectName')?.trim() ?? ''
+        const automationId = url.searchParams.get('automationId')?.trim() ?? ''
+        if (!projectName) {
+          setJson(res, 400, { error: 'Missing projectName' })
+          return
+        }
+        const removed = await deleteProjectCronAutomation(projectName, automationId)
+        setJson(res, 200, { data: { removed } })
+        return
+      }
+
       if (req.method === 'POST' && url.pathname === '/codex-api/telegram/configure-bot') {
         const payload = asRecord(await readJsonBody(req))
         const botToken = typeof payload?.botToken === 'string' ? payload.botToken.trim() : ''
diff --git a/src/types/codex.ts b/src/types/codex.ts
index 6ce650c7b..ec3b629b4 100644
--- a/src/types/codex.ts
+++ b/src/types/codex.ts
@@ -86,6 +86,7 @@ export type UiThreadAutomation = {
   rrule: string
   status: UiThreadAutomationStatus
   targetThreadId: string | null
+  cwds: string[]
   createdAtMs: number | null
   updatedAtMs: number | null
   nextRunAtMs: number | null
diff --git a/tests.md b/tests.md
index a185cc9eb..d475cec58 100644
--- a/tests.md
+++ b/tests.md
@@ -66,7 +66,7 @@ This file tracks manual regression and feature verification steps.
 3. Click `Add automation…`.
 4. Fill name, prompt, RRULE schedule, and set status to `Paused`.
 5. Save the automation and reopen the same thread menu.
-6. Confirm the menu now shows `Manage automations…` and the thread row shows an automation chip.
+6. Confirm the menu now shows `Manage automations…` and the thread row shows an automation icon.
 7. Open `Manage automations…`, confirm the saved values are prefilled, then click `Add another automation`.
 8. Fill a second automation with a different name and RRULE, save it, and confirm both automations appear in the dialog list.
 9. Select each automation from the list and confirm its own prompt, RRULE, and status load independently.
@@ -84,12 +84,43 @@ This file tracks manual regression and feature verification steps.
 - Automation heartbeat prompts render as visible user-side cards labeled `Sent via automation`; raw heartbeat XML is not shown.
 - Manual runs use the existing thread queue, so they do not interrupt an active turn and run in order when the thread is available.
 - Removing one automation does not remove other automations attached to the same thread.
-- Removing the final automation removes the thread row automation chip and returns the menu to `Add automation…`.
+- Removing the final automation removes the thread row automation icon and returns the menu to `Add automation…`.
 - Light and dark theme automation manager surfaces remain readable.
 
 #### Rollback/Cleanup
 - Remove any test automations from the thread automation dialog or delete their folders under `$CODEX_HOME/automations/<automation-id>/`.
 
+### Feature: Automations panel
+
+#### Prerequisites
+- App is running from this repository.
+- At least one thread heartbeat automation or project cron automation exists.
+- Light and dark themes are both available from Settings.
+
+#### Steps
+1. In light theme, click `Automations` in the sidebar.
+2. Confirm the content header says `Automations` and the panel lists all thread heartbeat and project cron automations.
+3. Confirm each row shows an icon, automation name, target, active/paused status, and schedule summary.
+4. Select a row and confirm the detail panel shows status, schedule, target, id, and prompt.
+5. Click the row `Edit` button and confirm the existing automation editor opens with the selected automation values prefilled.
+6. Close the editor, select the same automation again, then click the detail-panel `Edit` button and confirm the same editor opens.
+7. Change the automation name or status, save, and confirm the Automations panel refreshes with the updated row.
+8. Refresh the panel and confirm the selected automation stays selected when it still exists.
+9. Open `#/automations?automationId=<existing-id>` directly and confirm that automation is selected.
+10. Create another active thread or project automation, refresh the Automations panel, and confirm the newly created active automation appears at the top of the active rows.
+11. Pause an automation and confirm it appears after active automations even if it was created more recently.
+12. Switch to dark theme and repeat steps 1-7.
+
+#### Expected Results
+- The panel combines heartbeat automations from `/codex-api/thread-automations` and project automations from `/codex-api/project-automations`.
+- Rows are sorted active first, then paused, with newest creation time first inside each status group, then newest update time, then automation name.
+- Row and detail edit buttons open the same existing thread/project automation editor, and saved edits refresh the panel list.
+- Thread targets use known thread titles when available; project targets use known project labels when available.
+- Empty, loading, refresh, and error states remain readable in light and dark themes.
+
+#### Rollback/Cleanup
+- Remove any temporary automations created for verification.
+
 ### Feature: Projectless new chat folders
 
 #### Prerequisites
@@ -271,32 +302,40 @@ This file tracks manual regression and feature verification steps.
 
 ---
 
-### Pinned threads remain visible during background pagination
+### Feature: Project automations from the sidebar project menu
 
 #### Feature/Change Name
-Pinned threads are no longer removed from the Pinned section while the sidebar is still loading older thread-list pages.
+Project rows can create and manage project-scoped cron automations using the same dialog style as thread heartbeat automations.
 
 #### Prerequisites/Setup
 1. Dev server running (`pnpm run dev`)
-2. More than 50 total unarchived threads exist
-3. At least one older thread outside the initial recent page is pinned
-4. Light theme and dark theme both available from the appearance switcher
+2. Sidebar contains at least one project folder row
+3. Light theme and dark theme both available from the appearance switcher
 
 #### Steps
-1. In light theme, reload the app.
-2. Immediately open the sidebar Pinned section.
-3. Confirm pinned rows from older history remain in the Pinned section after the initial thread list appears.
-4. Wait for background thread pagination to finish.
-5. Confirm the same pinned rows remain visible and can still be selected.
-6. Switch to dark theme and repeat steps 1-5.
+1. In light theme, open a project row dots menu for a project without an attached project automation.
+2. Confirm the menu shows `Add automation…` between `Browse files` and Git/project actions.
+3. Click `Add automation…`.
+4. Fill a name, prompt, daily or interval schedule, and status, then save.
+5. Inspect `$CODEX_HOME/automations/<automation-id>/automation.toml` and confirm the `cwds` entry is the resolved absolute project folder path, not only the sidebar display label.
+6. Reopen the same project menu and confirm it now shows `Manage automations…`.
+7. Confirm the project row shows an automation icon.
+8. Open `Manage automations…`, confirm the saved values are prefilled, then click `Add another automation`.
+9. Save a second project automation and confirm both records appear in the dialog list independently.
+10. Confirm the project row automation chip shows the bolt icon plus the visible count `2`.
+11. Repeat the same two-automation check on a chat thread and confirm the thread row chip shows the bolt icon plus the visible count `2`.
+12. Remove one project automation and confirm the project row chip returns to icon-only for one remaining automation.
+13. Remove the final project automation and confirm the project menu returns to `Add automation…` and the project row automation icon disappears.
+14. Switch to dark theme and repeat steps 1-11.
 
 #### Expected Results
-- Saved pinned thread IDs are preserved while only the initial thread-list page is loaded.
-- Missing pinned IDs are pruned only after the full thread list has loaded.
-- Pinned rows remain readable and selectable in both light and dark themes.
+- Project automations are stored as cron automations with `cwds = ["<absolute project path>"]`, including when the sidebar row displays only the project folder name.
+- Thread heartbeat automations remain scoped by `target_thread_id` and continue to use `Run now`.
+- Project automation dialogs use project-specific copy and do not show `Run now`.
+- The project menu, dialog list, inputs, schedule controls, status selector, automation icon, and multi-automation count badge remain readable in light and dark themes.
 
 #### Rollback/Cleanup
-- Unpin any disposable threads created only for this test.
+- Remove test project automations from the project automation dialog or delete their folders under `$CODEX_HOME/automations/<automation-id>/`.
 
 ---
 
@@ -1692,39 +1731,6 @@ Model, skill, thinking, and plan controls remain usable while a thread turn is i
 #### Rollback/Cleanup
 - If needed, run another sync pull/push to restore previous skill state in the sync repo.
 
-### Feature: Public shared skills pull overwrites only shared skills
-
-#### Prerequisites
-- App running from this repository with Skills Hub available.
-- GitHub skills sync is not configured/logged in.
-- Local shared skills directory exists at `~/.codex/skills/shared_skills`.
-
-#### Steps
-1. Create a temporary local-only skill folder under `~/.codex/skills/shared_skills`, or edit a tracked shared skill file in that directory.
-2. Note the parent `~/.codex/skills` status, including any unrelated local edits outside `shared_skills`.
-3. Open `Skills Hub`.
-4. Trigger `Pull` from the `Skills Sync (GitHub)` panel.
-5. Wait for the pull success toast.
-6. Inspect `~/.codex/skills/shared_skills` and compare it with the public `OpenClawAndroid/skills` `android` branch.
-7. Inspect `~/.codex/skills` and verify unrelated parent-level files were not reset or cleaned by the unauthenticated pull.
-8. If `~/.codex/skills/shared_skills/.git` is a git file or worktree/submodule-style pointer, repeat the pull and verify the nested repo is not reinitialized.
-9. Inspect the `/codex-api/skills-sync/pull` response and verify `data.synced` matches the number of direct shared skill folders with `SKILL.md`.
-10. In light theme, verify the Skills Hub list reloads and does not show stale local-only skills.
-11. Switch to dark theme and verify the same Skills Hub state remains readable and current.
-
-#### Expected Results
-- Public unauthenticated pull resets only the nested `shared_skills` repo to the public upstream `android` branch.
-- Local uncommitted edits and local-only untracked skill folders inside `shared_skills` are removed by the pull.
-- Parent-level `~/.codex/skills` files outside `shared_skills` are not reset or cleaned.
-- Existing git-file/worktree/submodule-style shared skills repos are reused, not reinitialized.
-- The pull response reports the shared skills count from `~/.codex/skills/shared_skills`, not the parent skills directory.
-- The installed skills list reloads immediately after the pull in both light and dark theme.
-- Private GitHub sync repos still preserve local edits through the bidirectional sync path.
-
-#### Rollback/Cleanup
-- Recreate any intentionally removed local-only shared skill if it should be kept.
-- Use private sync `Push` only after confirming the public pull result should be mirrored elsewhere.
-
 ### Feature: Force Refresh Skills button in Skills Sync panel
 
 #### Prerequisites

From b5fe4cdfe18ea9e71562dae18e2e6c90f65fcd84 Mon Sep 17 00:00:00 2001
From: Igor <igor.levochkin@xrtc.io>
Date: Sun, 10 May 2026 07:06:58 +0700
Subject: [PATCH 02/14] Resolve project automation cwd

---
 .../raw/features/project-cron-automations.md  |  2 +-
 .../wiki/concepts/project-cron-automations.md |  2 +-
 src/App.vue                                   |  9 +++++++
 src/components/sidebar/SidebarThreadTree.vue  | 24 +++++++++++++------
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/llm-wiki/raw/features/project-cron-automations.md b/llm-wiki/raw/features/project-cron-automations.md
index 66689c13d..1a01435ae 100644
--- a/llm-wiki/raw/features/project-cron-automations.md
+++ b/llm-wiki/raw/features/project-cron-automations.md
@@ -2,7 +2,7 @@
 
 Date: 2026-05-10
 
-Project-scoped automations are represented as Codex cron automations with a `cwds` array containing the project folder path. Thread automations remain heartbeat automations keyed by `target_thread_id`.
+Project-scoped automations are represented as Codex cron automations with a `cwds` array containing the absolute project folder path. The sidebar resolves display labels such as `TestChat` to the real cwd before saving so the Codex scheduler can run in the intended project. Thread automations remain heartbeat automations keyed by `target_thread_id`.
 
 Implementation facts:
 - `src/server/codexAppServerBridge.ts` parses and serializes `cwds` in automation TOML records.
diff --git a/llm-wiki/wiki/concepts/project-cron-automations.md b/llm-wiki/wiki/concepts/project-cron-automations.md
index e24182a0a..80f79d5b7 100644
--- a/llm-wiki/wiki/concepts/project-cron-automations.md
+++ b/llm-wiki/wiki/concepts/project-cron-automations.md
@@ -4,7 +4,7 @@ Project automations extend the existing sidebar automation UI from thread-scoped
 
 ## Storage
 
-Project automations use Codex cron automation TOML records with `cwds = ["<project path>"]`. This matches Codex's project/folder automation shape while preserving thread heartbeat records that use `target_thread_id`.
+Project automations use Codex cron automation TOML records with `cwds = ["<absolute project path>"]`. Sidebar display labels must be resolved to the real project folder before saving, so folder-name rows such as `TestChat` still write the scheduler-visible cwd. This matches Codex's project/folder automation shape while preserving thread heartbeat records that use `target_thread_id`.
 
 Source: [project-cron-automations.md](../../raw/features/project-cron-automations.md)
 
diff --git a/src/App.vue b/src/App.vue
index a3ee90c15..953dc8ea3 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -62,6 +62,7 @@
 
           <SidebarThreadTree :groups="projectGroups" :project-display-name-by-id="projectDisplayNameById"
             :project-git-repo-by-name="projectGitRepoByName"
+            :project-cwd-by-name="projectCwdByName"
             v-if="!isSidebarCollapsed"
             :selected-thread-id="selectedThreadId" :is-loading="isLoadingThreads"
             :is-thread-list-fully-loaded="isThreadListFullyLoaded"
@@ -2323,6 +2324,14 @@ function getProjectCwd(projectName: string): string {
   return resolvePreferredLocalCwd(projectName, projectGroup?.threads[0]?.cwd?.trim() ?? '')
 }
 
+const projectCwdByName = computed<Record<string, string>>(() =>
+  Object.fromEntries(
+    projectGroups.value
+      .map((group) => [group.projectName, getProjectCwd(group.projectName).trim()] as const)
+      .filter(([, cwd]) => cwd.length > 0),
+  ),
+)
+
 function getProjectDisplayNameForWorktree(projectName: string): string {
   return (projectDisplayNameById.value[projectName] ?? projectName).trim() || projectName
 }
diff --git a/src/components/sidebar/SidebarThreadTree.vue b/src/components/sidebar/SidebarThreadTree.vue
index 4a00f42e9..e39987f23 100644
--- a/src/components/sidebar/SidebarThreadTree.vue
+++ b/src/components/sidebar/SidebarThreadTree.vue
@@ -843,6 +843,7 @@ const props = defineProps<{
   groups: UiProjectGroup[]
   projectDisplayNameById: Record<string, string>
   projectGitRepoByName: Record<string, boolean>
+  projectCwdByName: Record<string, string>
   selectedThreadId: string
   isLoading: boolean
   isThreadListFullyLoaded: boolean
@@ -1425,7 +1426,8 @@ function threadHasAutomation(threadId: string): boolean {
 }
 
 function projectHasAutomation(projectName: string): boolean {
-  return (automationByProjectName.value[projectName]?.length ?? 0) > 0
+  const key = getProjectAutomationKey(projectName)
+  return key ? (automationByProjectName.value[key]?.length ?? 0) > 0 : false
 }
 
 function automationTooltip(automations: UiThreadAutomation[]): string {
@@ -1448,7 +1450,8 @@ function threadAutomationTooltip(threadId: string): string {
 }
 
 function projectAutomationTooltip(projectName: string): string {
-  return automationTooltip(automationByProjectName.value[projectName] ?? [])
+  const key = getProjectAutomationKey(projectName)
+  return automationTooltip(key ? (automationByProjectName.value[key] ?? []) : [])
 }
 
 function padRruleNumber(value: number): string {
@@ -1722,12 +1725,14 @@ function openAutomationDialog(threadId: string): void {
 }
 
 function openProjectAutomationDialog(projectName: string): void {
+  const projectCwd = getProjectAutomationKey(projectName)
+  if (!projectCwd) return
   automationDialogScope.value = 'project'
   automationDialogThreadId.value = ''
-  automationDialogProjectName.value = projectName
+  automationDialogProjectName.value = projectCwd
   automationDialogError.value = ''
   automationDialogNotice.value = ''
-  const existing = automationByProjectName.value[projectName]?.[0]
+  const existing = automationByProjectName.value[projectCwd]?.[0]
   if (existing) {
     selectAutomationForEditing(existing.id)
   } else {
@@ -2061,14 +2066,19 @@ function onProjectNameInput(projectName: string): void {
 }
 
 function onRemoveProject(projectName: string): void {
+  const projectCwd = getProjectAutomationKey(projectName)
   emit('remove-project', projectName)
-  if (projectHasAutomation(projectName)) {
-    void deleteProjectAutomation(projectName).catch(() => undefined)
-    automationByProjectName.value = omitAutomationProject(automationByProjectName.value, projectName)
+  if (projectCwd && projectHasAutomation(projectName)) {
+    void deleteProjectAutomation(projectCwd).catch(() => undefined)
+    automationByProjectName.value = omitAutomationProject(automationByProjectName.value, projectCwd)
   }
   closeProjectMenu()
 }
 
+function getProjectAutomationKey(projectName: string): string {
+  return props.projectCwdByName[projectName]?.trim() || projectName.trim()
+}
+
 function onProjectHeaderKeyDown(event: KeyboardEvent, projectName: string): void {
   if (!event.altKey) return
   if (event.key !== 'ArrowUp' && event.key !== 'ArrowDown') return

From a834d1666ba557c569db142660e24a02a3287f30 Mon Sep 17 00:00:00 2001
From: Igor <igor.levochkin@xrtc.io>
Date: Sun, 10 May 2026 07:11:43 +0700
Subject: [PATCH 03/14] Use icon for automation indicator

---
 src/components/sidebar/SidebarThreadTree.vue | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/components/sidebar/SidebarThreadTree.vue b/src/components/sidebar/SidebarThreadTree.vue
index e39987f23..4be01951b 100644
--- a/src/components/sidebar/SidebarThreadTree.vue
+++ b/src/components/sidebar/SidebarThreadTree.vue
@@ -57,7 +57,7 @@
                     class="thread-row-automation-chip"
                     :title="threadAutomationTooltip(thread.id)"
                   >
-                    Auto
+                    <IconTablerBolt class="thread-row-automation-icon" />
                   </span>
                   <span
                     v-if="thread.pendingRequestState"
@@ -220,7 +220,7 @@
                   class="thread-row-automation-chip"
                   :title="threadAutomationTooltip(thread.id)"
                 >
-                  Auto
+                  <IconTablerBolt class="thread-row-automation-icon" />
                 </span>
                 <span
                   v-if="thread.pendingRequestState"
@@ -298,7 +298,7 @@
                 class="thread-row-automation-chip"
                 :title="projectAutomationTooltip(group.projectName)"
               >
-                Auto
+                <IconTablerBolt class="thread-row-automation-icon" />
               </span>
             </span>
             <template #right>
@@ -416,7 +416,7 @@
                         class="thread-row-automation-chip"
                         :title="threadAutomationTooltip(thread.id)"
                       >
-                        Auto
+                        <IconTablerBolt class="thread-row-automation-icon" />
                       </span>
                       <span
                         v-if="thread.pendingRequestState"
@@ -542,7 +542,7 @@
                     class="thread-row-automation-chip"
                     :title="threadAutomationTooltip(thread.id)"
                   >
-                    Auto
+                    <IconTablerBolt class="thread-row-automation-icon" />
                   </span>
                   <span
                     v-if="thread.pendingRequestState"
@@ -833,6 +833,7 @@ import IconTablerFilePencil from '../icons/IconTablerFilePencil.vue'
 import IconTablerFolder from '../icons/IconTablerFolder.vue'
 import IconTablerFolderOpen from '../icons/IconTablerFolderOpen.vue'
 import IconTablerGitFork from '../icons/IconTablerGitFork.vue'
+import IconTablerBolt from '../icons/IconTablerBolt.vue'
 import IconTablerTrash from '../icons/IconTablerTrash.vue'
 import { useUiLanguage } from '../../composables/useUiLanguage'
 import { getPathLeafName, getPathParent, isProjectlessChatPath } from '../../pathUtils.js'
@@ -3050,7 +3051,11 @@ onBeforeUnmount(() => {
 }
 
 .thread-row-automation-chip {
-  @apply rounded-full bg-amber-100 px-1.5 py-0.5 text-[10px] font-medium uppercase tracking-wide text-amber-800;
+  @apply inline-flex h-4 w-4 shrink-0 items-center justify-center rounded-full bg-amber-100 text-amber-800;
+}
+
+.thread-row-automation-icon {
+  @apply h-3 w-3;
 }
 
 .project-header-row:hover .project-icon-folder {

From 4f69693b458fec4a822c0fb2ec4a64f9b3a120cc Mon Sep 17 00:00:00 2001
From: Igor <igor.levochkin@xrtc.io>
Date: Sun, 10 May 2026 07:22:53 +0700
Subject: [PATCH 04/14] Add automations panel

---
 .../raw/features/project-cron-automations.md  |   3 +-
 .../wiki/concepts/project-cron-automations.md |   2 +-
 llm-wiki/wiki/log.md                          |   1 +
 src/App.vue                                   |  58 ++-
 src/components/content/AutomationsPanel.vue   | 460 ++++++++++++++++++
 src/router/index.ts                           |   5 +
 src/style.css                                 |  48 ++
 7 files changed, 570 insertions(+), 7 deletions(-)
 create mode 100644 src/components/content/AutomationsPanel.vue

diff --git a/llm-wiki/raw/features/project-cron-automations.md b/llm-wiki/raw/features/project-cron-automations.md
index 1a01435ae..b237a037b 100644
--- a/llm-wiki/raw/features/project-cron-automations.md
+++ b/llm-wiki/raw/features/project-cron-automations.md
@@ -9,5 +9,6 @@ Implementation facts:
 - `GET /codex-api/project-automations` returns project cron automations grouped by project cwd.
 - `GET`, `PUT`, and `DELETE /codex-api/project-automation` read, save, and remove automations for one project cwd.
 - `src/api/codexGateway.ts` exposes project automation helpers mirroring the thread automation helpers.
-- `src/components/sidebar/SidebarThreadTree.vue` adds project menu `Add automation…` / `Manage automations…`, project row `Auto` chips, and reuses the existing automation dialog with project-specific copy.
+- `src/components/sidebar/SidebarThreadTree.vue` adds project menu `Add automation…` / `Manage automations…`, project row automation icons, and reuses the existing automation dialog with project-specific copy.
+- `src/components/content/AutomationsPanel.vue` lists both thread heartbeat automations and project cron automations in one top-level panel.
 - Project automations intentionally do not expose `Run now`; the existing manual run behavior remains thread-heartbeat-only.
diff --git a/llm-wiki/wiki/concepts/project-cron-automations.md b/llm-wiki/wiki/concepts/project-cron-automations.md
index 80f79d5b7..0d932790d 100644
--- a/llm-wiki/wiki/concepts/project-cron-automations.md
+++ b/llm-wiki/wiki/concepts/project-cron-automations.md
@@ -12,7 +12,7 @@ Source: [project-cron-automations.md](../../raw/features/project-cron-automation
 
 The sidebar project row dots menu exposes `Add automation…` or `Manage automations…`. The dialog reuses the thread automation manager style, including multiple automation selection, schedule presets, status, and remove/save behavior.
 
-Project rows show the same compact `Auto` chip when at least one project automation is attached.
+Project rows show the same compact automation icon when at least one project automation is attached. The top-level Automations panel lists both project cron automations and thread heartbeat automations together, sorted by next run and backed by the existing automation map endpoints.
 
 Source: [project-cron-automations.md](../../raw/features/project-cron-automations.md)
 
diff --git a/llm-wiki/wiki/log.md b/llm-wiki/wiki/log.md
index 11da0e02e..ffd7c08c1 100644
--- a/llm-wiki/wiki/log.md
+++ b/llm-wiki/wiki/log.md
@@ -49,3 +49,4 @@
 ## 2026-05-10
 
 - Added project cron automation notes for sidebar project-level automation management.
+- Updated project cron automation notes for the combined Automations panel.
diff --git a/src/App.vue b/src/App.vue
index 953dc8ea3..effc55d5f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -60,6 +60,22 @@
             </span>
           </button>
 
+          <button
+            v-if="!isSidebarCollapsed"
+            class="sidebar-skills-link"
+            :class="{ 'is-active': isAutomationsRoute }"
+            type="button"
+            @click="router.push({ name: 'automations' }); isMobile && setSidebarCollapsed(true)"
+          >
+            <span class="sidebar-skills-link-icon sidebar-automations-link-icon" aria-hidden="true">
+              <IconTablerBolt />
+            </span>
+            <span class="sidebar-skills-link-copy">
+              <span class="sidebar-skills-link-title">{{ t('Automations') }}</span>
+              <span class="sidebar-skills-link-subtitle">{{ t('Scheduled work') }}</span>
+            </span>
+          </button>
+
           <SidebarThreadTree :groups="projectGroups" :project-display-name-by-id="projectDisplayNameById"
             :project-git-repo-by-name="projectGitRepoByName"
             :project-cwd-by-name="projectCwdByName"
@@ -485,7 +501,7 @@
         :style="contentStyle"
       >
         <span v-if="isVirtualKeyboardOpen" class="content-keyboard-spacer" aria-hidden="true" />
-        <ContentHeader :title="contentTitle" :accent="isSkillsRoute">
+        <ContentHeader :title="contentTitle" :accent="isSkillsRoute || isAutomationsRoute">
           <template #leading>
             <SidebarThreadControls
               v-if="isSidebarCollapsed || isMobile"
@@ -498,6 +514,9 @@
             <span v-if="isSkillsRoute" class="skills-route-header-icon" aria-hidden="true">
               <IconTablerBolt />
             </span>
+            <span v-else-if="isAutomationsRoute" class="skills-route-header-icon automations-route-header-icon" aria-hidden="true">
+              <IconTablerBolt />
+            </span>
           </template>
           <template #actions>
             <ComposerDropdown
@@ -548,6 +567,14 @@
               @try-item="onTryDirectoryItem"
             />
           </template>
+          <template v-else-if="isAutomationsRoute">
+            <AutomationsPanel
+              :groups="projectGroups"
+              :project-cwd-by-name="projectCwdByName"
+              :selected-automation-id="routeAutomationId"
+              @select-automation="onSelectAutomationInPanel"
+            />
+          </template>
           <template v-else-if="isHomeRoute">
             <div class="content-grid content-grid-home">
               <div class="new-thread-empty">
@@ -1010,6 +1037,7 @@ const ThreadConversation = defineAsyncComponent(() => import('./components/conte
 const ThreadTerminalPanel = defineAsyncComponent(() => import('./components/content/ThreadTerminalPanel.vue'))
 const ReviewPane = defineAsyncComponent(() => import('./components/content/ReviewPane.vue'))
 const DirectoryHub = defineAsyncComponent(() => import('./components/content/DirectoryHub.vue'))
+const AutomationsPanel = defineAsyncComponent(() => import('./components/content/AutomationsPanel.vue'))
 const { t, uiLanguage, uiLanguageOptions, setUiLanguage } = useUiLanguage()
 
 const SIDEBAR_COLLAPSED_STORAGE_KEY = 'codex-web-local.sidebar-collapsed.v1'
@@ -1398,7 +1426,13 @@ const routeThreadId = computed(() => {
 
 const isHomeRoute = computed(() => route.name === 'home')
 const isSkillsRoute = computed(() => route.name === 'skills')
+const isAutomationsRoute = computed(() => route.name === 'automations')
+const routeAutomationId = computed(() => {
+  const raw = route.query.automationId
+  return typeof raw === 'string' ? raw : ''
+})
 const contentTitle = computed(() => {
+  if (isAutomationsRoute.value) return t('Automations')
   if (isSkillsRoute.value) return t('Skills')
   if (isHomeRoute.value) return t('Start new thread')
   return selectedThread.value?.title ?? t('Choose a thread')
@@ -1463,7 +1497,7 @@ const isTerminalKeyboardLayoutActive = computed(() => (
 ))
 const directoryCwd = computed(() => selectedThread.value?.cwd?.trim() ?? newThreadCwd.value.trim())
 const isSelectedThreadInProgress = computed(() => !isHomeRoute.value && selectedThread.value?.inProgress === true)
-const showThreadContextBadge = computed(() => !isHomeRoute.value && !isSkillsRoute.value && selectedThreadId.value.trim().length > 0)
+const showThreadContextBadge = computed(() => !isHomeRoute.value && !isSkillsRoute.value && !isAutomationsRoute.value && selectedThreadId.value.trim().length > 0)
 const isAccountSwitchBlocked = computed(() =>
   isSendingMessage.value ||
   isInterruptingTurn.value ||
@@ -1973,6 +2007,12 @@ function onSelectThread(threadId: string): void {
   if (isMobile.value) setSidebarCollapsed(true)
 }
 
+function onSelectAutomationInPanel(automationId: string): void {
+  if (route.name !== 'automations') return
+  if (routeAutomationId.value === automationId) return
+  void router.replace({ name: 'automations', query: automationId ? { automationId } : {} })
+}
+
 async function onExportThread(threadId: string): Promise<void> {
   if (!threadId) return
   if (selectedThreadId.value !== threadId) {
@@ -3435,7 +3475,7 @@ function onImplementPlan(payload: { turnId: string }): void {
 
 
 function onExportChat(): void {
-  if (isHomeRoute.value || isSkillsRoute.value || typeof document === 'undefined') return
+  if (isHomeRoute.value || isSkillsRoute.value || isAutomationsRoute.value || typeof document === 'undefined') return
   if (!selectedThread.value || filteredMessages.value.length === 0) return
   const markdown = buildThreadMarkdown()
   const fileName = buildExportFileName()
@@ -3891,7 +3931,7 @@ async function syncThreadSelectionWithRoute(): Promise<void> {
     do {
       hasPendingRouteSync = false
 
-      if (route.name === 'home' || route.name === 'skills') {
+      if (route.name === 'home' || route.name === 'skills' || route.name === 'automations') {
         if (selectedThreadId.value !== '') {
           await selectThread('')
         }
@@ -3958,7 +3998,7 @@ watch(
   async (threadId) => {
     if (!hasInitialized.value) return
     if (isRouteSyncInProgress.value) return
-    if (isHomeRoute.value || isSkillsRoute.value) return
+    if (isHomeRoute.value || isSkillsRoute.value || isAutomationsRoute.value) return
 
     if (!threadId) {
       if (route.name !== 'home') {
@@ -4283,6 +4323,10 @@ async function loadWorktreeBranches(sourceCwd: string): Promise<void> {
   @apply flex h-10 w-10 shrink-0 items-center justify-center rounded-2xl bg-emerald-600 text-white;
 }
 
+.sidebar-automations-link-icon {
+  @apply bg-amber-500;
+}
+
 .sidebar-skills-link-icon :deep(svg) {
   @apply h-5 w-5;
 }
@@ -4307,6 +4351,10 @@ async function loadWorktreeBranches(sourceCwd: string): Promise<void> {
   @apply flex h-9 w-9 shrink-0 items-center justify-center rounded-2xl bg-emerald-600 text-white shadow-[0_16px_32px_-20px_rgba(5,150,105,0.9)];
 }
 
+.automations-route-header-icon {
+  @apply bg-amber-500 shadow-[0_16px_32px_-20px_rgba(245,158,11,0.9)];
+}
+
 .skills-route-header-icon :deep(svg) {
   @apply h-4.5 w-4.5;
 }
diff --git a/src/components/content/AutomationsPanel.vue b/src/components/content/AutomationsPanel.vue
new file mode 100644
index 000000000..e5b026dbf
--- /dev/null
+++ b/src/components/content/AutomationsPanel.vue
@@ -0,0 +1,460 @@
+<template>
+  <div class="automations-panel">
+    <div class="automations-toolbar">
+      <div class="automations-summary">
+        <span>{{ automationRows.length }} total</span>
+        <span>{{ activeCount }} active</span>
+        <span>{{ pausedCount }} paused</span>
+      </div>
+      <button class="automations-refresh" type="button" :disabled="isLoading" @click="loadAutomations">
+        {{ isLoading ? 'Refreshing...' : 'Refresh' }}
+      </button>
+    </div>
+
+    <p v-if="loadError" class="automations-error">{{ loadError }}</p>
+
+    <div v-if="isLoading && automationRows.length === 0" class="automations-empty">
+      <IconTablerBolt class="automations-empty-icon" />
+      <p>Loading automations...</p>
+    </div>
+
+    <div v-else-if="automationRows.length === 0" class="automations-empty">
+      <IconTablerBolt class="automations-empty-icon" />
+      <p>No automations yet</p>
+      <span>Use a thread or project menu to add an automation.</span>
+    </div>
+
+    <div v-else class="automations-layout">
+      <section class="automations-list" aria-label="Automations">
+        <button
+          v-for="row in automationRows"
+          :key="row.automation.id"
+          class="automation-row"
+          :class="{ 'is-selected': selectedAutomationId === row.automation.id }"
+          type="button"
+          @click="selectedAutomationId = row.automation.id"
+        >
+          <span class="automation-row-icon" :data-status="row.automation.status">
+            <IconTablerPlayerStopFilled v-if="row.automation.status === 'PAUSED'" />
+            <IconTablerBolt v-else />
+          </span>
+          <span class="automation-row-main">
+            <span class="automation-row-title">{{ row.automation.name }}</span>
+            <span class="automation-row-meta">{{ row.scopeLabel }} • {{ row.targetLabel }}</span>
+          </span>
+          <span class="automation-row-side">
+            <span class="automation-row-status" :data-status="row.automation.status">{{ statusLabel(row.automation.status) }}</span>
+            <span class="automation-row-schedule">{{ row.scheduleLabel }}</span>
+          </span>
+        </button>
+      </section>
+
+      <aside v-if="selectedRow" class="automation-detail" aria-label="Automation details">
+        <div class="automation-detail-heading">
+          <span class="automation-detail-icon" :data-status="selectedRow.automation.status">
+            <IconTablerPlayerStopFilled v-if="selectedRow.automation.status === 'PAUSED'" />
+            <IconTablerBolt v-else />
+          </span>
+          <div class="automation-detail-title-wrap">
+            <h2>{{ selectedRow.automation.name }}</h2>
+            <span>{{ selectedRow.scopeLabel }}</span>
+          </div>
+        </div>
+
+        <dl class="automation-detail-grid">
+          <div>
+            <dt>Status</dt>
+            <dd>{{ statusLabel(selectedRow.automation.status) }}</dd>
+          </div>
+          <div>
+            <dt>Schedule</dt>
+            <dd>{{ selectedRow.scheduleLabel }}</dd>
+          </div>
+          <div>
+            <dt>Target</dt>
+            <dd :title="selectedRow.targetTitle">{{ selectedRow.targetLabel }}</dd>
+          </div>
+          <div>
+            <dt>ID</dt>
+            <dd>{{ selectedRow.automation.id }}</dd>
+          </div>
+        </dl>
+
+        <section class="automation-detail-prompt">
+          <h3>Prompt</h3>
+          <p>{{ selectedRow.automation.prompt }}</p>
+        </section>
+      </aside>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, onMounted, ref, watch } from 'vue'
+import { getProjectAutomationMap, getThreadAutomationMap } from '../../api/codexGateway'
+import type { UiProjectGroup, UiThreadAutomation, UiThreadAutomationStatus } from '../../types/codex'
+import IconTablerBolt from '../icons/IconTablerBolt.vue'
+import IconTablerPlayerStopFilled from '../icons/IconTablerPlayerStopFilled.vue'
+
+const props = defineProps<{
+  groups: UiProjectGroup[]
+  projectCwdByName: Record<string, string>
+  selectedAutomationId?: string
+}>()
+
+const emit = defineEmits<{
+  (event: 'select-automation', id: string): void
+}>()
+
+type AutomationRow = {
+  automation: UiThreadAutomation
+  scope: 'thread' | 'project'
+  scopeLabel: string
+  targetLabel: string
+  targetTitle: string
+  scheduleLabel: string
+}
+
+const threadAutomations = ref<Record<string, UiThreadAutomation[]>>({})
+const projectAutomations = ref<Record<string, UiThreadAutomation[]>>({})
+const isLoading = ref(false)
+const loadError = ref('')
+const selectedAutomationId = ref(props.selectedAutomationId ?? '')
+
+const threadTitleById = computed(() => {
+  const map = new Map<string, string>()
+  for (const group of props.groups) {
+    for (const thread of group.threads) {
+      map.set(thread.id, thread.title)
+    }
+  }
+  return map
+})
+
+const projectLabelByCwd = computed(() => {
+  const map = new Map<string, string>()
+  for (const group of props.groups) {
+    const cwd = props.projectCwdByName[group.projectName]?.trim()
+    if (cwd) map.set(cwd, group.projectName)
+  }
+  return map
+})
+
+const automationRows = computed<AutomationRow[]>(() => {
+  const rows: AutomationRow[] = []
+  for (const [threadId, automations] of Object.entries(threadAutomations.value)) {
+    const threadTitle = threadTitleById.value.get(threadId) ?? threadId
+    for (const automation of automations) {
+      rows.push({
+        automation,
+        scope: 'thread',
+        scopeLabel: 'Heartbeat',
+        targetLabel: threadTitle,
+        targetTitle: threadId,
+        scheduleLabel: describeAutomationSchedule(automation),
+      })
+    }
+  }
+  for (const [cwd, automations] of Object.entries(projectAutomations.value)) {
+    const projectLabel = projectLabelByCwd.value.get(cwd) ?? getPathLeaf(cwd)
+    for (const automation of automations) {
+      rows.push({
+        automation,
+        scope: 'project',
+        scopeLabel: 'Project',
+        targetLabel: projectLabel,
+        targetTitle: cwd,
+        scheduleLabel: describeAutomationSchedule(automation),
+      })
+    }
+  }
+  return rows.sort((first, second) => {
+    const firstNext = first.automation.status === 'PAUSED' ? Number.POSITIVE_INFINITY : first.automation.nextRunAtMs ?? Number.POSITIVE_INFINITY
+    const secondNext = second.automation.status === 'PAUSED' ? Number.POSITIVE_INFINITY : second.automation.nextRunAtMs ?? Number.POSITIVE_INFINITY
+    if (firstNext !== secondNext) return firstNext - secondNext
+    return first.automation.name.localeCompare(second.automation.name)
+  })
+})
+
+const activeCount = computed(() => automationRows.value.filter((row) => row.automation.status === 'ACTIVE').length)
+const pausedCount = computed(() => automationRows.value.filter((row) => row.automation.status === 'PAUSED').length)
+const selectedRow = computed(() =>
+  automationRows.value.find((row) => row.automation.id === selectedAutomationId.value) ?? automationRows.value[0] ?? null,
+)
+
+watch(
+  () => props.selectedAutomationId,
+  (id) => {
+    if (id) selectedAutomationId.value = id
+  },
+)
+
+watch(selectedAutomationId, (id) => {
+  if (id) emit('select-automation', id)
+})
+
+watch(automationRows, (rows) => {
+  if (rows.length === 0) {
+    selectedAutomationId.value = ''
+    return
+  }
+  if (!selectedAutomationId.value || !rows.some((row) => row.automation.id === selectedAutomationId.value)) {
+    selectedAutomationId.value = rows[0].automation.id
+  }
+})
+
+onMounted(() => {
+  void loadAutomations()
+})
+
+async function loadAutomations(): Promise<void> {
+  isLoading.value = true
+  loadError.value = ''
+  try {
+    const [threadMap, projectMap] = await Promise.all([
+      getThreadAutomationMap(),
+      getProjectAutomationMap(),
+    ])
+    threadAutomations.value = threadMap
+    projectAutomations.value = projectMap
+  } catch (error) {
+    loadError.value = error instanceof Error ? error.message : 'Failed to load automations'
+  } finally {
+    isLoading.value = false
+  }
+}
+
+function statusLabel(status: UiThreadAutomationStatus): string {
+  return status === 'PAUSED' ? 'Paused' : 'Active'
+}
+
+function describeAutomationSchedule(automation: UiThreadAutomation): string {
+  if (automation.status === 'PAUSED') return 'Paused'
+  if (automation.nextRunAtMs) return `Next ${formatDateTime(automation.nextRunAtMs)}`
+  const rrule = automation.rrule.trim()
+  if (/FREQ=MINUTELY/i.test(rrule)) {
+    const interval = /INTERVAL=(\d+)/i.exec(rrule)?.[1] ?? '1'
+    return interval === '1' ? 'Every minute' : `Every ${interval} minutes`
+  }
+  if (/FREQ=HOURLY/i.test(rrule)) {
+    const interval = /INTERVAL=(\d+)/i.exec(rrule)?.[1] ?? '1'
+    return interval === '1' ? 'Hourly' : `Every ${interval} hours`
+  }
+  if (/FREQ=DAILY/i.test(rrule)) return 'Daily'
+  if (/FREQ=WEEKLY/i.test(rrule)) return 'Weekly'
+  return 'Custom schedule'
+}
+
+function formatDateTime(value: number): string {
+  return new Date(value).toLocaleString(undefined, {
+    month: 'short',
+    day: 'numeric',
+    hour: 'numeric',
+    minute: '2-digit',
+  })
+}
+
+function getPathLeaf(path: string): string {
+  const normalized = path.replace(/\/+$/, '')
+  return normalized.split('/').filter(Boolean).pop() ?? path
+}
+</script>
+
+<style scoped>
+@reference "tailwindcss";
+
+.automations-panel {
+  @apply flex min-h-0 flex-1 flex-col gap-3 px-2 pb-3 sm:px-6 sm:pb-6;
+}
+
+.automations-toolbar {
+  @apply flex shrink-0 items-center justify-between gap-3 border-b border-zinc-200 pb-3;
+}
+
+.automations-summary {
+  @apply flex min-w-0 flex-wrap items-center gap-2 text-xs font-medium text-zinc-500;
+}
+
+.automations-summary span {
+  @apply rounded-full bg-zinc-100 px-2 py-1;
+}
+
+.automations-refresh {
+  @apply h-8 shrink-0 rounded-full border border-zinc-200 bg-white px-3 text-xs font-medium text-zinc-700 transition hover:bg-zinc-50 disabled:opacity-60;
+}
+
+.automations-error {
+  @apply m-0 rounded-lg border border-rose-200 bg-rose-50 px-3 py-2 text-sm text-rose-700;
+}
+
+.automations-layout {
+  @apply grid min-h-0 flex-1 grid-cols-1 gap-3 lg:grid-cols-[minmax(0,1fr)_minmax(320px,420px)];
+}
+
+.automations-list {
+  @apply min-h-0 overflow-y-auto rounded-lg border border-zinc-200 bg-white;
+}
+
+.automation-row {
+  @apply grid w-full grid-cols-[auto_minmax(0,1fr)_auto] items-center gap-3 border-b border-zinc-100 px-3 py-3 text-left transition last:border-b-0 hover:bg-zinc-50;
+}
+
+.automation-row.is-selected {
+  @apply bg-zinc-100;
+}
+
+.automation-row-icon,
+.automation-detail-icon {
+  @apply flex h-8 w-8 shrink-0 items-center justify-center rounded-full bg-emerald-100 text-emerald-700;
+}
+
+.automation-row-icon[data-status='PAUSED'],
+.automation-detail-icon[data-status='PAUSED'] {
+  @apply bg-zinc-100 text-zinc-500;
+}
+
+.automation-row-icon :deep(svg),
+.automation-detail-icon :deep(svg) {
+  @apply h-4 w-4;
+}
+
+.automation-row-main {
+  @apply flex min-w-0 flex-col gap-0.5;
+}
+
+.automation-row-title {
+  @apply truncate text-sm font-medium text-zinc-950;
+}
+
+.automation-row-meta {
+  @apply truncate text-xs text-zinc-500;
+}
+
+.automation-row-side {
+  @apply flex min-w-24 flex-col items-end gap-0.5 text-right;
+}
+
+.automation-row-status {
+  @apply text-xs font-medium text-emerald-700;
+}
+
+.automation-row-status[data-status='PAUSED'] {
+  @apply text-zinc-500;
+}
+
+.automation-row-schedule {
+  @apply max-w-36 truncate text-xs text-zinc-500;
+}
+
+.automation-detail {
+  @apply flex min-h-0 flex-col gap-4 overflow-y-auto rounded-lg border border-zinc-200 bg-white p-4;
+}
+
+.automation-detail-heading {
+  @apply flex min-w-0 items-center gap-3;
+}
+
+.automation-detail-title-wrap {
+  @apply flex min-w-0 flex-col gap-0.5;
+}
+
+.automation-detail-title-wrap h2 {
+  @apply m-0 truncate text-base font-semibold text-zinc-950;
+}
+
+.automation-detail-title-wrap span {
+  @apply text-xs font-medium uppercase tracking-[0.14em] text-zinc-500;
+}
+
+.automation-detail-grid {
+  @apply grid grid-cols-1 gap-2 sm:grid-cols-2;
+}
+
+.automation-detail-grid div {
+  @apply min-w-0 rounded-lg bg-zinc-50 px-3 py-2;
+}
+
+.automation-detail-grid dt {
+  @apply text-[11px] font-medium uppercase tracking-[0.12em] text-zinc-500;
+}
+
+.automation-detail-grid dd {
+  @apply m-0 truncate text-sm text-zinc-900;
+}
+
+.automation-detail-prompt {
+  @apply flex min-h-0 flex-col gap-2;
+}
+
+.automation-detail-prompt h3 {
+  @apply m-0 text-xs font-medium uppercase tracking-[0.14em] text-zinc-500;
+}
+
+.automation-detail-prompt p {
+  @apply m-0 whitespace-pre-wrap rounded-lg bg-zinc-50 p-3 text-sm leading-6 text-zinc-800;
+}
+
+.automations-empty {
+  @apply mx-auto flex min-h-72 w-full max-w-xl flex-1 flex-col items-center justify-center gap-2 text-center text-zinc-500;
+}
+
+.automations-empty-icon {
+  @apply h-8 w-8 text-zinc-400;
+}
+
+.automations-empty p {
+  @apply m-0 text-base font-medium text-zinc-800;
+}
+
+.automations-empty span {
+  @apply text-sm;
+}
+
+:global(:root.dark) .automations-toolbar {
+  @apply border-zinc-800;
+}
+
+:global(:root.dark) .automations-summary span,
+:global(:root.dark) .automation-row-icon[data-status='PAUSED'],
+:global(:root.dark) .automation-detail-icon[data-status='PAUSED'] {
+  @apply bg-zinc-800 text-zinc-400;
+}
+
+:global(:root.dark) .automations-refresh,
+:global(:root.dark) .automations-list,
+:global(:root.dark) .automation-detail {
+  @apply border-zinc-800 bg-zinc-950 text-zinc-100;
+}
+
+:global(:root.dark) .automations-refresh:hover,
+:global(:root.dark) .automation-row:hover,
+:global(:root.dark) .automation-row.is-selected {
+  @apply bg-zinc-900;
+}
+
+:global(:root.dark) .automation-row {
+  @apply border-zinc-800;
+}
+
+:global(:root.dark) .automation-row-title,
+:global(:root.dark) .automation-detail-title-wrap h2,
+:global(:root.dark) .automation-detail-grid dd,
+:global(:root.dark) .automations-empty p {
+  @apply text-zinc-100;
+}
+
+:global(:root.dark) .automation-row-meta,
+:global(:root.dark) .automation-row-schedule,
+:global(:root.dark) .automation-detail-title-wrap span,
+:global(:root.dark) .automation-detail-grid dt,
+:global(:root.dark) .automation-detail-prompt h3,
+:global(:root.dark) .automations-summary,
+:global(:root.dark) .automations-empty {
+  @apply text-zinc-400;
+}
+
+:global(:root.dark) .automation-detail-grid div,
+:global(:root.dark) .automation-detail-prompt p {
+  @apply bg-zinc-900 text-zinc-200;
+}
+</style>
diff --git a/src/router/index.ts b/src/router/index.ts
index f377c2cc6..52077872a 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -22,6 +22,11 @@ const router = createRouter({
       name: 'skills',
       component: EmptyRouteView,
     },
+    {
+      path: '/automations',
+      name: 'automations',
+      component: EmptyRouteView,
+    },
     {
       path: '/new-thread',
       redirect: { name: 'home' },
diff --git a/src/style.css b/src/style.css
index 7d108d497..1c0425600 100644
--- a/src/style.css
+++ b/src/style.css
@@ -1650,6 +1650,54 @@
   @apply bg-zinc-700 text-zinc-200 hover:bg-zinc-600;
 }
 
+:root.dark .automations-toolbar {
+  @apply border-zinc-800;
+}
+
+:root.dark .automations-summary span,
+:root.dark .automation-row-icon[data-status='PAUSED'],
+:root.dark .automation-detail-icon[data-status='PAUSED'] {
+  @apply bg-zinc-800 text-zinc-400;
+}
+
+:root.dark .automations-refresh,
+:root.dark .automations-list,
+:root.dark .automation-detail {
+  @apply border-zinc-800 bg-zinc-950 text-zinc-100;
+}
+
+:root.dark .automations-refresh:hover,
+:root.dark .automation-row:hover,
+:root.dark .automation-row.is-selected {
+  @apply bg-zinc-900;
+}
+
+:root.dark .automation-row {
+  @apply border-zinc-800;
+}
+
+:root.dark .automation-row-title,
+:root.dark .automation-detail-title-wrap h2,
+:root.dark .automation-detail-grid dd,
+:root.dark .automations-empty p {
+  @apply text-zinc-100;
+}
+
+:root.dark .automation-row-meta,
+:root.dark .automation-row-schedule,
+:root.dark .automation-detail-title-wrap span,
+:root.dark .automation-detail-grid dt,
+:root.dark .automation-detail-prompt h3,
+:root.dark .automations-summary,
+:root.dark .automations-empty {
+  @apply text-zinc-400;
+}
+
+:root.dark .automation-detail-grid div,
+:root.dark .automation-detail-prompt p {
+  @apply bg-zinc-900 text-zinc-200;
+}
+
 @media (max-width: 768px) {
   .thread-composer-input,
   .composer-dropdown-search-input,

From dfba833d8bb3f8a214d7cc11d7f395efe47e0d8b Mon Sep 17 00:00:00 2001
From: Igor <igor.levochkin@xrtc.io>
Date: Sun, 10 May 2026 07:45:21 +0700
Subject: [PATCH 05/14] Require inline screenshot evidence

---
 AGENTS.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/AGENTS.md b/AGENTS.md
index c4c725ffc..c19cec946 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -142,6 +142,7 @@
   - viewport(s)
   - assertion/result summary
   - screenshot absolute path(s)
+  - inline screenshot image(s) rendered in chat with Markdown image syntax using absolute local paths
   - CJS command/result (when module-loading behavior was changed)
 
 ## Worktree Dev Server Rule
@@ -181,6 +182,7 @@
 
 - When the user asks to test with Playwright, run the verification on the explicitly requested project/thread context (for example `TestChat`).
 - Screenshot artifacts must show complete passing evidence for the tested feature, not only the base page load.
+- Always show captured screenshots inline in the chat, not only as links or filesystem paths. Use Markdown image tags with absolute local paths, for example `![light verification](/absolute/path/output/playwright/example.png)`.
 - For UI work, include dark-theme evidence in addition to the default/light-theme evidence unless the task is explicitly light-only.
 - For refresh-persistence fixes, include a post-refresh screenshot that still shows the expected UI state.
 
@@ -209,6 +211,7 @@
   - exact CJS command/script path
   - assertion summary (`hrefOk`, `titleOk`, `textOk`)
   - screenshot absolute path
+  - inline screenshot image rendered in chat with Markdown image syntax using the absolute screenshot path
 
 ## LLM Wiki Schema
 

From 7f3d84c6a86618c8e795b158a54eca2d06684ac6 Mon Sep 17 00:00:00 2001
From: Igor <igor.levochkin@xrtc.io>
Date: Sun, 10 May 2026 07:47:19 +0700
Subject: [PATCH 06/14] Show automation counts in sidebar

---
 src/components/sidebar/SidebarThreadTree.vue | 35 +++++++++++++++++---
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/components/sidebar/SidebarThreadTree.vue b/src/components/sidebar/SidebarThreadTree.vue
index 4be01951b..a0d01c037 100644
--- a/src/components/sidebar/SidebarThreadTree.vue
+++ b/src/components/sidebar/SidebarThreadTree.vue
@@ -58,6 +58,9 @@
                     :title="threadAutomationTooltip(thread.id)"
                   >
                     <IconTablerBolt class="thread-row-automation-icon" />
+                    <span v-if="threadAutomationCount(thread.id) > 1" class="thread-row-automation-count">
+                      {{ threadAutomationCount(thread.id) }}
+                    </span>
                   </span>
                   <span
                     v-if="thread.pendingRequestState"
@@ -221,6 +224,9 @@
                   :title="threadAutomationTooltip(thread.id)"
                 >
                   <IconTablerBolt class="thread-row-automation-icon" />
+                  <span v-if="threadAutomationCount(thread.id) > 1" class="thread-row-automation-count">
+                    {{ threadAutomationCount(thread.id) }}
+                  </span>
                 </span>
                 <span
                   v-if="thread.pendingRequestState"
@@ -299,6 +305,9 @@
                 :title="projectAutomationTooltip(group.projectName)"
               >
                 <IconTablerBolt class="thread-row-automation-icon" />
+                <span v-if="projectAutomationCount(group.projectName) > 1" class="thread-row-automation-count">
+                  {{ projectAutomationCount(group.projectName) }}
+                </span>
               </span>
             </span>
             <template #right>
@@ -417,6 +426,9 @@
                         :title="threadAutomationTooltip(thread.id)"
                       >
                         <IconTablerBolt class="thread-row-automation-icon" />
+                        <span v-if="threadAutomationCount(thread.id) > 1" class="thread-row-automation-count">
+                          {{ threadAutomationCount(thread.id) }}
+                        </span>
                       </span>
                       <span
                         v-if="thread.pendingRequestState"
@@ -543,6 +555,9 @@
                     :title="threadAutomationTooltip(thread.id)"
                   >
                     <IconTablerBolt class="thread-row-automation-icon" />
+                    <span v-if="threadAutomationCount(thread.id) > 1" class="thread-row-automation-count">
+                      {{ threadAutomationCount(thread.id) }}
+                    </span>
                   </span>
                   <span
                     v-if="thread.pendingRequestState"
@@ -1423,12 +1438,20 @@ function onSelect(threadId: string): void {
 }
 
 function threadHasAutomation(threadId: string): boolean {
-  return (automationByThreadId.value[threadId]?.length ?? 0) > 0
+  return threadAutomationCount(threadId) > 0
+}
+
+function threadAutomationCount(threadId: string): number {
+  return automationByThreadId.value[threadId]?.length ?? 0
 }
 
 function projectHasAutomation(projectName: string): boolean {
+  return projectAutomationCount(projectName) > 0
+}
+
+function projectAutomationCount(projectName: string): number {
   const key = getProjectAutomationKey(projectName)
-  return key ? (automationByProjectName.value[key]?.length ?? 0) > 0 : false
+  return key ? (automationByProjectName.value[key]?.length ?? 0) : 0
 }
 
 function automationTooltip(automations: UiThreadAutomation[]): string {
@@ -3051,11 +3074,15 @@ onBeforeUnmount(() => {
 }
 
 .thread-row-automation-chip {
-  @apply inline-flex h-4 w-4 shrink-0 items-center justify-center rounded-full bg-amber-100 text-amber-800;
+  @apply inline-flex h-4 min-w-4 shrink-0 items-center justify-center gap-0.5 rounded-full bg-amber-100 px-1 text-amber-800;
 }
 
 .thread-row-automation-icon {
-  @apply h-3 w-3;
+  @apply h-3 w-3 shrink-0;
+}
+
+.thread-row-automation-count {
+  @apply text-[10px] font-semibold leading-none tabular-nums;
 }
 
 .project-header-row:hover .project-icon-folder {

From c9ed89b3e0e18340bf8a3cde733174cf6ebcbf96 Mon Sep 17 00:00:00 2001
From: Igor <igor.levochkin@xrtc.io>
Date: Sun, 10 May 2026 07:53:12 +0700
Subject: [PATCH 07/14] Sort automations by newest first

---
 src/components/content/AutomationsPanel.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/content/AutomationsPanel.vue b/src/components/content/AutomationsPanel.vue
index e5b026dbf..b810ac163 100644
--- a/src/components/content/AutomationsPanel.vue
+++ b/src/components/content/AutomationsPanel.vue
@@ -169,9 +169,12 @@ const automationRows = computed<AutomationRow[]>(() => {
     }
   }
   return rows.sort((first, second) => {
-    const firstNext = first.automation.status === 'PAUSED' ? Number.POSITIVE_INFINITY : first.automation.nextRunAtMs ?? Number.POSITIVE_INFINITY
-    const secondNext = second.automation.status === 'PAUSED' ? Number.POSITIVE_INFINITY : second.automation.nextRunAtMs ?? Number.POSITIVE_INFINITY
-    if (firstNext !== secondNext) return firstNext - secondNext
+    const firstCreated = first.automation.createdAtMs ?? 0
+    const secondCreated = second.automation.createdAtMs ?? 0
+    if (firstCreated !== secondCreated) return secondCreated - firstCreated
+    const firstUpdated = first.automation.updatedAtMs ?? 0
+    const secondUpdated = second.automation.updatedAtMs ?? 0
+    if (firstUpdated !== secondUpdated) return secondUpdated - firstUpdated
     return first.automation.name.localeCompare(second.automation.name)
   })
 })

From 7b02d7b9af546f4dfa9476385716e24ba18312f8 Mon Sep 17 00:00:00 2001
From: Igor <igor.levochkin@xrtc.io>
Date: Sun, 10 May 2026 07:53:51 +0700
Subject: [PATCH 08/14] Sort active automations first

---
 src/components/content/AutomationsPanel.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/content/AutomationsPanel.vue b/src/components/content/AutomationsPanel.vue
index b810ac163..62e50d75a 100644
--- a/src/components/content/AutomationsPanel.vue
+++ b/src/components/content/AutomationsPanel.vue
@@ -169,6 +169,9 @@ const automationRows = computed<AutomationRow[]>(() => {
     }
   }
   return rows.sort((first, second) => {
+    const firstStatusRank = first.automation.status === 'ACTIVE' ? 0 : 1
+    const secondStatusRank = second.automation.status === 'ACTIVE' ? 0 : 1
+    if (firstStatusRank !== secondStatusRank) return firstStatusRank - secondStatusRank
     const firstCreated = first.automation.createdAtMs ?? 0
     const secondCreated = second.automation.createdAtMs ?? 0
     if (firstCreated !== secondCreated) return secondCreated - firstCreated

From e96bce09ffdcca68ba1799d11fd52d28ce1cb7b3 Mon Sep 17 00:00:00 2001
From: Igor <igor.levochkin@xrtc.io>
Date: Sun, 10 May 2026 07:57:57 +0700
Subject: [PATCH 09/14] Edit automations from panel

---
 .../raw/features/project-cron-automations.md  |  2 +-
 .../wiki/concepts/project-cron-automations.md |  2 +-
 llm-wiki/wiki/log.md                          |  1 +
 src/App.vue                                   | 33 ++++++++++++-
 src/components/content/AutomationsPanel.vue   | 49 +++++++++++++++++--
 src/components/sidebar/SidebarThreadTree.vue  | 28 +++++++++++
 6 files changed, 107 insertions(+), 8 deletions(-)

diff --git a/llm-wiki/raw/features/project-cron-automations.md b/llm-wiki/raw/features/project-cron-automations.md
index b237a037b..2f857f4e0 100644
--- a/llm-wiki/raw/features/project-cron-automations.md
+++ b/llm-wiki/raw/features/project-cron-automations.md
@@ -10,5 +10,5 @@ Implementation facts:
 - `GET`, `PUT`, and `DELETE /codex-api/project-automation` read, save, and remove automations for one project cwd.
 - `src/api/codexGateway.ts` exposes project automation helpers mirroring the thread automation helpers.
 - `src/components/sidebar/SidebarThreadTree.vue` adds project menu `Add automation…` / `Manage automations…`, project row automation icons, and reuses the existing automation dialog with project-specific copy.
-- `src/components/content/AutomationsPanel.vue` lists both thread heartbeat automations and project cron automations in one top-level panel.
+- `src/components/content/AutomationsPanel.vue` lists both thread heartbeat automations and project cron automations in one top-level panel. It sorts active automations before paused automations, newest first within each status group, and exposes row/detail edit buttons that open the shared automation editor.
 - Project automations intentionally do not expose `Run now`; the existing manual run behavior remains thread-heartbeat-only.
diff --git a/llm-wiki/wiki/concepts/project-cron-automations.md b/llm-wiki/wiki/concepts/project-cron-automations.md
index 0d932790d..de88135df 100644
--- a/llm-wiki/wiki/concepts/project-cron-automations.md
+++ b/llm-wiki/wiki/concepts/project-cron-automations.md
@@ -12,7 +12,7 @@ Source: [project-cron-automations.md](../../raw/features/project-cron-automation
 
 The sidebar project row dots menu exposes `Add automation…` or `Manage automations…`. The dialog reuses the thread automation manager style, including multiple automation selection, schedule presets, status, and remove/save behavior.
 
-Project rows show the same compact automation icon when at least one project automation is attached. The top-level Automations panel lists both project cron automations and thread heartbeat automations together, sorted by next run and backed by the existing automation map endpoints.
+Project rows show the same compact automation icon when at least one project automation is attached. The top-level Automations panel lists both project cron automations and thread heartbeat automations together, sorts active automations before paused automations with newest records first inside each status group, and exposes edit buttons that open the shared automation editor.
 
 Source: [project-cron-automations.md](../../raw/features/project-cron-automations.md)
 
diff --git a/llm-wiki/wiki/log.md b/llm-wiki/wiki/log.md
index ffd7c08c1..e99b16a65 100644
--- a/llm-wiki/wiki/log.md
+++ b/llm-wiki/wiki/log.md
@@ -50,3 +50,4 @@
 
 - Added project cron automation notes for sidebar project-level automation management.
 - Updated project cron automation notes for the combined Automations panel.
+- Updated Automations panel notes for active/newest sorting and direct edit buttons.
diff --git a/src/App.vue b/src/App.vue
index effc55d5f..8b315d842 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -76,7 +76,7 @@
             </span>
           </button>
 
-          <SidebarThreadTree :groups="projectGroups" :project-display-name-by-id="projectDisplayNameById"
+          <SidebarThreadTree ref="sidebarThreadTreeRef" :groups="projectGroups" :project-display-name-by-id="projectDisplayNameById"
             :project-git-repo-by-name="projectGitRepoByName"
             :project-cwd-by-name="projectCwdByName"
             v-if="!isSidebarCollapsed"
@@ -94,6 +94,7 @@
             @fork-thread="onForkThread"
             @remove-project="onRemoveProject" @reorder-project="onReorderProject"
             @export-thread="onExportThread"
+            @automations-changed="onAutomationsChanged"
             @start-new-chat="onStartNewThreadFromToolbar" />
         </div>
 
@@ -569,10 +570,12 @@
           </template>
           <template v-else-if="isAutomationsRoute">
             <AutomationsPanel
+              ref="automationsPanelRef"
               :groups="projectGroups"
               :project-cwd-by-name="projectCwdByName"
               :selected-automation-id="routeAutomationId"
               @select-automation="onSelectAutomationInPanel"
+              @edit-automation="onEditAutomationFromPanel"
             />
           </template>
           <template v-else-if="isHomeRoute">
@@ -1027,7 +1030,7 @@ import {
   searchThreads,
   switchAccount,
 } from './api/codexGateway'
-import type { ReasoningEffort, SpeedMode, UiAccountEntry, UiRateLimitWindow, UiServerRequest, UiServerRequestReply, UiThreadTokenUsage } from './types/codex'
+import type { ReasoningEffort, SpeedMode, UiAccountEntry, UiRateLimitWindow, UiServerRequest, UiServerRequestReply, UiThreadAutomation, UiThreadTokenUsage } from './types/codex'
 import type { ComposerDraftPayload, ThreadComposerExposed } from './components/content/ThreadComposer.vue'
 import type { GitCommitOption, LocalDirectoryEntry, TelegramStatus, ThreadTerminalQuickCommand, WorktreeBranchOption } from './api/codexGateway'
 import { getFreeModeStatus, setFreeMode, setFreeModeCustomKey, setCustomProvider } from './api/codexGateway'
@@ -1270,6 +1273,19 @@ const {
 const route = useRoute()
 const router = useRouter()
 const { isMobile } = useMobile()
+type SidebarThreadTreeExposed = {
+  openAutomationEditorFromPanel: (payload: AutomationEditRequest) => void
+}
+type AutomationsPanelExposed = {
+  loadAutomations: () => Promise<void>
+}
+type AutomationEditRequest = {
+  scope: 'thread' | 'project'
+  target: string
+  automation: UiThreadAutomation
+}
+const sidebarThreadTreeRef = ref<SidebarThreadTreeExposed | null>(null)
+const automationsPanelRef = ref<AutomationsPanelExposed | null>(null)
 const homeThreadComposerRef = ref<ThreadComposerExposed | null>(null)
 const threadComposerRef = ref<ThreadComposerExposed | null>(null)
 const threadConversationRef = ref<{ jumpToLatest: () => void } | null>(null)
@@ -2013,6 +2029,19 @@ function onSelectAutomationInPanel(automationId: string): void {
   void router.replace({ name: 'automations', query: automationId ? { automationId } : {} })
 }
 
+async function onEditAutomationFromPanel(payload: AutomationEditRequest): Promise<void> {
+  if (isSidebarCollapsed.value) {
+    setSidebarCollapsed(false)
+    await nextTick()
+  }
+  sidebarThreadTreeRef.value?.openAutomationEditorFromPanel(payload)
+}
+
+function onAutomationsChanged(): void {
+  if (route.name !== 'automations') return
+  void automationsPanelRef.value?.loadAutomations()
+}
+
 async function onExportThread(threadId: string): Promise<void> {
   if (!threadId) return
   if (selectedThreadId.value !== threadId) {
diff --git a/src/components/content/AutomationsPanel.vue b/src/components/content/AutomationsPanel.vue
index 62e50d75a..a38c43042 100644
--- a/src/components/content/AutomationsPanel.vue
+++ b/src/components/content/AutomationsPanel.vue
@@ -26,13 +26,16 @@
 
     <div v-else class="automations-layout">
       <section class="automations-list" aria-label="Automations">
-        <button
+        <div
           v-for="row in automationRows"
           :key="row.automation.id"
           class="automation-row"
           :class="{ 'is-selected': selectedAutomationId === row.automation.id }"
-          type="button"
+          role="button"
+          tabindex="0"
           @click="selectedAutomationId = row.automation.id"
+          @keydown.enter.prevent="selectedAutomationId = row.automation.id"
+          @keydown.space.prevent="selectedAutomationId = row.automation.id"
         >
           <span class="automation-row-icon" :data-status="row.automation.status">
             <IconTablerPlayerStopFilled v-if="row.automation.status === 'PAUSED'" />
@@ -46,7 +49,10 @@
             <span class="automation-row-status" :data-status="row.automation.status">{{ statusLabel(row.automation.status) }}</span>
             <span class="automation-row-schedule">{{ row.scheduleLabel }}</span>
           </span>
-        </button>
+          <button class="automation-edit-button" type="button" @click.stop="emitEditAutomation(row)">
+            Edit
+          </button>
+        </div>
       </section>
 
       <aside v-if="selectedRow" class="automation-detail" aria-label="Automation details">
@@ -59,6 +65,9 @@
             <h2>{{ selectedRow.automation.name }}</h2>
             <span>{{ selectedRow.scopeLabel }}</span>
           </div>
+          <button class="automation-detail-edit" type="button" @click="emitEditAutomation(selectedRow)">
+            Edit
+          </button>
         </div>
 
         <dl class="automation-detail-grid">
@@ -104,6 +113,7 @@ const props = defineProps<{
 
 const emit = defineEmits<{
   (event: 'select-automation', id: string): void
+  (event: 'edit-automation', payload: AutomationEditRequest): void
 }>()
 
 type AutomationRow = {
@@ -115,6 +125,12 @@ type AutomationRow = {
   scheduleLabel: string
 }
 
+type AutomationEditRequest = {
+  scope: 'thread' | 'project'
+  target: string
+  automation: UiThreadAutomation
+}
+
 const threadAutomations = ref<Record<string, UiThreadAutomation[]>>({})
 const projectAutomations = ref<Record<string, UiThreadAutomation[]>>({})
 const isLoading = ref(false)
@@ -213,6 +229,10 @@ onMounted(() => {
   void loadAutomations()
 })
 
+defineExpose({
+  loadAutomations,
+})
+
 async function loadAutomations(): Promise<void> {
   isLoading.value = true
   loadError.value = ''
@@ -234,6 +254,14 @@ function statusLabel(status: UiThreadAutomationStatus): string {
   return status === 'PAUSED' ? 'Paused' : 'Active'
 }
 
+function emitEditAutomation(row: AutomationRow): void {
+  emit('edit-automation', {
+    scope: row.scope,
+    target: row.targetTitle,
+    automation: row.automation,
+  })
+}
+
 function describeAutomationSchedule(automation: UiThreadAutomation): string {
   if (automation.status === 'PAUSED') return 'Paused'
   if (automation.nextRunAtMs) return `Next ${formatDateTime(automation.nextRunAtMs)}`
@@ -302,7 +330,7 @@ function getPathLeaf(path: string): string {
 }
 
 .automation-row {
-  @apply grid w-full grid-cols-[auto_minmax(0,1fr)_auto] items-center gap-3 border-b border-zinc-100 px-3 py-3 text-left transition last:border-b-0 hover:bg-zinc-50;
+  @apply grid w-full grid-cols-[auto_minmax(0,1fr)_auto_auto] items-center gap-3 border-b border-zinc-100 px-3 py-3 text-left transition last:border-b-0 hover:bg-zinc-50;
 }
 
 .automation-row.is-selected {
@@ -352,6 +380,15 @@ function getPathLeaf(path: string): string {
   @apply max-w-36 truncate text-xs text-zinc-500;
 }
 
+.automation-edit-button,
+.automation-detail-edit {
+  @apply h-7 shrink-0 rounded-md border border-zinc-200 bg-white px-2 text-xs font-medium text-zinc-700 transition hover:bg-zinc-50;
+}
+
+.automation-detail-edit {
+  @apply ml-auto;
+}
+
 .automation-detail {
   @apply flex min-h-0 flex-col gap-4 overflow-y-auto rounded-lg border border-zinc-200 bg-white p-4;
 }
@@ -427,12 +464,16 @@ function getPathLeaf(path: string): string {
 }
 
 :global(:root.dark) .automations-refresh,
+:global(:root.dark) .automation-edit-button,
+:global(:root.dark) .automation-detail-edit,
 :global(:root.dark) .automations-list,
 :global(:root.dark) .automation-detail {
   @apply border-zinc-800 bg-zinc-950 text-zinc-100;
 }
 
 :global(:root.dark) .automations-refresh:hover,
+:global(:root.dark) .automation-edit-button:hover,
+:global(:root.dark) .automation-detail-edit:hover,
 :global(:root.dark) .automation-row:hover,
 :global(:root.dark) .automation-row.is-selected {
   @apply bg-zinc-900;
diff --git a/src/components/sidebar/SidebarThreadTree.vue b/src/components/sidebar/SidebarThreadTree.vue
index a0d01c037..7dadbed9d 100644
--- a/src/components/sidebar/SidebarThreadTree.vue
+++ b/src/components/sidebar/SidebarThreadTree.vue
@@ -884,6 +884,7 @@ const emit = defineEmits<{
   'export-thread': [threadId: string]
   'fork-thread': [threadId: string]
   'start-new-chat': []
+  'automations-changed': []
 }>()
 
 type PendingProjectDrag = {
@@ -1766,6 +1767,27 @@ function openProjectAutomationDialog(projectName: string): void {
   closeProjectMenu()
 }
 
+function openAutomationEditorFromPanel(payload: {
+  scope: 'thread' | 'project'
+  target: string
+  automation: UiThreadAutomation
+}): void {
+  automationDialogScope.value = payload.scope
+  automationDialogThreadId.value = payload.scope === 'thread' ? payload.target : ''
+  automationDialogProjectName.value = payload.scope === 'project' ? payload.target : ''
+  automationDialogError.value = ''
+  automationDialogNotice.value = ''
+  if (payload.scope === 'project') {
+    automationByProjectName.value = updateAutomationForProject(automationByProjectName.value, payload.target, payload.automation)
+  } else {
+    automationByThreadId.value = updateAutomationForThread(automationByThreadId.value, payload.target, payload.automation)
+  }
+  selectAutomationForEditing(payload.automation.id)
+  automationDialogVisible.value = true
+  closeProjectMenu()
+  closeThreadMenu()
+}
+
 function startNewAutomationDraft(): void {
   automationDialogAutomationId.value = ''
   automationDialogMode.value = 'create'
@@ -1891,6 +1913,7 @@ async function submitAutomationDialog(): Promise<void> {
     } else {
       automationByThreadId.value = updateAutomationForThread(automationByThreadId.value, threadId, saved)
     }
+    emit('automations-changed')
     selectAutomationForEditing(saved.id)
     automationDialogNotice.value = 'Automation saved.'
     isSavingAutomation.value = false
@@ -1924,6 +1947,7 @@ async function onDeleteAutomationFromDialog(): Promise<void> {
     } else {
       startNewAutomationDraft()
     }
+    emit('automations-changed')
     isSavingAutomation.value = false
   } catch (error) {
     automationDialogError.value = error instanceof Error ? error.message : 'Failed to remove automation'
@@ -1952,6 +1976,10 @@ function getProjectDisplayName(projectName: string): string {
   return props.projectDisplayNameById[projectName] ?? projectName
 }
 
+defineExpose({
+  openAutomationEditorFromPanel,
+})
+
 function isPathLikeProjectName(value: string): boolean {
   return value.includes('/') || value.includes('\\')
 }

From ddd9014de65e6298573380981a4f823f182750d3 Mon Sep 17 00:00:00 2001
From: Igor <igor.levochkin@xrtc.io>
Date: Sun, 10 May 2026 08:22:33 +0700
Subject: [PATCH 10/14] Fix automation review findings

---
 .../raw/features/project-cron-automations.md  |  2 +-
 .../wiki/concepts/project-cron-automations.md |  2 +-
 llm-wiki/wiki/log.md                          |  1 +
 src/components/content/AutomationsPanel.vue   | 51 -------------
 src/components/sidebar/SidebarThreadTree.vue  | 18 ++++-
 src/server/codexAppServerBridge.ts            | 28 ++++++-
 src/style.css                                 |  4 +
 tests.md                                      | 73 ++++++++++++++++++-
 8 files changed, 118 insertions(+), 61 deletions(-)

diff --git a/llm-wiki/raw/features/project-cron-automations.md b/llm-wiki/raw/features/project-cron-automations.md
index 2f857f4e0..b535a230c 100644
--- a/llm-wiki/raw/features/project-cron-automations.md
+++ b/llm-wiki/raw/features/project-cron-automations.md
@@ -2,7 +2,7 @@
 
 Date: 2026-05-10
 
-Project-scoped automations are represented as Codex cron automations with a `cwds` array containing the absolute project folder path. The sidebar resolves display labels such as `TestChat` to the real cwd before saving so the Codex scheduler can run in the intended project. Thread automations remain heartbeat automations keyed by `target_thread_id`.
+Project-scoped automations are represented as Codex cron automations with a `cwds` array containing absolute project folder paths. The sidebar resolves display labels such as `TestChat` to the real cwd before saving so the Codex scheduler can run in the intended project. The project automation UI blocks unresolved/non-absolute project cwd values. Editing or deleting a project association on a multi-cwd cron automation preserves the other cwd associations and only deletes the automation folder when the final cwd is removed. Thread automations remain heartbeat automations keyed by `target_thread_id`.
 
 Implementation facts:
 - `src/server/codexAppServerBridge.ts` parses and serializes `cwds` in automation TOML records.
diff --git a/llm-wiki/wiki/concepts/project-cron-automations.md b/llm-wiki/wiki/concepts/project-cron-automations.md
index de88135df..25729ee6f 100644
--- a/llm-wiki/wiki/concepts/project-cron-automations.md
+++ b/llm-wiki/wiki/concepts/project-cron-automations.md
@@ -4,7 +4,7 @@ Project automations extend the existing sidebar automation UI from thread-scoped
 
 ## Storage
 
-Project automations use Codex cron automation TOML records with `cwds = ["<absolute project path>"]`. Sidebar display labels must be resolved to the real project folder before saving, so folder-name rows such as `TestChat` still write the scheduler-visible cwd. This matches Codex's project/folder automation shape while preserving thread heartbeat records that use `target_thread_id`.
+Project automations use Codex cron automation TOML records with `cwds = ["<absolute project path>"]`. Sidebar display labels must be resolved to the real project folder before saving, so folder-name rows such as `TestChat` still write the scheduler-visible cwd. The UI/server reject unresolved non-absolute cwd values for project automation saves. Multi-cwd cron records keep their other cwd associations when edited or removed from one project, and the automation folder is deleted only when the final cwd association is removed. This matches Codex's project/folder automation shape while preserving thread heartbeat records that use `target_thread_id`.
 
 Source: [project-cron-automations.md](../../raw/features/project-cron-automations.md)
 
diff --git a/llm-wiki/wiki/log.md b/llm-wiki/wiki/log.md
index e99b16a65..c081c064f 100644
--- a/llm-wiki/wiki/log.md
+++ b/llm-wiki/wiki/log.md
@@ -51,3 +51,4 @@
 - Added project cron automation notes for sidebar project-level automation management.
 - Updated project cron automation notes for the combined Automations panel.
 - Updated Automations panel notes for active/newest sorting and direct edit buttons.
+- Updated project cron automation notes for absolute cwd validation and multi-cwd preservation.
diff --git a/src/components/content/AutomationsPanel.vue b/src/components/content/AutomationsPanel.vue
index a38c43042..fcfb3c0bd 100644
--- a/src/components/content/AutomationsPanel.vue
+++ b/src/components/content/AutomationsPanel.vue
@@ -453,55 +453,4 @@ function getPathLeaf(path: string): string {
   @apply text-sm;
 }
 
-:global(:root.dark) .automations-toolbar {
-  @apply border-zinc-800;
-}
-
-:global(:root.dark) .automations-summary span,
-:global(:root.dark) .automation-row-icon[data-status='PAUSED'],
-:global(:root.dark) .automation-detail-icon[data-status='PAUSED'] {
-  @apply bg-zinc-800 text-zinc-400;
-}
-
-:global(:root.dark) .automations-refresh,
-:global(:root.dark) .automation-edit-button,
-:global(:root.dark) .automation-detail-edit,
-:global(:root.dark) .automations-list,
-:global(:root.dark) .automation-detail {
-  @apply border-zinc-800 bg-zinc-950 text-zinc-100;
-}
-
-:global(:root.dark) .automations-refresh:hover,
-:global(:root.dark) .automation-edit-button:hover,
-:global(:root.dark) .automation-detail-edit:hover,
-:global(:root.dark) .automation-row:hover,
-:global(:root.dark) .automation-row.is-selected {
-  @apply bg-zinc-900;
-}
-
-:global(:root.dark) .automation-row {
-  @apply border-zinc-800;
-}
-
-:global(:root.dark) .automation-row-title,
-:global(:root.dark) .automation-detail-title-wrap h2,
-:global(:root.dark) .automation-detail-grid dd,
-:global(:root.dark) .automations-empty p {
-  @apply text-zinc-100;
-}
-
-:global(:root.dark) .automation-row-meta,
-:global(:root.dark) .automation-row-schedule,
-:global(:root.dark) .automation-detail-title-wrap span,
-:global(:root.dark) .automation-detail-grid dt,
-:global(:root.dark) .automation-detail-prompt h3,
-:global(:root.dark) .automations-summary,
-:global(:root.dark) .automations-empty {
-  @apply text-zinc-400;
-}
-
-:global(:root.dark) .automation-detail-grid div,
-:global(:root.dark) .automation-detail-prompt p {
-  @apply bg-zinc-900 text-zinc-200;
-}
 </style>
diff --git a/src/components/sidebar/SidebarThreadTree.vue b/src/components/sidebar/SidebarThreadTree.vue
index 7dadbed9d..4f62fec6e 100644
--- a/src/components/sidebar/SidebarThreadTree.vue
+++ b/src/components/sidebar/SidebarThreadTree.vue
@@ -1751,7 +1751,16 @@ function openAutomationDialog(threadId: string): void {
 
 function openProjectAutomationDialog(projectName: string): void {
   const projectCwd = getProjectAutomationKey(projectName)
-  if (!projectCwd) return
+  if (!projectCwd) {
+    automationDialogScope.value = 'project'
+    automationDialogThreadId.value = ''
+    automationDialogProjectName.value = ''
+    automationDialogError.value = 'Project automation requires a resolved absolute project path.'
+    automationDialogNotice.value = ''
+    automationDialogVisible.value = true
+    closeProjectMenu()
+    return
+  }
   automationDialogScope.value = 'project'
   automationDialogThreadId.value = ''
   automationDialogProjectName.value = projectCwd
@@ -2128,7 +2137,12 @@ function onRemoveProject(projectName: string): void {
 }
 
 function getProjectAutomationKey(projectName: string): string {
-  return props.projectCwdByName[projectName]?.trim() || projectName.trim()
+  const projectCwd = props.projectCwdByName[projectName]?.trim() ?? ''
+  return isAbsoluteProjectCwd(projectCwd) ? projectCwd : ''
+}
+
+function isAbsoluteProjectCwd(value: string): boolean {
+  return value.startsWith('/') || /^[A-Za-z]:[\\/]/u.test(value)
 }
 
 function onProjectHeaderKeyDown(event: KeyboardEvent, projectName: string): void {
diff --git a/src/server/codexAppServerBridge.ts b/src/server/codexAppServerBridge.ts
index 10879690d..75e35c9a7 100644
--- a/src/server/codexAppServerBridge.ts
+++ b/src/server/codexAppServerBridge.ts
@@ -3457,6 +3457,9 @@ async function writeProjectCronAutomation(input: {
   if (!projectName || !name || !prompt || !rrule) {
     throw new Error('projectName, name, prompt, and rrule are required')
   }
+  if (!isAbsolute(projectName)) {
+    throw new Error('Project automation cwd must be an absolute path')
+  }
 
   const automationRoot = getCodexAutomationsDir()
   await mkdir(automationRoot, { recursive: true })
@@ -3474,7 +3477,7 @@ async function writeProjectCronAutomation(input: {
     rrule,
     status: input.status,
     targetThreadId: null,
-    cwds: [projectName],
+    cwds: Array.from(new Set([...(existing?.cwds ?? []), projectName])),
     createdAtMs: existing?.createdAtMs ?? now,
     updatedAtMs: now,
     nextRunAtMs: null,
@@ -3494,16 +3497,31 @@ async function writeProjectCronAutomation(input: {
 async function deleteProjectCronAutomation(projectName: string, automationId = ''): Promise<boolean> {
   const normalizedProjectName = projectName.trim()
   const normalizedAutomationId = automationId.trim()
+  if (!normalizedProjectName || !isAbsolute(normalizedProjectName)) return false
   if (normalizedAutomationId) {
     const automation = await readProjectCronAutomation(normalizedProjectName, normalizedAutomationId)
     if (!automation) return false
-    await rm(join(getCodexAutomationsDir(), automation.id), { recursive: true, force: true })
+    const remainingCwds = automation.cwds.filter((cwd) => cwd !== normalizedProjectName)
+    if (remainingCwds.length > 0) {
+      const record = { ...automation, cwds: remainingCwds, updatedAtMs: Date.now() }
+      await writeFile(join(getCodexAutomationsDir(), automation.id, 'automation.toml'), serializeAutomationToml(record), 'utf8')
+    } else {
+      await rm(join(getCodexAutomationsDir(), automation.id), { recursive: true, force: true })
+    }
     return true
   }
 
   const automations = await readProjectCronAutomations(normalizedProjectName)
   if (automations.length === 0) return false
-  await Promise.all(automations.map((automation) => rm(join(getCodexAutomationsDir(), automation.id), { recursive: true, force: true })))
+  await Promise.all(automations.map(async (automation) => {
+    const remainingCwds = automation.cwds.filter((cwd) => cwd !== normalizedProjectName)
+    if (remainingCwds.length > 0) {
+      const record = { ...automation, cwds: remainingCwds, updatedAtMs: Date.now() }
+      await writeFile(join(getCodexAutomationsDir(), automation.id, 'automation.toml'), serializeAutomationToml(record), 'utf8')
+      return
+    }
+    await rm(join(getCodexAutomationsDir(), automation.id), { recursive: true, force: true })
+  }))
   return true
 }
 
@@ -7128,6 +7146,10 @@ export function createCodexBridgeMiddleware(): CodexBridgeMiddleware {
           setJson(res, 400, { error: 'projectName, name, prompt, and rrule are required' })
           return
         }
+        if (!isAbsolute(projectName)) {
+          setJson(res, 400, { error: 'Project automation cwd must be an absolute path' })
+          return
+        }
         const automation = await writeProjectCronAutomation({ projectName, id, name, prompt, rrule, status })
         setJson(res, 200, { data: automation })
         return
diff --git a/src/style.css b/src/style.css
index 1c0425600..eb930be7a 100644
--- a/src/style.css
+++ b/src/style.css
@@ -1661,12 +1661,16 @@
 }
 
 :root.dark .automations-refresh,
+:root.dark .automation-edit-button,
+:root.dark .automation-detail-edit,
 :root.dark .automations-list,
 :root.dark .automation-detail {
   @apply border-zinc-800 bg-zinc-950 text-zinc-100;
 }
 
 :root.dark .automations-refresh:hover,
+:root.dark .automation-edit-button:hover,
+:root.dark .automation-detail-edit:hover,
 :root.dark .automation-row:hover,
 :root.dark .automation-row.is-selected {
   @apply bg-zinc-900;
diff --git a/tests.md b/tests.md
index d475cec58..22ab10626 100644
--- a/tests.md
+++ b/tests.md
@@ -302,6 +302,35 @@ This file tracks manual regression and feature verification steps.
 
 ---
 
+### Pinned threads remain visible during background pagination
+
+#### Feature/Change Name
+Pinned threads are no longer removed from the Pinned section while the sidebar is still loading older thread-list pages.
+
+#### Prerequisites/Setup
+1. Dev server running (`pnpm run dev`)
+2. More than 50 total unarchived threads exist
+3. At least one older thread outside the initial recent page is pinned
+4. Light theme and dark theme both available from the appearance switcher
+
+#### Steps
+1. In light theme, reload the app.
+2. Immediately open the sidebar Pinned section.
+3. Confirm pinned rows from older history remain in the Pinned section after the initial thread list appears.
+4. Wait for background thread pagination to finish.
+5. Confirm the same pinned rows remain visible and can still be selected.
+6. Switch to dark theme and repeat steps 1-5.
+
+#### Expected Results
+- Saved pinned thread IDs are preserved while only the initial thread-list page is loaded.
+- Missing pinned IDs are pruned only after the full thread list has loaded.
+- Pinned rows remain readable and selectable in both light and dark themes.
+
+#### Rollback/Cleanup
+- Unpin any disposable threads created only for this test.
+
+---
+
 ### Feature: Project automations from the sidebar project menu
 
 #### Feature/Change Name
@@ -324,12 +353,17 @@ Project rows can create and manage project-scoped cron automations using the sam
 9. Save a second project automation and confirm both records appear in the dialog list independently.
 10. Confirm the project row automation chip shows the bolt icon plus the visible count `2`.
 11. Repeat the same two-automation check on a chat thread and confirm the thread row chip shows the bolt icon plus the visible count `2`.
-12. Remove one project automation and confirm the project row chip returns to icon-only for one remaining automation.
-13. Remove the final project automation and confirm the project menu returns to `Add automation…` and the project row automation icon disappears.
-14. Switch to dark theme and repeat steps 1-11.
+12. If a project row has no resolved absolute cwd, confirm project automation creation is blocked with a clear error and no non-absolute `cwds` value is written.
+13. For a cron automation TOML with multiple `cwds`, edit it from one project and confirm the other `cwds` entries remain in the file.
+14. For the same multi-cwd automation, remove it from one project and confirm only that cwd is removed; the automation folder remains until the final cwd is removed.
+15. Remove one project automation and confirm the project row chip returns to icon-only for one remaining automation.
+16. Remove the final project automation and confirm the project menu returns to `Add automation…` and the project row automation icon disappears.
+17. Switch to dark theme and repeat steps 1-11.
 
 #### Expected Results
 - Project automations are stored as cron automations with `cwds = ["<absolute project path>"]`, including when the sidebar row displays only the project folder name.
+- Project automation creation/save never persists sidebar display labels or other non-absolute values into `cwds`.
+- Editing or deleting a project automation associated with multiple `cwds` preserves the other project cwd associations instead of overwriting or deleting the shared automation.
 - Thread heartbeat automations remain scoped by `target_thread_id` and continue to use `Run now`.
 - Project automation dialogs use project-specific copy and do not show `Run now`.
 - The project menu, dialog list, inputs, schedule controls, status selector, automation icon, and multi-automation count badge remain readable in light and dark themes.
@@ -1731,6 +1765,39 @@ Model, skill, thinking, and plan controls remain usable while a thread turn is i
 #### Rollback/Cleanup
 - If needed, run another sync pull/push to restore previous skill state in the sync repo.
 
+### Feature: Public shared skills pull overwrites only shared skills
+
+#### Prerequisites
+- App running from this repository with Skills Hub available.
+- GitHub skills sync is not configured/logged in.
+- Local shared skills directory exists at `~/.codex/skills/shared_skills`.
+
+#### Steps
+1. Create a temporary local-only skill folder under `~/.codex/skills/shared_skills`, or edit a tracked shared skill file in that directory.
+2. Note the parent `~/.codex/skills` status, including any unrelated local edits outside `shared_skills`.
+3. Open `Skills Hub`.
+4. Trigger `Pull` from the `Skills Sync (GitHub)` panel.
+5. Wait for the pull success toast.
+6. Inspect `~/.codex/skills/shared_skills` and compare it with the public `OpenClawAndroid/skills` `android` branch.
+7. Inspect `~/.codex/skills` and verify unrelated parent-level files were not reset or cleaned by the unauthenticated pull.
+8. If `~/.codex/skills/shared_skills/.git` is a git file or worktree/submodule-style pointer, repeat the pull and verify the nested repo is not reinitialized.
+9. Inspect the `/codex-api/skills-sync/pull` response and verify `data.synced` matches the number of direct shared skill folders with `SKILL.md`.
+10. In light theme, verify the Skills Hub list reloads and does not show stale local-only skills.
+11. Switch to dark theme and verify the same Skills Hub state remains readable and current.
+
+#### Expected Results
+- Public unauthenticated pull resets only the nested `shared_skills` repo to the public upstream `android` branch.
+- Local uncommitted edits and local-only untracked skill folders inside `shared_skills` are removed by the pull.
+- Parent-level `~/.codex/skills` files outside `shared_skills` are not reset or cleaned.
+- Existing git-file/worktree/submodule-style shared skills repos are reused, not reinitialized.
+- The pull response reports the shared skills count from `~/.codex/skills/shared_skills`, not the parent skills directory.
+- The installed skills list reloads immediately after the pull in both light and dark theme.
+- Private GitHub sync repos still preserve local edits through the bidirectional sync path.
+
+#### Rollback/Cleanup
+- Recreate any intentionally removed local-only shared skill if it should be kept.
+- Use private sync `Push` only after confirming the public pull result should be mirrored elsewhere.
+
 ### Feature: Force Refresh Skills button in Skills Sync panel
 
 #### Prerequisites

From 6c3b20ab5e4cc278c1507c6d34c4ba9f7a5617d3 Mon Sep 17 00:00:00 2001
From: Igor <igor.levochkin@xrtc.io>
Date: Sun, 10 May 2026 09:32:15 +0700
Subject: [PATCH 11/14] Disambiguate automation panel rows

---
 src/components/content/AutomationsPanel.vue | 43 +++++++++++++++++----
 tests.md                                    |  8 ++--
 2 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/src/components/content/AutomationsPanel.vue b/src/components/content/AutomationsPanel.vue
index fcfb3c0bd..f94619211 100644
--- a/src/components/content/AutomationsPanel.vue
+++ b/src/components/content/AutomationsPanel.vue
@@ -28,14 +28,14 @@
       <section class="automations-list" aria-label="Automations">
         <div
           v-for="row in automationRows"
-          :key="row.automation.id"
+          :key="row.rowKey"
           class="automation-row"
-          :class="{ 'is-selected': selectedAutomationId === row.automation.id }"
+          :class="{ 'is-selected': selectedRowKey === row.rowKey }"
           role="button"
           tabindex="0"
-          @click="selectedAutomationId = row.automation.id"
-          @keydown.enter.prevent="selectedAutomationId = row.automation.id"
-          @keydown.space.prevent="selectedAutomationId = row.automation.id"
+          @click="selectAutomationRow(row)"
+          @keydown.enter.prevent="selectAutomationRow(row)"
+          @keydown.space.prevent="selectAutomationRow(row)"
         >
           <span class="automation-row-icon" :data-status="row.automation.status">
             <IconTablerPlayerStopFilled v-if="row.automation.status === 'PAUSED'" />
@@ -117,6 +117,7 @@ const emit = defineEmits<{
 }>()
 
 type AutomationRow = {
+  rowKey: string
   automation: UiThreadAutomation
   scope: 'thread' | 'project'
   scopeLabel: string
@@ -136,6 +137,7 @@ const projectAutomations = ref<Record<string, UiThreadAutomation[]>>({})
 const isLoading = ref(false)
 const loadError = ref('')
 const selectedAutomationId = ref(props.selectedAutomationId ?? '')
+const selectedRowKey = ref('')
 
 const threadTitleById = computed(() => {
   const map = new Map<string, string>()
@@ -162,6 +164,7 @@ const automationRows = computed<AutomationRow[]>(() => {
     const threadTitle = threadTitleById.value.get(threadId) ?? threadId
     for (const automation of automations) {
       rows.push({
+        rowKey: getAutomationRowKey('thread', threadId, automation.id),
         automation,
         scope: 'thread',
         scopeLabel: 'Heartbeat',
@@ -175,6 +178,7 @@ const automationRows = computed<AutomationRow[]>(() => {
     const projectLabel = projectLabelByCwd.value.get(cwd) ?? getPathLeaf(cwd)
     for (const automation of automations) {
       rows.push({
+        rowKey: getAutomationRowKey('project', cwd, automation.id),
         automation,
         scope: 'project',
         scopeLabel: 'Project',
@@ -201,13 +205,18 @@ const automationRows = computed<AutomationRow[]>(() => {
 const activeCount = computed(() => automationRows.value.filter((row) => row.automation.status === 'ACTIVE').length)
 const pausedCount = computed(() => automationRows.value.filter((row) => row.automation.status === 'PAUSED').length)
 const selectedRow = computed(() =>
-  automationRows.value.find((row) => row.automation.id === selectedAutomationId.value) ?? automationRows.value[0] ?? null,
+  automationRows.value.find((row) => row.rowKey === selectedRowKey.value)
+    ?? automationRows.value.find((row) => row.automation.id === selectedAutomationId.value)
+    ?? automationRows.value[0]
+    ?? null,
 )
 
 watch(
   () => props.selectedAutomationId,
   (id) => {
-    if (id) selectedAutomationId.value = id
+    if (!id) return
+    selectedAutomationId.value = id
+    selectedRowKey.value = resolveRowKeyForAutomationId(id)
   },
 )
 
@@ -218,10 +227,17 @@ watch(selectedAutomationId, (id) => {
 watch(automationRows, (rows) => {
   if (rows.length === 0) {
     selectedAutomationId.value = ''
+    selectedRowKey.value = ''
+    return
+  }
+  if (selectedRowKey.value && rows.some((row) => row.rowKey === selectedRowKey.value)) return
+  if (selectedAutomationId.value && rows.some((row) => row.automation.id === selectedAutomationId.value)) {
+    selectedRowKey.value = resolveRowKeyForAutomationId(selectedAutomationId.value)
     return
   }
   if (!selectedAutomationId.value || !rows.some((row) => row.automation.id === selectedAutomationId.value)) {
     selectedAutomationId.value = rows[0].automation.id
+    selectedRowKey.value = rows[0].rowKey
   }
 })
 
@@ -262,6 +278,19 @@ function emitEditAutomation(row: AutomationRow): void {
   })
 }
 
+function selectAutomationRow(row: AutomationRow): void {
+  selectedRowKey.value = row.rowKey
+  selectedAutomationId.value = row.automation.id
+}
+
+function resolveRowKeyForAutomationId(automationId: string): string {
+  return automationRows.value.find((row) => row.automation.id === automationId)?.rowKey ?? ''
+}
+
+function getAutomationRowKey(scope: 'thread' | 'project', target: string, automationId: string): string {
+  return `${scope}:${target}:${automationId}`
+}
+
 function describeAutomationSchedule(automation: UiThreadAutomation): string {
   if (automation.status === 'PAUSED') return 'Paused'
   if (automation.nextRunAtMs) return `Next ${formatDateTime(automation.nextRunAtMs)}`
diff --git a/tests.md b/tests.md
index 22ab10626..2a3dfcef1 100644
--- a/tests.md
+++ b/tests.md
@@ -356,14 +356,16 @@ Project rows can create and manage project-scoped cron automations using the sam
 12. If a project row has no resolved absolute cwd, confirm project automation creation is blocked with a clear error and no non-absolute `cwds` value is written.
 13. For a cron automation TOML with multiple `cwds`, edit it from one project and confirm the other `cwds` entries remain in the file.
 14. For the same multi-cwd automation, remove it from one project and confirm only that cwd is removed; the automation folder remains until the final cwd is removed.
-15. Remove one project automation and confirm the project row chip returns to icon-only for one remaining automation.
-16. Remove the final project automation and confirm the project menu returns to `Add automation…` and the project row automation icon disappears.
-17. Switch to dark theme and repeat steps 1-11.
+15. Open the Automations panel with the same multi-cwd automation present and confirm each project association row can be selected and edited independently.
+16. Remove one project automation and confirm the project row chip returns to icon-only for one remaining automation.
+17. Remove the final project automation and confirm the project menu returns to `Add automation…` and the project row automation icon disappears.
+18. Switch to dark theme and repeat steps 1-11.
 
 #### Expected Results
 - Project automations are stored as cron automations with `cwds = ["<absolute project path>"]`, including when the sidebar row displays only the project folder name.
 - Project automation creation/save never persists sidebar display labels or other non-absolute values into `cwds`.
 - Editing or deleting a project automation associated with multiple `cwds` preserves the other project cwd associations instead of overwriting or deleting the shared automation.
+- Multi-cwd project automation rows use a unique row identity per project association, so selection and edit actions target the clicked project row.
 - Thread heartbeat automations remain scoped by `target_thread_id` and continue to use `Run now`.
 - Project automation dialogs use project-specific copy and do not show `Run now`.
 - The project menu, dialog list, inputs, schedule controls, status selector, automation icon, and multi-automation count badge remain readable in light and dark themes.

From d998c8a6935364c3d13bc358205b0197e443fd1f Mon Sep 17 00:00:00 2001
From: Igor <igor.levochkin@xrtc.io>
Date: Mon, 11 May 2026 04:45:00 +0700
Subject: [PATCH 12/14] Add automation panel create action

---
 src/App.vue                                  | 14 +++++++
 src/components/content/AutomationsPanel.vue  | 39 ++++++++++++++++++--
 src/components/sidebar/SidebarThreadTree.vue | 16 ++++++++
 src/style.css                                |  2 +
 tests.md                                     | 15 +++++---
 5 files changed, 76 insertions(+), 10 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 8b315d842..fd52ff0e5 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -576,6 +576,7 @@
               :selected-automation-id="routeAutomationId"
               @select-automation="onSelectAutomationInPanel"
               @edit-automation="onEditAutomationFromPanel"
+              @create-automation="onCreateAutomationFromPanel"
             />
           </template>
           <template v-else-if="isHomeRoute">
@@ -1275,6 +1276,7 @@ const router = useRouter()
 const { isMobile } = useMobile()
 type SidebarThreadTreeExposed = {
   openAutomationEditorFromPanel: (payload: AutomationEditRequest) => void
+  openAutomationCreatorFromPanel: (payload: AutomationCreateRequest) => void
 }
 type AutomationsPanelExposed = {
   loadAutomations: () => Promise<void>
@@ -1284,6 +1286,10 @@ type AutomationEditRequest = {
   target: string
   automation: UiThreadAutomation
 }
+type AutomationCreateRequest = {
+  scope: 'thread' | 'project'
+  target: string
+}
 const sidebarThreadTreeRef = ref<SidebarThreadTreeExposed | null>(null)
 const automationsPanelRef = ref<AutomationsPanelExposed | null>(null)
 const homeThreadComposerRef = ref<ThreadComposerExposed | null>(null)
@@ -2037,6 +2043,14 @@ async function onEditAutomationFromPanel(payload: AutomationEditRequest): Promis
   sidebarThreadTreeRef.value?.openAutomationEditorFromPanel(payload)
 }
 
+async function onCreateAutomationFromPanel(payload: AutomationCreateRequest): Promise<void> {
+  if (isSidebarCollapsed.value) {
+    setSidebarCollapsed(false)
+    await nextTick()
+  }
+  sidebarThreadTreeRef.value?.openAutomationCreatorFromPanel(payload)
+}
+
 function onAutomationsChanged(): void {
   if (route.name !== 'automations') return
   void automationsPanelRef.value?.loadAutomations()
diff --git a/src/components/content/AutomationsPanel.vue b/src/components/content/AutomationsPanel.vue
index f94619211..489483ad4 100644
--- a/src/components/content/AutomationsPanel.vue
+++ b/src/components/content/AutomationsPanel.vue
@@ -6,9 +6,20 @@
         <span>{{ activeCount }} active</span>
         <span>{{ pausedCount }} paused</span>
       </div>
-      <button class="automations-refresh" type="button" :disabled="isLoading" @click="loadAutomations">
-        {{ isLoading ? 'Refreshing...' : 'Refresh' }}
-      </button>
+      <div class="automations-actions">
+        <button
+          class="automations-create"
+          type="button"
+          :disabled="!selectedRow"
+          :title="selectedRow ? `Create automation for ${selectedRow.targetLabel}` : 'Select an automation target first'"
+          @click="emitCreateAutomation"
+        >
+          New automation
+        </button>
+        <button class="automations-refresh" type="button" :disabled="isLoading" @click="loadAutomations">
+          {{ isLoading ? 'Refreshing...' : 'Refresh' }}
+        </button>
+      </div>
     </div>
 
     <p v-if="loadError" class="automations-error">{{ loadError }}</p>
@@ -114,6 +125,7 @@ const props = defineProps<{
 const emit = defineEmits<{
   (event: 'select-automation', id: string): void
   (event: 'edit-automation', payload: AutomationEditRequest): void
+  (event: 'create-automation', payload: AutomationCreateRequest): void
 }>()
 
 type AutomationRow = {
@@ -132,6 +144,11 @@ type AutomationEditRequest = {
   automation: UiThreadAutomation
 }
 
+type AutomationCreateRequest = {
+  scope: 'thread' | 'project'
+  target: string
+}
+
 const threadAutomations = ref<Record<string, UiThreadAutomation[]>>({})
 const projectAutomations = ref<Record<string, UiThreadAutomation[]>>({})
 const isLoading = ref(false)
@@ -278,6 +295,15 @@ function emitEditAutomation(row: AutomationRow): void {
   })
 }
 
+function emitCreateAutomation(): void {
+  const row = selectedRow.value
+  if (!row) return
+  emit('create-automation', {
+    scope: row.scope,
+    target: row.targetTitle,
+  })
+}
+
 function selectAutomationRow(row: AutomationRow): void {
   selectedRowKey.value = row.rowKey
   selectedAutomationId.value = row.automation.id
@@ -342,7 +368,12 @@ function getPathLeaf(path: string): string {
   @apply rounded-full bg-zinc-100 px-2 py-1;
 }
 
-.automations-refresh {
+.automations-actions {
+  @apply flex shrink-0 items-center gap-2;
+}
+
+.automations-refresh,
+.automations-create {
   @apply h-8 shrink-0 rounded-full border border-zinc-200 bg-white px-3 text-xs font-medium text-zinc-700 transition hover:bg-zinc-50 disabled:opacity-60;
 }
 
diff --git a/src/components/sidebar/SidebarThreadTree.vue b/src/components/sidebar/SidebarThreadTree.vue
index 4f62fec6e..a8e8a7241 100644
--- a/src/components/sidebar/SidebarThreadTree.vue
+++ b/src/components/sidebar/SidebarThreadTree.vue
@@ -1797,6 +1797,21 @@ function openAutomationEditorFromPanel(payload: {
   closeThreadMenu()
 }
 
+function openAutomationCreatorFromPanel(payload: {
+  scope: 'thread' | 'project'
+  target: string
+}): void {
+  automationDialogScope.value = payload.scope
+  automationDialogThreadId.value = payload.scope === 'thread' ? payload.target : ''
+  automationDialogProjectName.value = payload.scope === 'project' ? payload.target : ''
+  automationDialogError.value = ''
+  automationDialogNotice.value = ''
+  startNewAutomationDraft()
+  automationDialogVisible.value = true
+  closeProjectMenu()
+  closeThreadMenu()
+}
+
 function startNewAutomationDraft(): void {
   automationDialogAutomationId.value = ''
   automationDialogMode.value = 'create'
@@ -1987,6 +2002,7 @@ function getProjectDisplayName(projectName: string): string {
 
 defineExpose({
   openAutomationEditorFromPanel,
+  openAutomationCreatorFromPanel,
 })
 
 function isPathLikeProjectName(value: string): boolean {
diff --git a/src/style.css b/src/style.css
index eb930be7a..d32f83eda 100644
--- a/src/style.css
+++ b/src/style.css
@@ -1661,6 +1661,7 @@
 }
 
 :root.dark .automations-refresh,
+:root.dark .automations-create,
 :root.dark .automation-edit-button,
 :root.dark .automation-detail-edit,
 :root.dark .automations-list,
@@ -1669,6 +1670,7 @@
 }
 
 :root.dark .automations-refresh:hover,
+:root.dark .automations-create:hover,
 :root.dark .automation-edit-button:hover,
 :root.dark .automation-detail-edit:hover,
 :root.dark .automation-row:hover,
diff --git a/tests.md b/tests.md
index 2a3dfcef1..43b018391 100644
--- a/tests.md
+++ b/tests.md
@@ -104,16 +104,19 @@ This file tracks manual regression and feature verification steps.
 4. Select a row and confirm the detail panel shows status, schedule, target, id, and prompt.
 5. Click the row `Edit` button and confirm the existing automation editor opens with the selected automation values prefilled.
 6. Close the editor, select the same automation again, then click the detail-panel `Edit` button and confirm the same editor opens.
-7. Change the automation name or status, save, and confirm the Automations panel refreshes with the updated row.
-8. Refresh the panel and confirm the selected automation stays selected when it still exists.
-9. Open `#/automations?automationId=<existing-id>` directly and confirm that automation is selected.
-10. Create another active thread or project automation, refresh the Automations panel, and confirm the newly created active automation appears at the top of the active rows.
-11. Pause an automation and confirm it appears after active automations even if it was created more recently.
-12. Switch to dark theme and repeat steps 1-7.
+7. Click the toolbar `New automation` button and confirm the existing automation editor opens in create mode for the selected row's thread or project target.
+8. Save the new automation and confirm the Automations panel refreshes with the added row.
+9. Change the automation name or status, save, and confirm the Automations panel refreshes with the updated row.
+10. Refresh the panel and confirm the selected automation stays selected when it still exists.
+11. Open `#/automations?automationId=<existing-id>` directly and confirm that automation is selected.
+12. Create another active thread or project automation, refresh the Automations panel, and confirm the newly created active automation appears at the top of the active rows.
+13. Pause an automation and confirm it appears after active automations even if it was created more recently.
+14. Switch to dark theme and repeat steps 1-9.
 
 #### Expected Results
 - The panel combines heartbeat automations from `/codex-api/thread-automations` and project automations from `/codex-api/project-automations`.
 - Rows are sorted active first, then paused, with newest creation time first inside each status group, then newest update time, then automation name.
+- The toolbar `New automation` button creates a blank draft for the currently selected row's thread or project target using the same existing automation editor.
 - Row and detail edit buttons open the same existing thread/project automation editor, and saved edits refresh the panel list.
 - Thread targets use known thread titles when available; project targets use known project labels when available.
 - Empty, loading, refresh, and error states remain readable in light and dark themes.

From b8922e82670c0d4107464718121d44f3e3ad1867 Mon Sep 17 00:00:00 2001
From: Igor <igor.levochkin@xrtc.io>
Date: Mon, 11 May 2026 04:53:59 +0700
Subject: [PATCH 13/14] Remove fixed Qodo polling wait

---
 AGENTS.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/AGENTS.md b/AGENTS.md
index c19cec946..26c342747 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -62,7 +62,6 @@
 - Reproduce the issue with a focused test when feasible; if direct reproduction is impractical, document the exact reasoning and code evidence used to accept or reject the finding.
 - Prefer adding or updating a regression test for every accepted review-bot bug before or alongside the fix.
 - Do not patch purely to satisfy a bot comment if the behavior is correct, stale, already fixed, or the proposed change would make the implementation worse.
-- After pushing any commit to an open PR, wait and poll for Qodo/review-bot comments and PR review status for about 30 seconds before reporting the push workflow as complete.
 - After fixing an accepted review-bot finding, run the narrow regression test plus the relevant build/typecheck command, push the commit, and re-check the PR comments/status.
 - In the completion report, distinguish confirmed fixes from stale or rejected bot comments.
 

From 04c2abaebaeebed1492b40e6601e94a6b1691678 Mon Sep 17 00:00:00 2001
From: Igor <igor.levochkin@xrtc.io>
Date: Mon, 11 May 2026 05:01:20 +0700
Subject: [PATCH 14/14] Add automation target picker

---
 src/App.vue                                  |  10 +-
 src/components/content/AutomationsPanel.vue  |  17 +-
 src/components/sidebar/SidebarThreadTree.vue | 195 +++++++++++++++++--
 src/style.css                                |  16 ++
 tests.md                                     |  22 ++-
 5 files changed, 215 insertions(+), 45 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index fd52ff0e5..38bd68123 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1276,7 +1276,7 @@ const router = useRouter()
 const { isMobile } = useMobile()
 type SidebarThreadTreeExposed = {
   openAutomationEditorFromPanel: (payload: AutomationEditRequest) => void
-  openAutomationCreatorFromPanel: (payload: AutomationCreateRequest) => void
+  openAutomationCreatorFromPanel: () => void
 }
 type AutomationsPanelExposed = {
   loadAutomations: () => Promise<void>
@@ -1286,10 +1286,6 @@ type AutomationEditRequest = {
   target: string
   automation: UiThreadAutomation
 }
-type AutomationCreateRequest = {
-  scope: 'thread' | 'project'
-  target: string
-}
 const sidebarThreadTreeRef = ref<SidebarThreadTreeExposed | null>(null)
 const automationsPanelRef = ref<AutomationsPanelExposed | null>(null)
 const homeThreadComposerRef = ref<ThreadComposerExposed | null>(null)
@@ -2043,12 +2039,12 @@ async function onEditAutomationFromPanel(payload: AutomationEditRequest): Promis
   sidebarThreadTreeRef.value?.openAutomationEditorFromPanel(payload)
 }
 
-async function onCreateAutomationFromPanel(payload: AutomationCreateRequest): Promise<void> {
+async function onCreateAutomationFromPanel(): Promise<void> {
   if (isSidebarCollapsed.value) {
     setSidebarCollapsed(false)
     await nextTick()
   }
-  sidebarThreadTreeRef.value?.openAutomationCreatorFromPanel(payload)
+  sidebarThreadTreeRef.value?.openAutomationCreatorFromPanel()
 }
 
 function onAutomationsChanged(): void {
diff --git a/src/components/content/AutomationsPanel.vue b/src/components/content/AutomationsPanel.vue
index 489483ad4..723fcdafb 100644
--- a/src/components/content/AutomationsPanel.vue
+++ b/src/components/content/AutomationsPanel.vue
@@ -10,8 +10,7 @@
         <button
           class="automations-create"
           type="button"
-          :disabled="!selectedRow"
-          :title="selectedRow ? `Create automation for ${selectedRow.targetLabel}` : 'Select an automation target first'"
+          title="Create a new automation"
           @click="emitCreateAutomation"
         >
           New automation
@@ -125,7 +124,7 @@ const props = defineProps<{
 const emit = defineEmits<{
   (event: 'select-automation', id: string): void
   (event: 'edit-automation', payload: AutomationEditRequest): void
-  (event: 'create-automation', payload: AutomationCreateRequest): void
+  (event: 'create-automation'): void
 }>()
 
 type AutomationRow = {
@@ -144,11 +143,6 @@ type AutomationEditRequest = {
   automation: UiThreadAutomation
 }
 
-type AutomationCreateRequest = {
-  scope: 'thread' | 'project'
-  target: string
-}
-
 const threadAutomations = ref<Record<string, UiThreadAutomation[]>>({})
 const projectAutomations = ref<Record<string, UiThreadAutomation[]>>({})
 const isLoading = ref(false)
@@ -296,12 +290,7 @@ function emitEditAutomation(row: AutomationRow): void {
 }
 
 function emitCreateAutomation(): void {
-  const row = selectedRow.value
-  if (!row) return
-  emit('create-automation', {
-    scope: row.scope,
-    target: row.targetTitle,
-  })
+  emit('create-automation')
 }
 
 function selectAutomationRow(row: AutomationRow): void {
diff --git a/src/components/sidebar/SidebarThreadTree.vue b/src/components/sidebar/SidebarThreadTree.vue
index a8e8a7241..170c40f7a 100644
--- a/src/components/sidebar/SidebarThreadTree.vue
+++ b/src/components/sidebar/SidebarThreadTree.vue
@@ -684,6 +684,54 @@
           <h3 class="rename-thread-title">{{ automationDialogMode === 'edit' ? 'Edit automation' : 'Add automation' }}</h3>
           <p class="rename-thread-subtitle">{{ automationDialogSubtitle }}</p>
 
+          <div v-if="automationTargetPickerVisible && automationDialogMode === 'create'" class="automation-target-picker">
+            <span class="automation-thread-label">Target</span>
+            <div class="automation-target-mode-group" role="radiogroup" aria-label="Automation target type">
+              <button
+                class="automation-target-mode"
+                :class="{ 'is-active': automationTargetMode === 'new-chat' }"
+                type="button"
+                @click="setAutomationTargetMode('new-chat')"
+              >
+                New chat
+              </button>
+              <button
+                class="automation-target-mode"
+                :class="{ 'is-active': automationTargetMode === 'thread' }"
+                type="button"
+                @click="setAutomationTargetMode('thread')"
+              >
+                Existing chat
+              </button>
+              <button
+                class="automation-target-mode"
+                :class="{ 'is-active': automationTargetMode === 'project' }"
+                type="button"
+                @click="setAutomationTargetMode('project')"
+              >
+                Project
+              </button>
+            </div>
+
+            <div v-if="automationTargetMode !== 'new-chat'" class="automation-target-dropdown">
+              <input
+                v-model="automationTargetSearch"
+                class="rename-thread-input"
+                type="search"
+                :placeholder="automationTargetMode === 'project' ? 'Search projects' : 'Search chats'"
+              />
+              <select v-model="automationTargetValue" class="automation-thread-select" size="5">
+                <option
+                  v-for="option in filteredAutomationTargetOptions"
+                  :key="option.value"
+                  :value="option.value"
+                >
+                  {{ option.label }}
+                </option>
+              </select>
+            </div>
+          </div>
+
           <div v-if="automationDialogAutomations.length > 0" class="automation-thread-list" :aria-label="automationDialogScope === 'project' ? 'Project automations' : 'Thread automations'">
             <button
               v-for="automation in automationDialogAutomations"
@@ -831,12 +879,14 @@ import type { ComponentPublicInstance } from 'vue'
 import {
   deleteThreadAutomation,
   deleteProjectAutomation,
+  createProjectlessThreadDirectory,
   getProjectAutomationMap,
   getPinnedThreadState,
   getThreadAutomationMap,
   getThreadSummary,
   persistPinnedThreadIds,
   runThreadAutomationNow,
+  startThread,
   upsertProjectAutomation,
   upsertThreadAutomation,
 } from '../../api/codexGateway'
@@ -920,6 +970,7 @@ type MenuDirection = 'up' | 'down'
 type ChatSortMode = 'created' | 'updated'
 type AutomationScheduleMode = 'daily' | 'interval' | 'advanced'
 type AutomationIntervalUnit = 'minutes' | 'hours' | 'days'
+type AutomationTargetMode = 'new-chat' | 'thread' | 'project'
 
 type AutomationScheduleDraft = {
   mode: AutomationScheduleMode
@@ -968,6 +1019,10 @@ const automationDialogThreadId = ref('')
 const automationDialogProjectName = ref('')
 const automationDialogAutomationId = ref('')
 const automationDialogMode = ref<'create' | 'edit'>('create')
+const automationTargetPickerVisible = ref(false)
+const automationTargetMode = ref<AutomationTargetMode>('new-chat')
+const automationTargetSearch = ref('')
+const automationTargetValue = ref('')
 const automationDialogError = ref('')
 const automationDialogNotice = ref('')
 const isSavingAutomation = ref(false)
@@ -998,11 +1053,57 @@ const automationDialogAutomations = computed(() => {
   return threadId ? (automationByThreadId.value[threadId] ?? []) : []
 })
 const automationSchedulePreview = computed(() => describeAutomationSchedule(automationDraft.value.rrule))
-const automationDialogSubtitle = computed(() =>
-  automationDialogScope.value === 'project'
+const automationDialogSubtitle = computed(() => {
+  if (automationTargetPickerVisible.value && automationDialogMode.value === 'create') {
+    if (automationTargetMode.value === 'new-chat') return 'This creates a new chat and attaches a heartbeat automation to it.'
+    if (automationTargetMode.value === 'thread') return 'This creates a heartbeat automation attached to the selected chat.'
+    return 'This creates a project automation attached to the selected project folder.'
+  }
+  return automationDialogScope.value === 'project'
     ? 'This creates project automations attached to the selected project folder.'
-    : 'This creates heartbeat automations attached to the selected thread.',
-)
+    : 'This creates heartbeat automations attached to the selected thread.'
+})
+const automationThreadTargetOptions = computed(() => {
+  const rows: Array<{ value: string; label: string; searchText: string }> = []
+  for (const group of props.groups) {
+    for (const thread of group.threads) {
+      const title = thread.title?.trim() || thread.id
+      const project = getProjectDisplayName(group.projectName)
+      rows.push({
+        value: thread.id,
+        label: `${title} · ${project}`,
+        searchText: `${title} ${project} ${thread.id}`.toLowerCase(),
+      })
+    }
+  }
+  return rows
+})
+const automationProjectTargetOptions = computed(() => {
+  const rows: Array<{ value: string; label: string; searchText: string }> = []
+  for (const group of props.groups) {
+    const cwd = getProjectAutomationKey(group.projectName)
+    if (!cwd) continue
+    const label = getProjectDisplayName(group.projectName)
+    rows.push({
+      value: cwd,
+      label,
+      searchText: `${label} ${cwd}`.toLowerCase(),
+    })
+  }
+  return rows
+})
+const filteredAutomationTargetOptions = computed(() => {
+  const query = automationTargetSearch.value.trim().toLowerCase()
+  const source = automationTargetMode.value === 'project'
+    ? automationProjectTargetOptions.value
+    : automationThreadTargetOptions.value
+  return query ? source.filter((option) => option.searchText.includes(query)) : source
+})
+watch(filteredAutomationTargetOptions, (options) => {
+  if (!automationTargetPickerVisible.value || automationTargetMode.value === 'new-chat') return
+  if (options.some((option) => option.value === automationTargetValue.value)) return
+  automationTargetValue.value = options[0]?.value ?? ''
+})
 const groupsContainerRef = ref<HTMLElement | null>(null)
 const pendingProjectDrag = ref<PendingProjectDrag | null>(null)
 const activeProjectDrag = ref<ActiveProjectDrag | null>(null)
@@ -1737,6 +1838,7 @@ function openAutomationDialog(threadId: string): void {
   automationDialogScope.value = 'thread'
   automationDialogThreadId.value = threadId
   automationDialogProjectName.value = ''
+  automationTargetPickerVisible.value = false
   automationDialogError.value = ''
   automationDialogNotice.value = ''
   const existing = automationByThreadId.value[threadId]?.[0]
@@ -1755,6 +1857,7 @@ function openProjectAutomationDialog(projectName: string): void {
     automationDialogScope.value = 'project'
     automationDialogThreadId.value = ''
     automationDialogProjectName.value = ''
+    automationTargetPickerVisible.value = false
     automationDialogError.value = 'Project automation requires a resolved absolute project path.'
     automationDialogNotice.value = ''
     automationDialogVisible.value = true
@@ -1764,6 +1867,7 @@ function openProjectAutomationDialog(projectName: string): void {
   automationDialogScope.value = 'project'
   automationDialogThreadId.value = ''
   automationDialogProjectName.value = projectCwd
+  automationTargetPickerVisible.value = false
   automationDialogError.value = ''
   automationDialogNotice.value = ''
   const existing = automationByProjectName.value[projectCwd]?.[0]
@@ -1784,6 +1888,7 @@ function openAutomationEditorFromPanel(payload: {
   automationDialogScope.value = payload.scope
   automationDialogThreadId.value = payload.scope === 'thread' ? payload.target : ''
   automationDialogProjectName.value = payload.scope === 'project' ? payload.target : ''
+  automationTargetPickerVisible.value = false
   automationDialogError.value = ''
   automationDialogNotice.value = ''
   if (payload.scope === 'project') {
@@ -1797,13 +1902,14 @@ function openAutomationEditorFromPanel(payload: {
   closeThreadMenu()
 }
 
-function openAutomationCreatorFromPanel(payload: {
-  scope: 'thread' | 'project'
-  target: string
-}): void {
-  automationDialogScope.value = payload.scope
-  automationDialogThreadId.value = payload.scope === 'thread' ? payload.target : ''
-  automationDialogProjectName.value = payload.scope === 'project' ? payload.target : ''
+function openAutomationCreatorFromPanel(): void {
+  automationTargetPickerVisible.value = true
+  automationTargetMode.value = 'new-chat'
+  automationTargetSearch.value = ''
+  automationTargetValue.value = ''
+  automationDialogScope.value = 'thread'
+  automationDialogThreadId.value = ''
+  automationDialogProjectName.value = ''
   automationDialogError.value = ''
   automationDialogNotice.value = ''
   startNewAutomationDraft()
@@ -1812,6 +1918,18 @@ function openAutomationCreatorFromPanel(payload: {
   closeThreadMenu()
 }
 
+function setAutomationTargetMode(mode: AutomationTargetMode): void {
+  automationTargetMode.value = mode
+  automationTargetSearch.value = ''
+  automationTargetValue.value = ''
+  automationDialogScope.value = mode === 'project' ? 'project' : 'thread'
+  if (mode === 'thread') {
+    automationTargetValue.value = filteredAutomationTargetOptions.value[0]?.value ?? ''
+  } else if (mode === 'project') {
+    automationTargetValue.value = filteredAutomationTargetOptions.value[0]?.value ?? ''
+  }
+}
+
 function startNewAutomationDraft(): void {
   automationDialogAutomationId.value = ''
   automationDialogMode.value = 'create'
@@ -1913,15 +2031,42 @@ function removeAutomationForProject(
 }
 
 async function submitAutomationDialog(): Promise<void> {
-  const threadId = automationDialogThreadId.value
-  const projectName = automationDialogProjectName.value
-  if (automationDialogScope.value === 'thread' && !threadId) return
-  if (automationDialogScope.value === 'project' && !projectName) return
+  let threadId = automationDialogThreadId.value
+  let projectName = automationDialogProjectName.value
   isSavingAutomation.value = true
   automationDialogError.value = ''
   automationDialogNotice.value = ''
   try {
     syncAutomationRruleFromScheduleDraft()
+    if (automationTargetPickerVisible.value && automationDialogMode.value === 'create') {
+      if (automationTargetMode.value === 'new-chat') {
+        const directory = await createProjectlessThreadDirectory(automationDraft.value.name || automationDraft.value.prompt)
+        const thread = await startThread(directory.cwd)
+        threadId = thread.threadId
+        projectName = ''
+        automationDialogScope.value = 'thread'
+        automationDialogThreadId.value = threadId
+        automationDialogProjectName.value = ''
+      } else if (automationTargetMode.value === 'thread') {
+        threadId = automationTargetValue.value
+        projectName = ''
+        automationDialogScope.value = 'thread'
+        automationDialogThreadId.value = threadId
+        automationDialogProjectName.value = ''
+      } else {
+        projectName = automationTargetValue.value
+        threadId = ''
+        automationDialogScope.value = 'project'
+        automationDialogThreadId.value = ''
+        automationDialogProjectName.value = projectName
+      }
+    }
+    if (automationDialogScope.value === 'thread' && !threadId) {
+      throw new Error('Select a chat target for this automation')
+    }
+    if (automationDialogScope.value === 'project' && !projectName) {
+      throw new Error('Select a project target for this automation')
+    }
     const input = {
       id: automationDialogAutomationId.value || undefined,
       name: automationDraft.value.name,
@@ -3235,6 +3380,26 @@ onBeforeUnmount(() => {
   @apply mb-3 flex flex-col gap-1;
 }
 
+.automation-target-picker {
+  @apply mb-3 flex flex-col gap-2 rounded-lg border border-zinc-200 bg-zinc-50 p-2;
+}
+
+.automation-target-mode-group {
+  @apply grid grid-cols-3 gap-1 rounded-lg border border-zinc-200 bg-white p-1;
+}
+
+.automation-target-mode {
+  @apply rounded-md px-2 py-1.5 text-xs font-medium text-zinc-600 hover:bg-zinc-100;
+}
+
+.automation-target-mode.is-active {
+  @apply bg-zinc-900 text-white shadow-sm hover:bg-zinc-900;
+}
+
+.automation-target-dropdown {
+  @apply flex flex-col gap-2;
+}
+
 .automation-thread-list {
   @apply mb-3 flex max-h-40 flex-col gap-1 overflow-y-auto rounded-lg border border-zinc-200 bg-zinc-50 p-1;
 }
diff --git a/src/style.css b/src/style.css
index d32f83eda..1687d0fa3 100644
--- a/src/style.css
+++ b/src/style.css
@@ -465,6 +465,22 @@
   @apply border-zinc-600 bg-zinc-700 text-zinc-100;
 }
 
+:root.dark .automation-target-picker {
+  @apply border-zinc-700 bg-zinc-900;
+}
+
+:root.dark .automation-target-mode-group {
+  @apply border-zinc-700 bg-zinc-800;
+}
+
+:root.dark .automation-target-mode {
+  @apply text-zinc-400 hover:bg-zinc-700;
+}
+
+:root.dark .automation-target-mode.is-active {
+  @apply bg-zinc-200 text-zinc-900 hover:bg-zinc-200;
+}
+
 :root.dark .automation-thread-list {
   @apply border-zinc-700 bg-zinc-900;
 }
diff --git a/tests.md b/tests.md
index 43b018391..74ed5cc32 100644
--- a/tests.md
+++ b/tests.md
@@ -104,19 +104,23 @@ This file tracks manual regression and feature verification steps.
 4. Select a row and confirm the detail panel shows status, schedule, target, id, and prompt.
 5. Click the row `Edit` button and confirm the existing automation editor opens with the selected automation values prefilled.
 6. Close the editor, select the same automation again, then click the detail-panel `Edit` button and confirm the same editor opens.
-7. Click the toolbar `New automation` button and confirm the existing automation editor opens in create mode for the selected row's thread or project target.
-8. Save the new automation and confirm the Automations panel refreshes with the added row.
-9. Change the automation name or status, save, and confirm the Automations panel refreshes with the updated row.
-10. Refresh the panel and confirm the selected automation stays selected when it still exists.
-11. Open `#/automations?automationId=<existing-id>` directly and confirm that automation is selected.
-12. Create another active thread or project automation, refresh the Automations panel, and confirm the newly created active automation appears at the top of the active rows.
-13. Pause an automation and confirm it appears after active automations even if it was created more recently.
-14. Switch to dark theme and repeat steps 1-9.
+7. Click the toolbar `New automation` button and confirm the existing automation editor opens in create mode with `New chat` selected by default.
+8. Switch the target picker to `Existing chat`, search for a chat, and confirm the dropdown filters matching chats.
+9. Switch the target picker to `Project`, search for a project, and confirm the dropdown filters matching projects.
+10. Switch back to `New chat`, save the automation, and confirm a new chat is created with the heartbeat automation attached.
+11. Create another automation from the panel for an existing chat or project and confirm the Automations panel refreshes with the added row.
+12. Change the automation name or status, save, and confirm the Automations panel refreshes with the updated row.
+13. Refresh the panel and confirm the selected automation stays selected when it still exists.
+14. Open `#/automations?automationId=<existing-id>` directly and confirm that automation is selected.
+15. Create another active thread or project automation, refresh the Automations panel, and confirm the newly created active automation appears at the top of the active rows.
+16. Pause an automation and confirm it appears after active automations even if it was created more recently.
+17. Switch to dark theme and repeat steps 1-12.
 
 #### Expected Results
 - The panel combines heartbeat automations from `/codex-api/thread-automations` and project automations from `/codex-api/project-automations`.
 - Rows are sorted active first, then paused, with newest creation time first inside each status group, then newest update time, then automation name.
-- The toolbar `New automation` button creates a blank draft for the currently selected row's thread or project target using the same existing automation editor.
+- The toolbar `New automation` button creates a blank draft with a target picker that defaults to `New chat` and can search existing chats or projects.
+- Saving the default target creates a new chat and attaches the heartbeat automation to it.
 - Row and detail edit buttons open the same existing thread/project automation editor, and saved edits refresh the panel list.
 - Thread targets use known thread titles when available; project targets use known project labels when available.
 - Empty, loading, refresh, and error states remain readable in light and dark themes.