store cleanup

.claude/hooks/pre-commit-check.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+INPUT=$(cat)
+COMMAND=$(echo "$INPUT" | jq -r '.tool_input.command')
+
+if echo "$COMMAND" | grep -qE "git commit"; then
+  REPO_ROOT=$(git -C "$(dirname "$0")" rev-parse --show-toplevel)
+
+  echo "Running yarn lint..." >&2
+  if ! (cd "$REPO_ROOT/shared" && yarn lint 2>&1); then
+    echo "Lint failed — commit blocked." >&2
+    exit 2
+  fi
+
+  echo "Running yarn tsc..." >&2
+  if ! (cd "$REPO_ROOT/shared" && yarn tsc 2>&1); then
+    echo "TypeScript check failed — commit blocked." >&2
+    exit 2
+  fi
+
+  echo "Pre-commit checks passed." >&2
+fi
+
+exit 0

.claude/settings.json

@@ -0,0 +1,34 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(yarn lint)",
+      "Bash(yarn lint-warn:*)",
+      "Bash(yarn prettier:*)",
+      "Bash(yarn build-*)",
+      "Bash(yarn package)",
+      "Bash(yarn start*)",
+      "Bash(yarn rn-gobuild*)",
+      "Bash(yarn rn-download-android*)",
+      "Bash(yarn tsc)",
+      "Bash(yarn tsc:*)",
+      "Bash(yarn pod*)",
+      "Bash(yarn coverage:*)",
+      "Bash(yarn maestro*)"
+    ]
+  },
+  "hooks": {
+    "PreToolUse": [
+      {
+        "matcher": "Bash",
+        "hooks": [
+          {
+            "type": "command",
+            "command": ".claude/hooks/pre-commit-check.sh",
+            "timeout": 120,
+            "statusMessage": "Running lint and tsc..."
+          }
+        ]
+      }
+    ]
+  }
+}

shared/chat/conversation/input-area/normal/index.tsx

