Generic collections (factory_job refs) and client tools (integration branch; draft, do not merge)

.github/workflows/ci.yml

@@ -35,12 +35,14 @@ on:
     branches:
       - dev
       - santos/dev2
+      - workstreams/main
   # Also on the push, because a merge of two individually-green branches can
   # still be red, and the merge is exactly the moment nobody is watching.
   push:
     branches:
       - dev
       - santos/dev2
+      - workstreams/main
   workflow_dispatch:
 
 permissions:
@@ -323,7 +325,12 @@ jobs:
           # -p 2 permits concurrent compilation/testing in rest on the public
           # 4-vCPU / 16-GB runner, leaving headroom for the linker. tui3 and
           # session use four shards; codeaf runs its suite without sharding.
-          ./scripts/touched-verdict.sh run --base "$BASE" --shards 4 --report "$TMPDIR/$LEG.json" $PACKAGES
+          # CODEAF'S ONE TEST BINARY GETS 25 MINUTES, AND ONLY IT. Sharding cmd/codeaf
+          # was tried and its sharded runs failed (#1734), and its serial suite measured
+          # 1065 s (17.8 min) on this runner on 2026-11-03, over the Makefile's 15m, so
+          # every test after the cut went unchecked. The other legs pass no --timeout and
+          # keep the Makefile's 15m. Drop this once the suite is back under 15 minutes.
+          ./scripts/touched-verdict.sh run --base "$BASE" --shards 4 ${{ matrix.leg == 'codeaf' && '--timeout 25m' || '' }} --report "$TMPDIR/$LEG.json" $PACKAGES
       - uses: actions/upload-artifact@v4
         if: always()
         with:

cmd/codeaf/app.go

@@ -202,6 +202,7 @@ func runApp(args []string) error {
 	// ONE SUPERVISOR FOR EVERY CONVERSATION THE APP BUILDS (appservices.go).
 	services := openAppServices()
 	appServiceDoor.Store(services)
+	appClientToolsBackend.Store(backend)
 	backend.attachServices(services)
 	guard.Go("app/crews-start", func() { backend.crews() })
 	// THE APP IS AN OPEN WINDOW for as long as it runs, so the clock that runs
@@ -552,6 +553,7 @@ func appConnOf(client *remote.Client, release func(), assembled bool) *appConn {
 
 // appBackend is the [appwire.Engine] over this process's conversations.
 type appBackend struct {
+	clientTools  appClientTools
 	pluginPauses map[string]appPluginPause
 	pluginOllama appPluginOllama
 	pluginAuth   map[string]*appPluginAttempt
@@ -746,6 +748,7 @@ type appBackend struct {
 	collections       *workspace.Store
 	collectionsClosed bool
 	collectionsPath   string
+	collectionFactory collectionFactory
 	// services is the app's one supervisor of kept-running processes
 	// (appservices.go); nil is the capability absent.
 	services *appServices
@@ -1251,10 +1254,12 @@ func appRowOnDisk(id string) (session.SessionRow, bool) {
 		// A folder minted and never spoken in is still a conversation the app
 		// may have created; its meta names the workspace.
 		meta, err := session.LoadMeta(dir)
-		if err != nil || strings.TrimSpace(meta.ID) == "" {
+		if err != nil || meta.ID != id {
 			continue
 		}
-		return session.SessionRow{ID: id, AgentDID: meta.AgentDID(), Dir: dir, Transcript: transcript, Title: meta.Title, Workspace: meta.Workspace, Created: meta.Created}, true
+		return session.SessionRow{ID: id, AgentDID: meta.AgentDID(), Dir: dir, Transcript: transcript,
+			Title: meta.Title, Workspace: meta.Workspace, Owned: meta.Owned, Model: meta.Model,
+			Archived: meta.Archived, Spend: meta.SpentUSD, At: meta.Created, Created: meta.Created}, true
 	}
 	return session.SessionRow{}, false
 }
@@ -4494,6 +4499,8 @@ func (b *appBackend) Close() error {
 	if b.leaving != nil {
 		b.leaving()
 	}
+	b.clientTools.disconnect()
+	appClientToolsBackend.CompareAndSwap(b, nil)
 	already := false
 	var crews *appCrewRun
 	var agents []*appAgent

cmd/codeaf/appblank.go

@@ -139,7 +139,7 @@ func (b *appBackend) reapBlank(a *appAgent) bool {
 	}
 	gone := false
 	_ = teamstore.InspectConversation(b.crewProfile(), transcript, func(referenced bool) error {
-		if referenced || session.InUse(transcript) || !v3EmptyUnassignedSession(dir) {
+		if referenced || session.InUse(transcript) || !v3EmptyUnassignedSession(dir) || collectionKeepsConversation(dir) {
 			return nil
 		}
 		gone = os.RemoveAll(dir) == nil