@tapthrough/expo 0.1.1 → 0.1.4

package/src/Feedback.tsx

@@ -24,6 +24,7 @@ import type { Annotation } from './core/annotations.js'
 import { defaultPosition, type Point } from './core/bubble.js'
 import { createDiagnostics, installDiagnostics } from './core/diagnostics.js'
 import {
+  buttonBadge,
   type Checklist,
   type ChecklistStep,
   failedStepBody,
@@ -35,7 +36,6 @@ import {
   type RecheckItem,
   requestFix,
   requestLaunch,
-  reviewBadge,
   sendCause,
   sendFeedback,
   sendRecheck,
@@ -53,7 +53,9 @@ import {
   ideaAction,
   ideasNeedingYou,
   isMoving,
+  newlyWaiting,
   type OpenPr,
+  replyToIdea,
   sendStaffReport,
   submitIdea,
 } from './core/ideas.js'
@@ -180,6 +182,10 @@ const IDEA_REFRESH_MS = 8_000
 
 /** Update groups the reviewer has already been told about, so the toast shows once. */
 const announcedBuilds = new Set<string>()
+/** Ideas (and which round of questions) the reviewer has already been told about. */
+const announcedIdeas = new Set<string>()
+
+type Toast = { kind: 'build'; build: NewerBuild } | { kind: 'idea'; idea: Idea }
 
 type Phase = 'idle' | 'loading' | 'open' | 'capturing' | 'composing'
 
@@ -223,7 +229,7 @@ export function ReportButton({
   const [name, setName] = useState(rememberedName)
   const [failing, setFailing] = useState<FailingStep | null>(null)
   const [screenshot, setScreenshot] = useState<Screenshot | null>(null)
-  const [toast, setToast] = useState<NewerBuild | null>(null)
+  const [toast, setToast] = useState<Toast | null>(null)
   const [ideas, setIdeas] = useState<Idea[]>([])
   const [ideaBusy, setIdeaBusy] = useState<string | null>(null)
   const [pulls, setPulls] = useState<OpenPr[] | null>(null)
@@ -262,10 +268,14 @@ export function ReportButton({
     ])
     if (list) setChecklist(list)
     setIdeas(recent)
+    const waiting = newlyWaiting(recent, announcedIdeas)
     const newer = list?.newerBuild
     if (newer && !announcedBuilds.has(newer.updateGroupId)) {
       announcedBuilds.add(newer.updateGroupId)
-      setToast(newer)
+      setToast({ kind: 'build', build: newer })
+    } else if (waiting) {
+      haptics.light()
+      setToast({ kind: 'idea', idea: waiting })
     }
     return list
   }
@@ -473,6 +483,15 @@ export function ReportButton({
     }
   }
 
+  /** From the idea banner: open the popover on that idea. */
+  function openIdea(id: string) {
+    setToast(null)
+    dismissKeyboard()
+    go({ view: 'idea', id })
+    setPhase('open')
+    void refresh()
+  }
+
   function close() {
     setPhase('idle')
     setFull(false)
@@ -532,6 +551,24 @@ export function ReportButton({
     replaceIdea(result.idea)
   }
 
+  async function reply(id: string, text: string) {
+    if (!caller || !platform) return
+    rememberName()
+    setIdeaBusy(id)
+    const result = await replyToIdea(
+      { caller, platform, id, reply: text, ...(rememberedName ? { by: rememberedName } : {}) },
+      { apiUrl },
+    )
+    setIdeaBusy(null)
+    if (!result.ok) {
+      haptics.warning()
+      setError(result.message)
+      return
+    }
+    haptics.success()
+    replaceIdea(result.idea)
+  }
+
   async function act(id: string, action: 'build' | 'retry' | 'approve') {
     if (!caller || !platform) return
     rememberName()
@@ -600,7 +637,11 @@ export function ReportButton({
   return (
     <Overlay>
       {toast && phase !== 'open' && phase !== 'composing' && phase !== 'capturing' ? (
-        <NewBuildToast build={toast} onPress={toggle} />
+        toast.kind === 'build' ? (
+          <NewBuildToast build={toast.build} onPress={toggle} />
+        ) : (
+          <IdeaToast idea={toast.idea} onPress={() => openIdea(toast.idea.id)} />
+        )
       ) : null}
       {phase === 'open' && checklist ? (
         <ReviewPopover
@@ -637,6 +678,7 @@ export function ReportButton({
           ideas={ideas}
           onShareIdea={() => void startReport(null, 'idea')}
           onAnswerIdea={(id, answers) => void answer(id, answers)}
+          onReplyIdea={(id, text) => void reply(id, text)}
           onIdeaAction={(id, action) => void act(id, action)}
           ideaBusy={ideaBusy}
           pulls={pulls}
@@ -653,7 +695,7 @@ export function ReportButton({
       {showButton ? (
         <Bubble
           onPress={toggle}
-          badge={reviewBadge(checklist) ?? (ideasNeedingYou(ideas) ? { kind: 'idea' } : null)}
+          badge={buttonBadge(checklist, ideasNeedingYou(ideas))}
           busy={phase === 'loading'}
           active={phase === 'open'}
           onRest={setAnchor}
@@ -915,6 +957,38 @@ function NewBuildToast({ build, onPress }: { build: NewerBuild; onPress: () => v
   )
 }
 
+/** "Claude has 3 questions" for a moment at the top; the bubble's count stays after. */
+function IdeaToast({ idea, onPress }: { idea: Idea; onPress: () => void }) {
+  const colors = useColors()
+  const name = idea.title ?? idea.body.split(/\r?\n/)[0] ?? ''
+  return (
+    <View style={styles.toastWrap} pointerEvents="box-none">
+      <Pressable
+        onPress={onPress}
+        style={({ pressed }) => [pressed && styles.pressed]}
+        accessibilityRole="button"
+        accessibilityLiveRegion="polite"
+        accessibilityLabel={`${idea.statusLine}: ${name}. View`}
+      >
+        <Surface radius={24} style={[styles.toast, styles.ideaToast]}>
+          <View style={[styles.toastDot, { backgroundColor: COLORS.idea }]} />
+          <View style={styles.toastText}>
+            <Text style={[text.subhead, styles.strong, { color: colors.label }]} numberOfLines={1}>
+              {idea.statusLine}
+            </Text>
+            {name ? (
+              <Text style={[text.footnote, { color: colors.secondary }]} numberOfLines={1}>
+                {name}
+              </Text>
+            ) : null}
+          </View>
+          <Text style={[text.subhead, styles.strong, { color: colors.tint }]}>View</Text>
+        </Surface>
+      </Pressable>
+    </View>
+  )
+}
+
 type Status =
   | { kind: 'editing' }
   | { kind: 'sending' }
@@ -1736,4 +1810,6 @@ const styles = StyleSheet.create({
     paddingHorizontal: 18,
   },
   toastDot: { width: 8, height: 8, borderRadius: 4 },
+  ideaToast: { maxWidth: 360, marginHorizontal: 16 },
+  toastText: { flexShrink: 1 },
 })

package/src/Popover.tsx

@@ -91,6 +91,7 @@ export interface ReviewPopoverProps {
   ideas: Idea[]
   onShareIdea: () => void
   onAnswerIdea: (id: string, answers: string[]) => void
+  onReplyIdea: (id: string, reply: string) => void
   onIdeaAction: (id: string, action: 'build' | 'retry' | 'approve') => void
   /** The idea whose request is in flight, to show a spinner on its button. */
   ideaBusy: string | null
@@ -320,8 +321,13 @@ function listView(p: ReviewPopoverProps, colors: Colors): Screen {
     recheck.length ? `${recheck.length} to re-check` : null,
   ].filter(Boolean)
   return {
-    title: p.staff ? 'Feedback' : `PR #${checklist.pr}`,
-    subtitle: p.staff ?? (counts.join(' · ') || 'Nothing planned for this PR'),
+    // Say plainly which build this is: a PR's code, or the installed staging/TestFlight build.
+    title: p.staff ?? `PR #${checklist.pr}`,
+    subtitle: p.staff
+      ? 'Not a PR build · send feedback and ideas'
+      : [checklist.sha ? checklist.sha.slice(0, 7) : null, counts.join(' · ') || 'Nothing planned']
+          .filter(Boolean)
+          .join(' · '),
     body: (
       <>
         {checklist.newerBuild ? <NewerRow build={checklist.newerBuild} colors={colors} /> : null}
@@ -460,6 +466,15 @@ function ideaView(p: ReviewPopoverProps, idea: Idea, colors: Colors): Screen {
     footer = (
       <Capsule title="Build It" busy={busy} onPress={() => p.onIdeaAction(idea.id, 'build')} />
     )
+  } else if (idea.actions.includes('approve') && p.staff) {
+    // A staging or TestFlight build can't load a PR's code; that takes the development build.
+    footer = idea.previewUrl ? (
+      <Capsule
+        title={`Open PR #${idea.prNumber} Page`}
+        kind="plain"
+        onPress={() => Linking.openURL(idea.previewUrl as string)}
+      />
+    ) : null
   } else if (idea.actions.includes('approve')) {
     footer = here ? (
       <Capsule title="Approve" busy={busy} onPress={() => p.onIdeaAction(idea.id, 'approve')} />
@@ -533,7 +548,15 @@ function ideaView(p: ReviewPopoverProps, idea: Idea, colors: Colors): Screen {
             colors={colors}
           />
         ) : null}
-        {idea.steps.length && idea.status !== 'needs_answers' ? (
+        {idea.actions.includes('reply') ? (
+          <IdeaReply
+            key={idea.id}
+            busy={busy}
+            onSend={(reply) => p.onReplyIdea(idea.id, reply)}
+            colors={colors}
+          />
+        ) : null}
+        {idea.steps.length && idea.status !== 'needs_answers' && idea.status !== 'declined' ? (
           <Section title="How to test it" colors={colors}>
             <Numbered
               items={idea.steps.map((s) => ({ title: s.action, detail: s.expect }))}
@@ -543,9 +566,11 @@ function ideaView(p: ReviewPopoverProps, idea: Idea, colors: Colors): Screen {
         ) : null}
         {idea.actions.includes('approve') ? (
           <Text style={[text.footnote, { color: colors.secondary }]}>
-            {here
-              ? 'You’re on this idea’s build. Try the steps; if it’s right, approve it.'
-              : 'Open its build, try the steps, then approve it from there.'}
+            {p.staff
+              ? `You’re on ${p.staff}, not a PR build, so PR #${idea.prNumber} can’t open here. Open it on a phone with the development build, or in a simulator from the PR’s page. Approve it from there.`
+              : here
+                ? 'You’re on this idea’s build. Try the steps; if it’s right, approve it.'
+                : 'Open its build, try the steps, then approve it from there.'}
           </Text>
         ) : null}
         <LinkRow
@@ -715,6 +740,51 @@ function IdeaAnswers({
   )
 }
 
+/** After Claude stopped: one field to say how to go on, e.g. a smaller first version. */
+function IdeaReply({
+  busy,
+  onSend,
+  colors,
+}: {
+  busy: boolean
+  onSend: (reply: string) => void
+  colors: Colors
+}) {
+  const [reply, setReply] = useState('')
+  return (
+    <View style={styles.sectionBlock}>
+      <View style={styles.question}>
+        <Text style={[text.subhead, styles.rowTitle, { color: colors.label }]}>
+          Tell Claude how to go on
+        </Text>
+        <Text style={[text.footnote, { color: colors.secondary }]}>
+          For example, a smaller first version it can build now. Claude writes it up again for you
+          to check before building.
+        </Text>
+        <TextInput
+          value={reply}
+          onChangeText={setReply}
+          placeholder="Your reply"
+          placeholderTextColor={colors.secondary}
+          multiline
+          style={[
+            text.subhead,
+            styles.nameInput,
+            { color: colors.label, backgroundColor: colors.fill },
+          ]}
+          accessibilityLabel="Tell Claude how to go on"
+        />
+      </View>
+      <Capsule
+        title="Send to Claude"
+        busy={busy}
+        disabled={reply.trim() === ''}
+        onPress={() => onSend(reply.trim())}
+      />
+    </View>
+  )
+}
+
 function prsView(p: ReviewPopoverProps, colors: Colors): Screen {
   const { pulls } = p
   return {

package/src/core/feedback.ts

@@ -292,8 +292,8 @@ export type Badge =
   | { kind: 'failed' }
   | { kind: 'remaining'; count: number }
   | { kind: 'done' }
-  /** Nothing to check here, but an idea waits on someone: questions, or a build to test. */
-  | { kind: 'idea' }
+  /** Ideas waiting on someone: questions to answer, or a build to test. */
+  | { kind: 'idea'; count: number }
 
 /** What the floating Review button shows: a new build wins, then failures, then steps left. */
 export function reviewBadge(checklist: Checklist | null): Badge | null {
@@ -306,6 +306,17 @@ export function reviewBadge(checklist: Checklist | null): Badge | null {
   return count === 0 ? { kind: 'done' } : { kind: 'remaining', count }
 }
 
+/**
+ * The button's badge with ideas counted in. An idea waiting on someone blocks
+ * Claude, so it outranks steps left; only a new build or a failed step wins.
+ */
+export function buttonBadge(checklist: Checklist | null, ideasWaiting: number): Badge | null {
+  const review = reviewBadge(checklist)
+  if (review?.kind === 'new-build' || review?.kind === 'failed') return review
+  if (ideasWaiting > 0) return { kind: 'idea', count: ideasWaiting }
+  return review
+}
+
 /** Marks an earlier report fixed or still broken on this build. Never throws. */
 export async function sendRecheck(
   input: {

package/src/core/ideas.ts

@@ -15,7 +15,7 @@ export type IdeaStatus =
   | 'failed'
   | 'not_set_up'
 
-export type IdeaAction = 'answer' | 'build' | 'approve' | 'retry'
+export type IdeaAction = 'answer' | 'build' | 'approve' | 'retry' | 'reply'
 
 /** One step from sent to merged: done, in progress, not reached yet, or where it stopped. */
 export interface IdeaStage {
@@ -226,6 +226,26 @@ export function answerIdea(
   )
 }
 
+/** After Claude stopped: tell it how to go on, and it writes the idea up again. Never throws. */
+export function replyToIdea(
+  input: { caller: Caller; platform: Platform; id: string; reply: string; by?: string },
+  options: Options,
+) {
+  return call(
+    options,
+    `/api/v1/ideas/${encodeURIComponent(input.id)}/reply`,
+    {
+      method: 'POST',
+      body: {
+        ...credential(input.caller, input.platform),
+        reply: input.reply,
+        ...(input.by ? { by: input.by } : {}),
+      },
+    },
+    pickIdea,
+  )
+}
+
 /** Build It, Retry or Approve on one idea. Never throws. */
 export function ideaAction(
   input: {
@@ -259,10 +279,28 @@ export function ideaAction(
   )
 }
 
+const WAITING: IdeaStatus[] = ['needs_answers', 'ready_to_test']
+
 /** Ideas waiting on a person: questions to answer, or a build to test. */
 export function ideasNeedingYou(ideas: Idea[]): number {
-  return ideas.filter((idea) => idea.status === 'needs_answers' || idea.status === 'ready_to_test')
-    .length
+  return ideas.filter((idea) => WAITING.includes(idea.status)).length
+}
+
+/**
+ * The first idea that started waiting on someone since we last looked, to
+ * announce once. `seen` holds `id:status` pairs already announced; it's
+ * updated in place, so a new round of questions announces again.
+ */
+export function newlyWaiting(ideas: Idea[], seen: Set<string>): Idea | null {
+  let first: Idea | null = null
+  for (const idea of ideas) {
+    if (!WAITING.includes(idea.status)) continue
+    const key = `${idea.id}:${idea.status}:${idea.questions.join('\n')}`
+    if (seen.has(key)) continue
+    seen.add(key)
+    first ??= idea
+  }
+  return first
 }
 
 /** What Approve did, in plain words. */