@cat-factory/app 0.74.1 → 0.74.3

package/app/components/tasks/ContextIssuePicker.vue

@@ -18,20 +18,46 @@ const props = defineProps<{
    * in-repo and a pasted URL / bare issue number resolves to the exact issue.
    */
   scopeBlockId?: string
+  /**
+   * Controlled source: when provided the parent owns the selected tracker (via
+   * `v-model:source`); omitted, the picker manages it internally (the add-task case).
+   */
+  source?: TaskSourceKind
+  /**
+   * Always render the source selector, even with a single offered tracker — so the
+   * user can see *which* tracker is being searched (the "create task from issue"
+   * surface, where the source is otherwise invisible). Off by default: the inline
+   * add-task picker stays compact and only shows a selector when there's a choice.
+   */
+  alwaysShowSource?: boolean
+}>()
+const emit = defineEmits<{
+  pick: [item: PendingContext]
+  'update:source': [value: TaskSourceKind]
 }>()
-const emit = defineEmits<{ pick: [item: PendingContext] }>()
 
 const { t } = useI18n()
 const tasks = useTasksStore()
 
 const chosen = computed(() => new Set(props.chosenKeys ?? []))
 
-// Source: default to the first offered tracker; a selector appears only when more
-// than one is offered (the common case is a single source).
-const source = ref<TaskSourceKind | undefined>(tasks.offeredSources[0]?.source)
+// Source: default to the first offered tracker. Controlled when the parent passes
+// `source` (write-through to `update:source`), else internal. A selector appears when
+// more than one source is offered, or whenever the parent asks (`alwaysShowSource`).
+const internalSource = ref<TaskSourceKind | undefined>(tasks.offeredSources[0]?.source)
+const source = computed<TaskSourceKind | undefined>({
+  get: () => props.source ?? internalSource.value,
+  set: (v) => {
+    internalSource.value = v
+    if (v) emit('update:source', v)
+  },
+})
 const sourceItems = computed(() =>
   tasks.offeredSources.map((s) => ({ label: s.label, value: s.source })),
 )
+const showSourceSelect = computed(
+  () => sourceItems.value.length > 1 || (props.alwaysShowSource && sourceItems.value.length > 0),
+)
 const descriptor = computed(() => (source.value ? tasks.descriptorFor(source.value) : undefined))
 const searchable = computed(() => descriptor.value?.searchable ?? false)
 
@@ -40,10 +66,32 @@ const results = ref<TaskSearchResult[]>([])
 const searching = ref(false)
 const searchError = ref<string | null>(null)
 
+// Already-imported issues, scoped to the target container's repo on the backend
+// (GitHub narrows to the service's linked repo, exactly as search does; repo-less
+// sources are unaffected). Held locally rather than read from the shared workspace
+// list, so a task created for one service never offers issues from sibling repos.
+const imported = ref<SourceTask[]>([])
+async function reloadImported() {
+  try {
+    imported.value = await tasks.listTasksForBlock(props.scopeBlockId)
+  } catch {
+    imported.value = []
+  }
+}
+// Re-scope when the target container changes (its repo, hence the in-repo issues, differ).
+watch(
+  () => props.scopeBlockId,
+  () => {
+    reloadImported()
+  },
+)
+
 // Debounced search: free text hits the tracker; a query that's clearly a URL/key
 // is left to the explicit "by reference" row below (search won't surface it).
+// Re-scope when `scopeBlockId` changes too (a GitHub search is scoped to the block's
+// repo, so switching the target container re-runs against the new repo).
 let timer: ReturnType<typeof setTimeout> | undefined
