@cat-factory/app 0.22.0 → 0.23.1

package/app/components/board/AddTaskModal.vue

@@ -11,9 +11,10 @@
 // button is disabled with a hint. Linking needs the block id,
 // so chosen items are staged locally and import-and-linked once the task is created
 // (see useContextLinking) — the same context the agents see for every step of the run.
-import type { CreateTaskType, TaskTypeFields } from '~/types/domain'
+import type { CreateTaskType, TaskSourceKind, TaskTypeFields } from '~/types/domain'
 import ContextDocumentPicker from '~/components/documents/ContextDocumentPicker.vue'
 import ContextIssuePicker from '~/components/tasks/ContextIssuePicker.vue'
+import { mergePresetOptionLabel, mergePresetThresholds } from '~/utils/mergePreset'
 
 const ui = useUiStore()
 const board = useBoardStore()
@@ -104,13 +105,13 @@ const presetMenu = computed(() => [
   [
     {
       label: mergePresets.defaultPreset
-        ? `Default (${mergePresets.defaultPreset.name})`
+        ? `Default (${mergePresets.defaultPreset.name}) — ${mergePresetThresholds(mergePresets.defaultPreset)}`
         : 'Workspace default',
       icon: 'i-lucide-rotate-ccw',
       onSelect: () => (mergePresetId.value = ''),
     },
     ...mergePresets.presets.map((p) => ({
-      label: p.name,
+      label: mergePresetOptionLabel(p),
       icon: 'i-lucide-git-merge',
       onSelect: () => (mergePresetId.value = p.id),
     })),
@@ -119,10 +120,11 @@ const presetMenu = computed(() => [
 const selectedPresetLabel = computed(() => {
   if (!mergePresetId.value) {
     return mergePresets.defaultPreset
-      ? `Default (${mergePresets.defaultPreset.name})`
+      ? `Default (${mergePresets.defaultPreset.name}) — ${mergePresetThresholds(mergePresets.defaultPreset)}`
       : 'Workspace default'
   }
-  return mergePresets.presets.find((p) => p.id === mergePresetId.value)?.name ?? 'Workspace default'
+  const picked = mergePresets.presets.find((p) => p.id === mergePresetId.value)
+  return picked ? mergePresetOptionLabel(picked) : 'Workspace default'
 })
 
 // Model preset: which model each agent runs on. Empty = workspace default preset.
@@ -193,6 +195,61 @@ const issuesConnected = computed(() => tasks.available && tasks.anyOffered)
 const pendingDocs = computed(() => pendingContext.value.filter((c) => c.kind === 'document'))
 const pendingIssues = computed(() => pendingContext.value.filter((c) => c.kind === 'task'))
 
+// Linked issues whose body is in hand, surfaced read-only above the description so the
+// user SEES the original issue description is included in the task (and can add notes on
+// top). The bodies are folded into the saved description on submit (see `add`).
+const linkedIssueBodies = computed(() =>
+  pendingIssues.value
+    .filter((i) => (i.description ?? '').trim().length > 0)
+    .map((i) => ({ key: contextKey(i), title: i.title, body: (i.description ?? '').trim() })),
+)
+const hasLinkedIssueBody = computed(() => linkedIssueBodies.value.length > 0)
+// True while we're fetching a search-hit issue's body so the read-only preview can show
+// a placeholder instead of silently appearing late.
+const resolvingIssueBodies = ref(false)
+
+// A staged issue picked from search results carries no body yet (`needsImport`, and the
+// search result has no description). Resolve it once the form opens — from the local cache
+// when already imported, else by importing it (idempotent; we'd import on add anyway) — so
+// its description can be shown read-only and folded into the task. Best-effort: a failure
+// just leaves that issue without a preview, still linked on add.
+async function resolvePendingIssueBodies() {
+  const unresolved = pendingContext.value.filter(
+    (c) => c.kind === 'task' && !(c.description ?? '').trim(),
+  )
+  if (!unresolved.length) return
+  resolvingIssueBodies.value = true
+  try {
+    const resolved: Record<string, string> = {}
+    for (const item of unresolved) {
+      const source = item.source as TaskSourceKind
+      const cached = tasks.tasks.find(
+        (t) => t.source === source && t.externalId === item.externalId,
+      )
+      if ((cached?.description ?? '').trim()) {
+        resolved[contextKey(item)] = cached!.description
+        continue
+      }
+      if (!item.needsImport) continue
+      try {
+        const imported = await tasks.importTask(source, item.externalId)
+        if ((imported.description ?? '').trim()) resolved[contextKey(item)] = imported.description
+      } catch {
+        // Unreadable/forbidden issue — skip the preview; it still links on add.
+      }
+    }
+    if (Object.keys(resolved).length) {
+      // The issue is now imported, so it links directly on add (needsImport → false).
+      pendingContext.value = pendingContext.value.map((c) => {
+        const body = resolved[contextKey(c)]
+        return body ? { ...c, description: body, needsImport: false } : c
+      })
+    }
+  } finally {
+    resolvingIssueBodies.value = false
+  }
+}
+
 function addPending(item: PendingContext) {
   if (pendingContext.value.some((c) => contextKey(c) === contextKey(item))) return
   pendingContext.value = [...pendingContext.value, item]
@@ -241,6 +298,8 @@ watch(open, (isOpen) => {
   }
   documents.loadDocuments().catch(() => {})
   tasks.loadTasks().catch(() => {})
+  // Fetch any staged search-hit issue's body so its description shows read-only below.
+  resolvePendingIssueBodies().catch(() => {})
 })
 
 // A recurring task only needs a target frame (its details are filled in the schedule
@@ -264,21 +323,23 @@ async function add() {
   saving.value = true
   try {
     const typeFields = buildTypeFields()
-    const block = await board.addTask(
-      containerId,
-      title.value.trim(),
-      description.value.trim() || undefined,
-      {
-        taskType: taskType.value as CreateTaskType,
-        ...(typeFields ? { taskTypeFields: typeFields } : {}),
-        ...(mergePresetId.value ? { mergePresetId: mergePresetId.value } : {}),
-        ...(modelPresetId.value ? { modelPresetId: modelPresetId.value } : {}),
-        ...(pipelineId.value ? { pipelineId: pipelineId.value } : {}),
-        ...(Object.keys(agentConfigValues.value).length
-          ? { agentConfig: agentConfigValues.value }
-          : {}),
-      },
-    )
+    // The saved description includes each linked issue's body (shown read-only above)
+    // followed by the user's own notes, so the original issue description is part of the
+    // task — not only reachable via the context link.
+    const notes = description.value.trim()
+    const fullDescription =
+      [...linkedIssueBodies.value.map((b) => b.body), notes].filter(Boolean).join('\n\n') ||
+      undefined
+    const block = await board.addTask(containerId, title.value.trim(), fullDescription, {
+      taskType: taskType.value as CreateTaskType,
+      ...(typeFields ? { taskTypeFields: typeFields } : {}),
+      ...(mergePresetId.value ? { mergePresetId: mergePresetId.value } : {}),
+      ...(modelPresetId.value ? { modelPresetId: modelPresetId.value } : {}),
+      ...(pipelineId.value ? { pipelineId: pipelineId.value } : {}),
+      ...(Object.keys(agentConfigValues.value).length
+        ? { agentConfig: agentConfigValues.value }
+        : {}),
+    })
     if (block) {
       const failed = await linkPending(block.id, pendingContext.value)
       if (failed > 0) {
@@ -352,12 +413,37 @@ async function add() {
             />
           </UFormField>
 
-          <UFormField label="Description">
+          <!-- Linked issue description(s), read-only: shown so the user sees the original
+               issue description is included in the task. It's folded into the saved
+               description (before their notes) on add. -->
+          <UFormField
+            v-for="issue in linkedIssueBodies"
+            :key="issue.key"
+            :label="`${issue.title} (from issue, included)`"
+          >
+            <UTextarea
+              :model-value="issue.body"
+              :rows="4"
+              autoresize
+              readonly
+              class="w-full"
+              :ui="{ base: 'cursor-default text-slate-300' }"
+            />
+          </UFormField>
+          <p v-if="resolvingIssueBodies" class="text-[11px] text-slate-500">
+            Loading the linked issue's description…
+          </p>
+
+          <UFormField :label="hasLinkedIssueBody ? 'Additional notes' : 'Description'">
             <UTextarea
               v-model="description"
               :rows="4"
               autoresize
-              placeholder="Describe the work — context, acceptance criteria, anything the agent should know…"
+              :placeholder="
+                hasLinkedIssueBody
+                  ? 'Add anything else the agent should know — appended to the issue description above…'
+                  : 'Describe the work — context, acceptance criteria, anything the agent should know…'
+              "
               class="w-full"
             />
           </UFormField>

package/app/components/panels/inspector/TaskRunSettings.vue

@@ -2,6 +2,7 @@
 import { computed, onMounted } from 'vue'
 import type { Block } from '~/types/domain'
 import type { WritebackOverride } from '~/types/tracker'
+import { mergePresetOptionLabel, mergePresetThresholds } from '~/utils/mergePreset'
 
 const props = defineProps<{ block: Block }>()
 
@@ -61,13 +62,13 @@ const presetMenu = computed(() => [
   [
     {
       label: mergePresets.defaultPreset
-        ? `Default (${mergePresets.defaultPreset.name})`
+        ? `Default (${mergePresets.defaultPreset.name}) — ${mergePresetThresholds(mergePresets.defaultPreset)}`
         : 'Workspace default',
       icon: 'i-lucide-rotate-ccw',
       onSelect: () => setPreset(''),
     },
     ...mergePresets.presets.map((p) => ({
-      label: p.name,
+      label: mergePresetOptionLabel(p),
       icon: 'i-lucide-git-merge',
       onSelect: () => setPreset(p.id),
     })),

package/app/components/tasks/ContextIssuePicker.vue

@@ -6,7 +6,7 @@
 // It only *stages* a choice: the caller collects PendingContext items and links
 // them once the block exists (see useContextLinking). A search hit / pasted ref
 // carries `needsImport: true` so it's fetched + persisted before linking.
-import type { TaskSearchResult, TaskSourceKind } from '~/types/domain'
+import type { SourceTask, TaskSearchResult, TaskSourceKind } from '~/types/domain'
 
 const props = defineProps<{
   /** contextKeys already staged by the caller, so they're filtered out / not re-offered. */
@@ -120,15 +120,18 @@ const empty = computed(
     refRow.value === null,
 )
 
-function pickImported(externalId: string, title: string, status: string) {
+function pickImported(task: SourceTask) {
   if (!source.value) return
   emit('pick', {
     kind: 'task',
     source: source.value,
-    externalId,
-    title: `${externalId} · ${title}`,
-    subtitle: status || undefined,
+    externalId: task.externalId,
+    title: `${task.externalId} · ${task.title}`,
+    subtitle: task.status || undefined,
     icon: icon.value,
+    // Already imported, so its body is in hand — carry it so the add-task form can
+    // show it read-only and fold it into the new task's description.
+    description: task.description || undefined,
     needsImport: false,
   })
 }
@@ -200,7 +203,7 @@ onMounted(() => {
         :key="`imp:${t.externalId}`"
         type="button"
         class="flex w-full items-center gap-1.5 rounded-md px-2 py-1.5 text-left text-xs text-slate-300 hover:bg-slate-800/70"
-        @click="pickImported(t.externalId, t.title, t.status)"
+        @click="pickImported(t)"
       >
         <UIcon :name="icon" class="h-3.5 w-3.5 shrink-0 text-indigo-400" />
         <span class="truncate">{{ t.externalId }} · {{ t.title }}</span>

package/app/components/tasks/TaskImportModal.vue

@@ -118,10 +118,13 @@ watch(open, (isOpen) => {
 
 // Selecting an issue hands off to the add-task form, prefilled with the issue title
 // and the issue staged as linked context (so agents see its description + comments).
-// The user still confirms pipeline / preset there before the task is created — we do
-// NOT dump the issue body into the description; the link is enough.
+// The user still confirms pipeline / preset there before the task is created. The
+// issue body is carried when already in hand (imported issues); for a search hit it's
+// resolved in the add-task form (by importing). Either way the form shows it read-only
+// and folds it into the new task's description, so the original description is visible
+// and included — the user adds their own notes on top.
 function selectIssue(
-  issue: { externalId: string; title: string; status?: string },
+  issue: { externalId: string; title: string; status?: string; description?: string },
   needsImport: boolean,
 ) {
   if (!source.value || !containerId.value) return
@@ -135,6 +138,7 @@ function selectIssue(
         title: `${issue.externalId} · ${issue.title}`,
         subtitle: issue.status || undefined,
         icon: descriptor.value?.icon,
+        description: issue.description || undefined,
         needsImport,
       },
     ],

package/app/composables/useContextLinking.ts

@@ -19,6 +19,13 @@ export interface PendingContext {
   subtitle?: string
   /** Lucide icon for the row. */
   icon?: string
+  /**
+   * The item's body/description (Markdown), when known. Populated for an
+   * already-imported issue at pick time and resolved (by importing) for a search
+   * hit when the add-task form opens, so the form can surface it read-only and
+   * fold it into the new task's description. Absent until resolved.
+   */
+  description?: string
   /** True when the item must be imported before it can be linked. */
   needsImport: boolean
 }

package/app/utils/mergePreset.ts

@@ -0,0 +1,19 @@
+import type { MergeThresholdPreset } from '~/types/merge'
+
+/**
+ * A compact one-line summary of a merge preset's auto-merge ceilings + CI-fix budget,
+ * suitable for a dropdown option label so the user sees each preset's actual thresholds
+ * (not just its name) while choosing one. Percentages are the stored 0..1 ratios
+ * rendered as whole percents.
+ */
+export function mergePresetThresholds(p: MergeThresholdPreset): string {
+  const pct = (n: number) => `${Math.round(n * 100)}%`
+  return `cx ≤${pct(p.maxComplexity)} · risk ≤${pct(p.maxRisk)} · impact ≤${pct(
+    p.maxImpact,
+  )} · ${p.ciMaxAttempts} CI fixes`
+}
+
+/** The preset name followed by its thresholds, for a single-line dropdown option. */
+export function mergePresetOptionLabel(p: MergeThresholdPreset): string {
+  return `${p.name} — ${mergePresetThresholds(p)}`
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cat-factory/app",
-  "version": "0.22.0",
+  "version": "0.23.1",
   "description": "Reusable Nuxt layer for the Agent Architecture Board SPA (components, stores, composables, pages). Consume it from a thin deployment app via `extends: ['@cat-factory/app']` and point it at your backend with NUXT_PUBLIC_API_BASE. See deploy/frontend for an example.",
   "repository": {
     "type": "git",