@@ -151,9 +151,7 @@ const ConnectedPlatformInput = function ConnectedPlatformInput() {
     ? styles.suggestionOverlayInfoShowing
     : styles.suggestionOverlay
 
-  const allowExplodingModeRef = React.useRef(-1)
   const setExplodingMode = (mode: number) => {
-    allowExplodingModeRef.current = mode
     setExplodingModeRaw(mode, false)
   }
 
@@ -249,14 +247,8 @@ const ConnectedPlatformInput = function ConnectedPlatformInput() {
   }, [setInputRef])
 
   React.useEffect(() => {
-    if (explodingModeSeconds !== explodingModeSecondsRaw) {
-      // ignore if we have text unless we set it ourselves
-      if (!textValueRef.current || allowExplodingModeRef.current === explodingModeSecondsRaw) {
-        allowExplodingModeRef.current = -1
-        setExplodingModeSeconds(explodingModeSecondsRaw)
-      }
-    }
-  }, [explodingModeSeconds, explodingModeSecondsRaw])
+    setExplodingModeSeconds(explodingModeSecondsRaw)
+  }, [explodingModeSecondsRaw])
 
   return (
     <PlatformInput

shared/constants/init/shared.tsx

@@ -771,6 +771,8 @@ export const _onEngineIncoming = (action: EngineGen.Actions) => {
       {
         const {useTeamsState} = require('@/stores/teams') as typeof UseTeamsStateType
         useTeamsState.getState().dispatch.onEngineIncomingImpl(action)
+        const {useChatState} = require('@/stores/chat') as typeof UseChatStateType
+        useChatState.getState().dispatch.onEngineIncomingImpl(action)
       }
       break
     case EngineGen.keybase1NotifyFeaturedBotsFeaturedBotsUpdate:

shared/ios/Keybase.xcodeproj/xcshareddata/xcschemes/KeybaseShare.xcscheme

@@ -77,6 +77,7 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES"
+      askForAppToLaunch = "Yes"
       launchAutomaticallySubstyle = "2">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">

shared/signup/username.tsx

@@ -12,9 +12,9 @@ const ConnectedEnterUsername = () => {
   const checkUsername = useSignupState(s => s.dispatch.checkUsername)
   const waiting = C.Waiting.useAnyWaiting(C.waitingKeySignup)
   const navigateUp = C.useRouterState(s => s.dispatch.navigateUp)
-  const restartSignup = useSignupState(s => s.dispatch.restartSignup)
+  const resetState = useSignupState(s => s.dispatch.resetState)
   const onBack = () => {
-    restartSignup()
+    resetState()
     navigateUp()
   }
   const onContinue = checkUsername

shared/stores/archive.tsx

@@ -4,7 +4,7 @@ import {ignorePromise} from '@/constants/utils'
 import * as EngineGen from '@/actions/engine-gen-gen'
 import {pathToRPCPath} from '@/constants/fs'
 import {formatTimeForPopup} from '@/util/timestamp'
-import {uint8ArrayToHex} from 'uint8array-extras'
+import {makeUUID} from '@/util/uuid'
 import {fsCacheDir, isAndroid, isMobile} from '@/constants/platform'
 
 type ChatJob = {
@@ -17,7 +17,7 @@ type ChatJob = {
   status: T.RPCChat.ArchiveChatJobStatus
 }
 
-type KBFSJobPhase = 'Queued' | 'Indexing' | 'Indexed' | 'Copying' | 'Copyied' | 'Zipping' | 'Done'
+type KBFSJobPhase = 'Queued' | 'Indexing' | 'Indexed' | 'Copying' | 'Copied' | 'Zipping' | 'Done'
 
 type KBFSJob = {
   id: string
@@ -95,7 +95,7 @@ export const useArchiveState = Z.createZustand<State>('archive', (set, get) => {
     set(s => {
       s.kbfsJobs = new Map(
         // order is retained
-        (status.jobs || []).map(job => [
+        (status.jobs ?? []).map(job => [
           job.desc.jobID,
           {
             bytesCopied: job.bytesCopied,
@@ -125,19 +125,26 @@ export const useArchiveState = Z.createZustand<State>('archive', (set, get) => {
           } as KBFSJob,
         ])
       )
+      for (const id of s.kbfsJobsFreshness.keys()) {
+        if (!s.kbfsJobs.has(id)) {
+          s.kbfsJobsFreshness.delete(id)
+        }
+      }
     })
   }
 
   const setChatProgress = (p: {jobID: string; messagesComplete: number; messagesTotal: number}) => {
     const {jobID, messagesComplete, messagesTotal} = p
+    if (!get().chatJobs.has(jobID)) {
+      loadChat()
+      return
+    }
     set(s => {
       const job = s.chatJobs.get(jobID)
-      if (!job) {
-        loadChat()
-        return
+      if (job) {
+        job.progress = messagesTotal ? messagesComplete / messagesTotal : 0
+        job.status = T.RPCChat.ArchiveChatJobStatus.running
       }
-      job.progress = messagesTotal ? messagesComplete / messagesTotal : 0
-      job.status = T.RPCChat.ArchiveChatJobStatus.running
     })
   }
 
@@ -169,8 +176,7 @@ export const useArchiveState = Z.createZustand<State>('archive', (set, get) => {
 
   const startChatArchive = (query: T.RPCChat.GetInboxLocalQuery | null, outPath: string) => {
     const f = async () => {
-      const jobID = Uint8Array.from([...Array<number>(8)], () => Math.floor(Math.random() * 256))
-      const id = uint8ArrayToHex(jobID)
+      const id = makeUUID()
       const actualOutPath = outPath || (isAndroid && fsCacheDir ? `${fsCacheDir}/kbchat-${id}` : '')
       try {
         await T.RPCChat.localArchiveChatRpcPromise({
@@ -196,8 +202,8 @@ export const useArchiveState = Z.createZustand<State>('archive', (set, get) => {
   }
 
   const clearCompletedChat = () => {
-    ignorePromise(
-      Promise.allSettled(
+    const f = async () => {
+      await Promise.allSettled(
         [...get().chatJobs.values()].map(async job => {
           if (job.status === T.RPCChat.ArchiveChatJobStatus.complete) {
             await T.RPCChat.localArchiveChatDeleteRpcPromise({
@@ -208,21 +214,23 @@ export const useArchiveState = Z.createZustand<State>('archive', (set, get) => {
           }
         })
       )
-    )
-    loadChat()
+      loadChat()
+    }
+    ignorePromise(f())
   }
 
   const clearCompletedKBFS = () => {
-    ignorePromise(
-      Promise.allSettled(
+    const f = async () => {
+      await Promise.allSettled(
         [...get().kbfsJobs.values()].map(async job => {
           if (job.phase === 'Done') {
             return get().dispatch.cancelOrDismissKBFS(job.id)
           }
         })
       )
-    )
-    loadKBFS()
+      loadKBFS()
+    }
+    ignorePromise(f())
   }
 
   const loadChat = () => {
@@ -273,19 +281,21 @@ export const useArchiveState = Z.createZustand<State>('archive', (set, get) => {
     ignorePromise(f())
   }
 
-  const startFSArchive = (path: string, outPath: string) => {
-    const f = async () => {
-      const actualPath = outPath || (isAndroid && fsCacheDir ? `${fsCacheDir}/kbfs-backup-${Date.now()}` : '')
-      await T.RPCGen.SimpleFSSimpleFSArchiveStartRpcPromise({
-        archiveJobStartPath: {
-          archiveJobStartPathType: T.RPCGen.ArchiveJobStartPathType.kbfs,
-          kbfs: pathToRPCPath(path).kbfs,
-        },
-        outputPath: actualPath,
-        overwriteZip: true,
-      })
-    }
-    ignorePromise(f())
+  const startArchiveSingle = (type: 'kbfs' | 'git', pathOrRepo: string, outPath: string) => {
+    const prefix = type === 'kbfs' ? 'kbfs-backup' : 'git-backup'
+    ignorePromise(
+      (async () => {
+        const actualPath = outPath || (isAndroid && fsCacheDir ? `${fsCacheDir}/${prefix}-${Date.now()}` : '')
+        await T.RPCGen.SimpleFSSimpleFSArchiveStartRpcPromise({
+          archiveJobStartPath:
+            type === 'kbfs'
+              ? {archiveJobStartPathType: T.RPCGen.ArchiveJobStartPathType.kbfs, kbfs: pathToRPCPath(pathOrRepo).kbfs}
+              : {archiveJobStartPathType: T.RPCGen.ArchiveJobStartPathType.git, git: pathOrRepo},
+          outputPath: actualPath,
+          overwriteZip: true,
+        })
+      })()
+    )
   }
 
   const startFSArchiveAll = (outputDir: string) => {
@@ -314,22 +324,6 @@ export const useArchiveState = Z.createZustand<State>('archive', (set, get) => {
     ignorePromise(f())
   }
 
-  const startGitArchive = (gitRepo: string, outPath: string) => {
-    const f = async () => {
-      const actualPath =
-        outPath || (isAndroid && fsCacheDir ? `${fsCacheDir}/git-backup-${Date.now()}` : '')
-      await T.RPCGen.SimpleFSSimpleFSArchiveStartRpcPromise({
-        archiveJobStartPath: {
-          archiveJobStartPathType: T.RPCGen.ArchiveJobStartPathType.git,
-          git: gitRepo,
-        },
-        outputPath: actualPath,
-        overwriteZip: true,
-      })
-    }
-    ignorePromise(f())
-  }
-
   const startGitArchiveAll = (outputDir: string) => {
     set(s => {
       s.archiveAllGitResponseWaiter.state = 'waiting'
@@ -441,10 +435,10 @@ export const useArchiveState = Z.createZustand<State>('archive', (set, get) => {
           }
           break
         case 'kbfs':
-          target === '/keybase' ? startFSArchiveAll(outPath) : startFSArchive(target, outPath)
+          target === '/keybase' ? startFSArchiveAll(outPath) : startArchiveSingle('kbfs', target, outPath)
           return
         case 'git':
-          target === '.' ? startGitArchiveAll(outPath) : startGitArchive(target, outPath)
+          target === '.' ? startGitArchiveAll(outPath) : startArchiveSingle('git', target, outPath)
           return
       }
     },