-watch([query, source], () => {
+watch([query, source, () => props.scopeBlockId], () => {
   if (timer) clearTimeout(timer)
   results.value = []
   searchError.value = null
@@ -80,7 +128,7 @@ function keyFor(externalId: string): string {
 const importedRows = computed(() => {
   if (!source.value) return []
   const q = query.value.trim().toLowerCase()
-  return tasks.tasks
+  return imported.value
     .filter((t) => t.source === source.value)
     .filter((t) => !chosen.value.has(keyFor(t.externalId)))
     .filter(
@@ -92,7 +140,7 @@ const importedRows = computed(() => {
 const searchRows = computed(() => {
   if (!source.value) return []
   const importedIds = new Set(
-    tasks.tasks.filter((t) => t.source === source.value).map((t) => t.externalId),
+    imported.value.filter((t) => t.source === source.value).map((t) => t.externalId),
   )
   return results.value
     .filter((r) => !importedIds.has(r.externalId))
@@ -108,8 +156,10 @@ const refRow = computed(() => {
     searchRows.value.some((r) => r.externalId === q) ||
     chosen.value.has(keyFor(q))
   if (known) return null
-  // Only worth offering when it looks like a reference, not a search phrase.
-  const looksLikeRef = q.includes('#') || q.includes('/') || /^https?:\/\//i.test(q)
+  // Only worth offering when it looks like a reference, not a search phrase: a URL,
+  // an owner/repo#n or #n GitHub ref, or a Jira/Linear-style key (PROJ-123, ENG-42).
+  const looksLikeRef =
+    q.includes('#') || q.includes('/') || /^https?:\/\//i.test(q) || /^[a-z][a-z0-9]*-\d+$/i.test(q)
   return looksLikeRef ? q : null
 })
 
@@ -165,15 +215,15 @@ function pickRef(q: string) {
 }
 
 onMounted(() => {
-  // Keep the quick-pick list current (cheap; the store dedupes).
-  tasks.loadTasks().catch(() => {})
+  // Load the quick-pick list, scoped to the target container's repo.
+  reloadImported()
 })
 </script>
 
 <template>
   <div class="space-y-2 rounded-lg border border-slate-800 bg-slate-900/40 p-2">
     <USelect
-      v-if="sourceItems.length > 1"
+      v-if="showSourceSelect"
       v-model="source"
       :items="sourceItems"
       size="xs"

package/app/components/tasks/TaskImportModal.vue

@@ -1,13 +1,14 @@
 <script setup lang="ts">
-// Import an issue from a connected task source (by key or URL). An imported issue
-// can be attached to an existing task for context from the inspector (see
-// TaskContextIssues.vue), or turned into a new board task here: pick a container
-// (service frame or module), then click a search hit to open the prefilled
-// add-task form (title seeded, issue staged as linked context) where the user
-// confirms the pipeline / presets before creating it. A separate icon button on
-// each row opens the issue on GitHub.
-import type { TaskSearchResult, TaskSourceKind } from '~/types/domain'
-import type { AddTaskPrefill } from '~/stores/ui'
+// Create a board task from a connected tracker's issue. Pick a container (service
+// frame or module), then use the inline picker below to find an issue (search by
+// title, pick an already-imported one, or paste a URL/key) — choosing one opens the
+// prefilled add-task form (title seeded, issue staged as linked context) where the
+// user confirms the pipeline / presets before it's created. This is the same picker
+// the add-task form uses for "context issues", so the two behave identically. A
+// pasted parent/epic reference can instead be spawned as a whole linked task group.
+import type { TaskSourceKind } from '~/types/domain'
+import type { PendingContext } from '~/composables/useContextLinking'
+import ContextIssuePicker from '~/components/tasks/ContextIssuePicker.vue'
 import IntegrationBackTitle from '~/components/layout/IntegrationBackTitle.vue'
 
 const { t } = useI18n()
@@ -24,6 +25,9 @@ const open = computed({
 })
 const back = useIntegrationBack(open)
 
+// The tracker being browsed. Owned here (not the picker) so the epic action and the
+// ref-input placeholder share the same selected source; passed to the picker via
+// `v-model:source` with `always-show-source` so it's always visible + selectable.
 const source = ref<TaskSourceKind | undefined>(undefined)
 const ref_ = ref('')
 const importing = ref(false)
@@ -34,60 +38,11 @@ const title = computed(() =>
   ui.taskImport?.containerId ? t('tasks.import.titleCreate') : t('tasks.import.titleBrowse'),
 )
 
-const sourceItems = computed(() =>
-  tasks.offeredSources.map((s) => ({ label: s.label, value: s.source })),
-)
 const descriptor = computed(() => (source.value ? tasks.descriptorFor(source.value) : undefined))
-const searchable = computed(() => descriptor.value?.searchable ?? false)
 
-// The container (service frame or module) a new task is created in. Also the repo
-// scope for the issue search — declared up here so the search watch can read it.
+// The container (service frame or module) a new task is created in.
 const containerId = ref<string | undefined>(undefined)
 
-// Browse the tracker by free text so an issue can be turned into a task without
-// knowing its key. Debounced; a created/imported hit also lands in the list below.
-const searchQuery = ref('')
-const searchResults = ref<TaskSearchResult[]>([])
-const searching = ref(false)
-const searchError = ref<string | null>(null)
-
-let searchTimer: ReturnType<typeof setTimeout> | undefined
-// Re-run when the chosen container changes too: a GitHub search is scoped to the
-// selected service's repo, so switching containers re-scopes the results.
-watch([searchQuery, source, () => containerId.value], () => {
-  if (searchTimer) clearTimeout(searchTimer)
-  searchResults.value = []
-  searchError.value = null
-  const q = searchQuery.value.trim()
-  if (!q || !searchable.value) return
-  searchTimer = setTimeout(runSearch, 300)
-})
-
-async function runSearch() {
-  const q = searchQuery.value.trim()
-  if (!q || !source.value) return
-  searching.value = true
-  searchError.value = null
-  try {
-    // Scope to the selected container's repo so hits stay in-repo and a pasted
-    // URL / bare issue number resolves to the exact issue.
-    searchResults.value = await tasks.search(source.value, q, containerId.value)
-  } catch (e) {
-    searchResults.value = []
-    searchError.value = e instanceof Error ? e.message : String(e)
-  } finally {
-    searching.value = false
-  }
-}
-
-// Search hits not yet imported (imported ones already render in the list below).
-const importedIds = computed(
-  () => new Set(tasks.tasks.filter((t) => t.source === source.value).map((t) => t.externalId)),
-)
-const freshHits = computed(() =>
-  searchResults.value.filter((r) => !importedIds.value.has(r.externalId)),
-)
-
 // Containers a new task can be created in: every service frame and module on the
 // board. Modules are labelled with their parent frame so the choice is unambiguous.
 const containerItems = computed(() =>
@@ -104,69 +59,28 @@ const containerItems = computed(() =>
 watch(open, (isOpen) => {
   if (isOpen) {
     ref_.value = ''
-    searchQuery.value = ''
-    searchResults.value = []
-    searchError.value = null
     source.value = ui.taskImport?.source ?? tasks.offeredSources[0]?.source ?? undefined
-    // Opened from a service frame → preselect it as the create-in target (and the
-    // search's repo scope); otherwise fall back to the first container on the board.
+    // Opened from a service frame → preselect it as the create-in target; otherwise
+    // fall back to the first container on the board.
     containerId.value = ui.taskImport?.containerId ?? containerItems.value[0]?.value
     tasks.loadTasks().catch(() => {})
   }
 })
 
-// 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. 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; description?: string },
-  needsImport: boolean,
-) {
-  if (!source.value || !containerId.value) return
-  const prefill: AddTaskPrefill = {
-    title: issue.title,
-    context: [
-      {
-        kind: 'task',
-        source: source.value,
-        externalId: issue.externalId,
-        title: `${issue.externalId} · ${issue.title}`,
-        subtitle: issue.status || undefined,
-        icon: descriptor.value?.icon,
-        description: issue.description || undefined,
-        needsImport,
-      },
-    ],
-  }
+// Choosing an issue in the picker 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. A search hit / pasted ref carries `needsImport`, so the add-task form
+// resolves its body (by importing) and folds it into the new task's description; an
+// already-imported issue carries its body directly.
+function createFromPick(item: PendingContext) {
+  if (!containerId.value) return
+  // The picker titles rows as "EXTERNALID · Title"; seed the task with the clean
+  // title. A pasted ref has no title (title === the raw ref), so leave it blank for
+  // the user to name in the form.
+  const seededTitle = item.title === item.externalId ? '' : item.title.replace(/^[^·]+·\s*/, '')
   ui.closeTaskImport()
-  ui.openAddTask(containerId.value, prefill)
-}
-
-async function doImport() {
-  const value = ref_.value.trim()
-  if (!value || !source.value) return
-  importing.value = true
-  try {
-    const task = await tasks.importTask(source.value, value)
-    ref_.value = ''
-    toast.add({
-      title: t('tasks.import.imported', { title: task.title }),
-      icon: 'i-lucide-file-down',
-    })
-  } catch (e) {
-    toast.add({
-      title: t('tasks.import.importFailed'),
-      description: e instanceof Error ? e.message : String(e),
-      icon: 'i-lucide-triangle-alert',
-      color: 'error',
-    })
-  } finally {
-    importing.value = false
-  }
+  ui.openAddTask(containerId.value, { title: seededTitle, context: [item] })
 }
 
 // Spawn the referenced issue as an EPIC: an epic node + a task per child issue (into the
@@ -227,54 +141,15 @@ async function doSpawnEpic() {
         </div>
       </div>
 
+      <!-- No service frame yet → nowhere to create a task. -->
+      <p v-else-if="!containerItems.length" class="text-center text-xs text-slate-500">
+        {{ t('tasks.import.needFrameFirst') }}
+      </p>
+
       <!-- Main form -->
       <div v-else class="space-y-4">
-        <UFormField v-if="sourceItems.length > 1" :label="t('tasks.import.source')">
-          <USelect v-model="source" :items="sourceItems" class="w-full" />
-        </UFormField>
-
-        <div class="flex items-end gap-2">
-          <UFormField :label="descriptor?.refLabel ?? t('tasks.import.refLabel')" class="flex-1">
-            <UInput
-              v-model="ref_"
-              :placeholder="descriptor?.refPlaceholder"
-              class="w-full"
-              @keydown.enter="doImport"
-            />
-          </UFormField>
-          <UButton
-            color="primary"
-            icon="i-lucide-file-down"
-            :loading="importing"
-            :disabled="!ref_.trim()"
-            @click="doImport"
-          >
-            {{ t('tasks.import.import') }}
-          </UButton>
-          <UButton
-            color="primary"
-            variant="soft"
-            icon="i-lucide-layers"
-            :loading="importing"
-            :disabled="!ref_.trim() || !containerId"
-            :title="
-              containerId
-                ? t('tasks.import.asEpicTitleReady')
-                : t('tasks.import.asEpicTitleNeedsContainer')
-            "
-            @click="doSpawnEpic"
-          >
-            {{ t('tasks.import.asEpic') }}
-          </UButton>
-        </div>
-
-        <!-- Container for epic children when spawning from a pasted ref (the shared
-             "Create tasks in" selector below covers the search-results case). -->
-        <UFormField
-          v-if="containerItems.length && !freshHits.length"
-          :label="t('tasks.import.epicChildrenContainer')"
-          class="w-72"
-        >
+        <!-- Where the new task lands (preselected when opened from a service frame). -->
+        <UFormField :label="t('tasks.import.createTasksIn')">
           <USelect
             v-model="containerId"
             :items="containerItems"
@@ -283,94 +158,52 @@ async function doSpawnEpic() {
           />
         </UFormField>
 
-        <!-- Browse: search the tracker by title so an issue can be turned into a
-             task without knowing its key. -->
-        <UFormField v-if="searchable" :label="t('tasks.import.searchIssues')">
-          <UInput
-            v-model="searchQuery"
-            :icon="searching ? 'i-lucide-loader-circle' : 'i-lucide-search'"
-            :ui="{ leadingIcon: searching ? 'animate-spin' : '' }"
-            :placeholder="t('tasks.import.searchPlaceholder')"
-            class="w-full"
+        <!-- Find an issue and create a task from it. Same picker the add-task form
+             uses for context issues: search by title, pick an already-imported one,
+             or paste a URL/key — choosing one opens the prefilled add-task form. The
+             search is scoped to the chosen container's repo (so a GitHub search stays
+             in that service's repo and a pasted URL / bare number resolves there), and
+             the source selector is always shown so it's clear which tracker is in use. -->
+        <UFormField :label="t('tasks.import.searchIssues')">
+          <ContextIssuePicker
+            v-model:source="source"
+            :scope-block-id="containerId"
+            always-show-source
+            @pick="createFromPick"
           />
         </UFormField>
 
-        <!-- Shared target container for every "Create task" action below. -->
-        <UFormField
-          v-if="containerItems.length && freshHits.length"
-          :label="t('tasks.import.createTasksIn')"
-          class="w-72"
-        >
-          <USelect
-            v-model="containerId"
-            :items="containerItems"
-            :placeholder="t('tasks.import.pickContainer')"
-            class="w-full"
-          />
-        </UFormField>
-        <p
-          v-else-if="!containerItems.length && freshHits.length"
-          class="text-[11px] text-slate-500"
-        >
-          {{ t('tasks.import.needFrameFirst') }}
-        </p>
-
-        <!-- Search results (not yet imported): click a hit to create a task from it
-             (opens the prefilled add-task form); the icon button views it on GitHub. -->
-        <div v-if="searchError" class="text-[11px] text-amber-400">
-          {{ t('tasks.import.searchFailed', { error: searchError }) }}
-        </div>
-        <div v-if="freshHits.length" class="space-y-2">
-          <h3 class="text-[11px] font-semibold uppercase tracking-wide text-slate-400">
-            {{ t('tasks.import.searchResults') }}
-          </h3>
-          <div
-            v-for="hit in freshHits"
-            :key="`hit:${hit.source}:${hit.externalId}`"
-            class="flex items-start justify-between gap-2 rounded-lg border border-slate-800 bg-slate-900/60 p-3 transition-colors hover:border-primary-500/60 hover:bg-slate-900"
-          >
-            <button
-              type="button"
-              class="min-w-0 flex-1 text-start disabled:cursor-not-allowed disabled:opacity-60"
-              :disabled="!containerId"
+        <!-- Secondary: spawn a parent/epic issue as a whole linked task group. -->
+        <div class="space-y-2 border-t border-slate-800 pt-3">
+          <span class="text-[11px] font-semibold uppercase tracking-wide text-slate-400">
+            {{ t('tasks.import.asEpic') }}
+          </span>
+          <div class="flex items-end gap-2">
+            <UFormField :label="descriptor?.refLabel ?? t('tasks.import.refLabel')" class="flex-1">
+              <UInput
+                v-model="ref_"
+                :placeholder="descriptor?.refPlaceholder"
+                class="w-full"
+                @keydown.enter="doSpawnEpic"
+              />
+            </UFormField>
+            <UButton
+              color="primary"
+              variant="soft"
+              icon="i-lucide-layers"
+              :loading="importing"
+              :disabled="!ref_.trim() || !containerId"
               :title="
                 containerId
-                  ? t('tasks.import.createFromIssue')
-                  : t('tasks.import.pickContainerFirst')
+                  ? t('tasks.import.asEpicTitleReady')
+                  : t('tasks.import.asEpicTitleNeedsContainer')
               "
-              @click="selectIssue(hit, true)"
+              @click="doSpawnEpic"
             >
-              <span class="block truncate text-sm font-medium text-white">
-                {{ hit.externalId }} · {{ hit.title }}
-              </span>
-              <span v-if="hit.excerpt" class="mt-0.5 line-clamp-2 block text-xs text-slate-500">
-                {{ hit.excerpt }}
-              </span>
-            </button>
-            <div class="flex shrink-0 items-center gap-2">
-              <UBadge v-if="hit.status" color="neutral" variant="soft" size="xs">
-                {{ hit.status }}
-              </UBadge>
-              <UButton
-                color="neutral"
-                variant="ghost"
-                size="xs"
-                icon="i-lucide-external-link"
-                :to="hit.url"
-                target="_blank"
-                rel="noopener"
-                :aria-label="t('tasks.import.viewOnGitHub', { id: hit.externalId })"
-              />
-            </div>
+              {{ t('tasks.import.asEpic') }}
+            </UButton>
           </div>
         </div>
-
-        <p
-          v-if="!freshHits.length && !searchQuery.trim()"
-          class="text-center text-xs text-slate-500"
-        >
-          {{ t('tasks.import.emptyHint') }}
-        </p>
       </div>
     </template>
   </UModal>

package/app/composables/api/tasks.ts

@@ -62,7 +62,11 @@ export function tasksApi({ send, ws }: ApiContext) {
     checkTaskSource: (workspaceId: string, source: TaskSourceKind) =>
       send(diagnoseTaskSourceContract, { pathPrefix: ws(workspaceId), pathParams: { source } }),
 
-    listTasks: (workspaceId: string) => send(listTasksContract, { pathPrefix: ws(workspaceId) }),
+    // `blockId` scopes the listed issues to that block's service repo for a
+    // repo-backed source (GitHub Issues), exactly as search does; omitted → the
+    // whole workspace.
+    listTasks: (workspaceId: string, blockId?: string) =>
+      send(listTasksContract, { pathPrefix: ws(workspaceId), queryParams: { blockId } }),
 
     importTask: (workspaceId: string, source: TaskSourceKind, body: { ref: string }) =>
       send(importTaskContract, { pathPrefix: ws(workspaceId), pathParams: { source }, body }),

package/app/stores/tasks.ts

@@ -119,6 +119,18 @@ export const useTasksStore = defineStore('tasks', () => {
     tasks.value = await api.listTasks(workspace.requireId())
   }
 
+  /**
+   * Fetch imported issues scoped to a block's service repo (GitHub only — a
+   * repo-backed source narrows to that service's linked repo, exactly as `search`
+   * does; repo-less sources are unaffected). Returns the list WITHOUT touching the
+   * shared `tasks` state, so a repo-scoped view (the issue picker) can hold its own
+   * list without narrowing the workspace-wide one other views rely on. Omit
+   * `blockId` for the whole workspace.
+   */
+  async function listTasksForBlock(blockId?: string): Promise<SourceTask[]> {
+    return api.listTasks(workspace.requireId(), blockId)
+  }
+
   /** Import (fetch + persist) an issue by key or URL from a source. */
   async function importTask(source: TaskSourceKind, ref: string): Promise<SourceTask> {
     loading.value = true
@@ -218,6 +230,7 @@ export const useTasksStore = defineStore('tasks', () => {
     disconnect,
     setEnabled,
     loadTasks,
+    listTasksForBlock,
     importTask,
     search,
     linkToBlock,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cat-factory/app",
-  "version": "0.74.1",
+  "version": "0.74.3",
   "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",
@@ -34,7 +34,7 @@
     "valibot": "^1.4.2",
     "vue": "^3.5.39",
     "wretch": "^3.0.9",
-    "@cat-factory/contracts": "0.81.1"
+    "@cat-factory/contracts": "0.81.2"
   },
   "devDependencies": {
     "@toad-contracts/testing": "0.3.2",