chore: stabilize the sync tree after the vendor merges

- apps/dashboard reset to our dev state (upstream vis app.ts had leaked in
  through rename detection while its new route files had not).
- pythinker-web: repair identifiers corrupted by the swarms prose rename.
- vendor rebrand script committed (scripts/upstream-sync/rebrand.mjs) with a
  camelCase-aware swarm rule for future snapshots.
- zod deduped; lockfile refreshed.

Typecheck status: 17/17 packages green, CLI green, vis green, desktop green.
Remaining red (Phase 4/5 feature re-port): pythinker-web 71 errors in our
feature files vs the adopted Aug-5 web internals; dashboard 19 errors vs the
adopted protocol (thinkingLevel removal, renderer map for 6 new events,
parseSessionMetadata export).

Author: elkaix

apps/dashboard/server/src/app.ts

@@ -8,13 +8,9 @@ import { PYTHINKER_CODE_HOME } from './config';
 import { serveWebAsset, type WebAsset } from './lib/web-asset';
 import { blobsRoute } from './routes/blobs';
 import { contextRoute } from './routes/context';
-import { cronRoute } from './routes/cron';
-import { importsRoute } from './routes/imports';
-import { logsRoute } from './routes/logs';
 import { sessionDetailRoute } from './routes/session-detail';
 import { sessionsRoute } from './routes/sessions';
 import { subagentsRoute } from './routes/subagents';
-import { tasksRoute } from './routes/tasks';
 import { wireRoute } from './routes/wire';
 
 /** Resolve the SPA bundle directory next to the compiled server.mjs, if it
@@ -100,10 +96,6 @@ export async function createApp(options: CreateAppOptions = {}): Promise<Hono> {
   api.route('/sessions', wireRoute(home));
   api.route('/sessions', subagentsRoute(home));
   api.route('/sessions', blobsRoute(home));
-  api.route('/sessions', tasksRoute(home));
-  api.route('/sessions', cronRoute(home));
-  api.route('/sessions', logsRoute(home));
-  api.route('/imports', importsRoute(home));
   // Mount contextRoute last because it currently uses a catch-all stub
   // (Phase C scope) that would otherwise shadow more specific routes
   // registered below it.

apps/dashboard/server/test/fixtures/sessions/sample-compaction/agents/main/wire.jsonl

@@ -1,6 +1,5 @@
 {"type":"metadata","protocol_version":"2.0","created_at":1779256791085}
 {"type":"config.update","cwd":"/tmp/work","profileName":"agent","systemPrompt":"You are Pythinker.","time":1779256791100}
 {"type":"context.append_message","message":{"role":"user","content":[{"type":"text","text":"before compaction"}],"toolCalls":[]},"time":1779256800001}
-{"type":"context.append_message","message":{"role":"assistant","content":[{"type":"text","text":"assistant reply"}],"toolCalls":[]},"time":1779256800200}
-{"type":"context.apply_compaction","summary":"compacted summary","compactedCount":2,"tokensBefore":100,"tokensAfter":30,"time":1779256800500}
+{"type":"context.apply_compaction","summary":"compacted summary","compactedCount":1,"tokensBefore":100,"tokensAfter":30,"time":1779256800500}
 {"type":"context.append_message","message":{"role":"user","content":[{"type":"text","text":"after compaction"}],"toolCalls":[]},"time":1779256801000}

apps/dashboard/server/test/lib/context-projector.test.ts

@@ -70,31 +70,28 @@ describe('context route', () => {
     cleanup = c;
     const app = contextRoute(home);
 
-    // Default (model view): the real user prompt before compaction is KEPT, the
-    // assistant reply is dropped, then the summary, then the post-compaction tail.
+    // Default (model view): the pre-compaction message is dropped, leaving
+    // [summary, after-compaction].
     const modelRes = await app.request('/session_fixture/context?agent=main');
     expect(modelRes.status).toBe(200);
     const modelBody = (await modelRes.json()) as {
       messages: { source: string; message: { content: { type: string; text?: string }[] } }[];
     };
     expect(modelBody.messages.map((m) => m.source)).toEqual([
-      'append_message', 'compaction_summary', 'append_message',
+      'compaction_summary', 'append_message',
     ]);
-    expect(modelBody.messages[0]!.message.content[0]).toMatchObject({ text: 'before compaction' });
-    expect(modelBody.messages[2]!.message.content[0]).toMatchObject({ text: 'after compaction' });
 
-    // Full history: every pre-compaction message (user prompt + assistant reply)
-    // is KEPT, then the summary marker, then the post-compaction tail.
+    // Full history: the pre-compaction message is KEPT, then the summary marker,
+    // then the post-compaction tail.
     const fullRes = await app.request('/session_fixture/context?agent=main&history=full');
     expect(fullRes.status).toBe(200);
     const fullBody = (await fullRes.json()) as {
       messages: { source: string; message: { content: { type: string; text?: string }[] } }[];
     };
     expect(fullBody.messages.map((m) => m.source)).toEqual([
-      'append_message', 'append_message', 'compaction_summary', 'append_message',
+      'append_message', 'compaction_summary', 'append_message',
     ]);
     expect(fullBody.messages[0]!.message.content[0]).toMatchObject({ text: 'before compaction' });
-    expect(fullBody.messages[1]!.message.content[0]).toMatchObject({ text: 'assistant reply' });
-    expect(fullBody.messages[3]!.message.content[0]).toMatchObject({ text: 'after compaction' });
+    expect(fullBody.messages[2]!.message.content[0]).toMatchObject({ text: 'after compaction' });
   });
 });

apps/dashboard/server/test/routes/context.test.ts

@@ -5,11 +5,6 @@ import type {
   WireResponse,
   ContextResponse,
   AgentTreeResponse,
-  BackgroundTasksResponse,
-  TaskOutputResponse,
-  CronTasksResponse,
-  ImportResult,
-  LogsResponse,
   ApiError,
 } from './types';
 
@@ -133,48 +128,6 @@ export const api = {
   getAgentTree: (id: string) =>
     get<AgentTreeResponse>(`/api/sessions/${enc(id)}/agents`),
 
-  /** Background tasks (process / agent / question) persisted under the
-   *  session's `tasks/` directory, each with `output.log` metadata. */
-  getTasks: (id: string) =>
-    get<BackgroundTasksResponse>(`/api/sessions/${enc(id)}/tasks`),
-
-  /** A byte-window of a single task's `output.log`. */
-  getTaskOutput: (id: string, taskId: string, offset = 0, limit?: number) =>
-    get<TaskOutputResponse>(
-      `/api/sessions/${enc(id)}/tasks/${enc(taskId)}/output?offset=${offset}` +
-        (limit !== undefined ? `&limit=${limit}` : ''),
-    ),
-
-  /** Cron jobs persisted under the session's `cron/` directory. */
-  getCron: (id: string) =>
-    get<CronTasksResponse>(`/api/sessions/${enc(id)}/cron`),
-
-  /** Parsed diagnostic log for a session (works for local and imported). */
-  getLogs: (id: string, which: 'session' | 'global' = 'session') =>
-    get<LogsResponse>(`/api/sessions/${enc(id)}/logs?which=${which}`),
-
-  /** Import a `/export-debug-zip` bundle. Sends the raw file as the body. */
-  importZip: async (file: File): Promise<ImportResult> => {
-    const headers: Record<string, string> = { accept: 'application/json' };
-    const token = authToken();
-    if (token !== null && token.length > 0) headers['authorization'] = `Bearer ${token}`;
-    const res = await fetch(`/api/imports?name=${enc(file.name)}`, {
-      method: 'POST',
-      headers,
-      body: file,
-    });
-    if (!res.ok) {
-      let err: ApiError | null = null;
-      try {
-        err = (await res.json()) as ApiError;
-      } catch {
-        /* ignore */
-      }
-      throw new Error(err?.error ?? `HTTP ${res.status} ${res.statusText}`);
-    }
-    return (await res.json()) as ImportResult;
-  },
-
   deleteSession: (id: string) => del<DeleteSessionResponse>(`/api/sessions/${enc(id)}`),
 
   /** Open the session's on-disk folder in the OS file manager. Side

apps/dashboard/web/src/api.ts

@@ -2,7 +2,6 @@ import type { ReactNode } from 'react';
 import { useQueryClient } from '@tanstack/react-query';
 import { Link } from 'react-router';
 import { SessionRail } from '../sessions/SessionRail';
-import { ZipDropOverlay } from '../shared/ZipDropOverlay';
 import { useTheme, type ThemeChoice, type ResolvedTheme } from '../../hooks/useTheme';
 
 interface AppShellProps {
@@ -41,13 +40,8 @@ export function AppShell({ children }: AppShellProps) {
       </header>
       <div className="flex min-h-0 flex-1">
         <SessionRail />
-        {/* min-w-0 lets the main column shrink below its content's intrinsic
-            width; without it a flex child defaults to min-width:auto and wide
-            tab content (e.g. the Timeline's flex-wrap rows) blows the layout
-            out horizontally instead of wrapping. */}
-        <main className="flex min-h-0 min-w-0 flex-1 flex-col">{children}</main>
+        <main className="flex min-h-0 flex-1 flex-col">{children}</main>
       </div>
-      <ZipDropOverlay />
     </div>
   );
 }

apps/dashboard/web/src/components/layout/AppShell.tsx

@@ -40,22 +40,9 @@ export function SessionCard({ session, onDelete, deleting }: SessionCardProps) {
           <div className="flex min-w-0 items-center gap-2">
             <span
               className="inline-block h-[7px] w-[7px] shrink-0 rounded-full"
-              style={{ backgroundColor: session.imported ? 'var(--color-cat-subagent)' : 'var(--color-fg-3)' }}
+              style={{ backgroundColor: 'var(--color-fg-3)' }}
             />
             <span className="shrink-0 font-mono text-[12px] text-fg-0">{shortId}</span>
-            {session.imported ? (
-              <span
-                className="shrink-0 border px-1 py-0 font-mono text-[9px] uppercase tracking-[0.08em]"
-                style={{ borderColor: 'var(--color-cat-subagent)', color: 'var(--color-cat-subagent)' }}
-                title={
-                  session.importMeta?.originalName
-                    ? `imported from ${session.importMeta.originalName}`
-                    : 'imported debug bundle'
-                }
-              >
-                imported
-              </span>
-            ) : null}
           </div>
           <span className="shrink-0 font-mono text-[10.5px] text-fg-3 tabular">
             {formatRelativeTime(session.updatedAt)}
@@ -73,11 +60,6 @@ export function SessionCard({ session, onDelete, deleting }: SessionCardProps) {
               {subagentCount}sub
             </span>
           ) : null}
-          {session.imported && session.importMeta?.manifest?.pythinkerCodeVersion ? (
-            <span className="tabular text-fg-3" title="pythinker-code version that produced this bundle">
-              v{session.importMeta.manifest.pythinkerCodeVersion}
-            </span>
-          ) : null}
           {session.health !== 'ok' ? (
             <span className="tabular text-[var(--color-sev-error)]">
               {session.health}

apps/dashboard/web/src/components/sessions/SessionCard.tsx

@@ -1,6 +1,4 @@
-import { useRef } from 'react';
-
-import type { SessionSortKey, HealthFilter, SourceFilter } from './SessionRail';
+import type { SessionSortKey, HealthFilter } from './SessionRail';
 
 interface SessionFilterProps {
   search: string;
@@ -9,13 +7,8 @@ interface SessionFilterProps {
   onSortChange: (v: SessionSortKey) => void;
   healthFilter: HealthFilter;
   onHealthChange: (v: HealthFilter) => void;
-  sourceFilter: SourceFilter;
-  onSourceChange: (v: SourceFilter) => void;
   totalCount: number;
   filteredCount: number;
-  importedCount: number;
-  onImport: (file: File) => void;
-  importing: boolean;
 }
 
 const SORT_OPTIONS: { value: SessionSortKey; label: string }[] = [
@@ -33,55 +26,18 @@ const HEALTH_OPTIONS: { value: HealthFilter; label: string }[] = [
   { value: 'missing_main_wire', label: 'no main wire' },
 ];
 
-const SOURCE_OPTIONS: { value: SourceFilter; label: string }[] = [
-  { value: 'all', label: 'all' },
-  { value: 'local', label: 'local' },
-  { value: 'imported', label: 'imported' },
-];
-
 export function SessionFilter({
   search,
   onSearchChange,
   sortKey,
   onSortChange,
   healthFilter,
   onHealthChange,
-  sourceFilter,
-  onSourceChange,
   totalCount,
   filteredCount,
-  importedCount,
-  onImport,
-  importing,
 }: SessionFilterProps) {
-  const fileInput = useRef<HTMLInputElement>(null);
   return (
     <div className="border-b border-border bg-surface-1 px-3 py-2">
-      <div className="mb-2 flex items-center gap-2">
-        <input
-          ref={fileInput}
-          type="file"
-          accept=".zip,application/zip"
-          className="hidden"
-          onChange={(e) => {
-            const file = e.target.files?.[0];
-            if (file) onImport(file);
-            e.target.value = '';
-          }}
-        />
-        <button
-          type="button"
-          disabled={importing}
-          onClick={() => fileInput.current?.click()}
-          className="flex items-center gap-1.5 border border-border bg-surface-0 px-2 py-1 font-mono text-[11px] text-fg-1 hover:border-border-strong hover:text-fg-0 disabled:opacity-50"
-          title="Import a /export-debug-zip bundle a user sent you"
-        >
-          {importing ? 'importing…' : '⬆ import debug zip'}
-        </button>
-        {importedCount > 0 ? (
-          <span className="font-mono text-[10px] text-fg-3 tabular">{importedCount} imported</span>
-        ) : null}
-      </div>
       <div className="relative">
         <input
           type="text"
@@ -106,20 +62,6 @@ export function SessionFilter({
             ))}
           </select>
         </label>
-        <label className="flex items-center gap-1.5 font-mono text-[10.5px] text-fg-2">
-          <span className="text-fg-3">source</span>
-          <select
-            value={sourceFilter}
-            onChange={(e) => { onSourceChange(e.target.value as SourceFilter); }}
-            className="flex-1 border border-border bg-surface-0 px-1 py-0.5 text-fg-1 focus:border-border-strong focus:outline-none"
-          >
-            {SOURCE_OPTIONS.map((o) => (
-              <option key={o.value} value={o.value}>
-                {o.label}
-              </option>
-            ))}
-          </select>
-        </label>
         <label className="flex items-center gap-1.5 font-mono text-[10.5px] text-fg-2">
           <span className="text-fg-3">health</span>
           <select
@@ -134,11 +76,11 @@ export function SessionFilter({
             ))}
           </select>
         </label>
-        <div className="flex items-center justify-end">
-          <span className="font-mono text-[10px] text-fg-3 tabular">
-            {filteredCount} / {totalCount}
-          </span>
-        </div>
+      </div>
+      <div className="mt-2 flex items-center justify-end">
+        <span className="font-mono text-[10px] text-fg-3 tabular">
+          {filteredCount} / {totalCount}
+        </span>
       </div>
     </div>
   );

apps/dashboard/web/src/components/sessions/SessionFilter.tsx

@@ -1,14 +1,13 @@
 import { useMemo, useState } from 'react';
 import { useNavigate, useParams } from 'react-router';
 
-import { useDeleteSession, useImportZip, useSessions } from '../../hooks/useSession';
+import { useDeleteSession, useSessions } from '../../hooks/useSession';
 import type { SessionSummary, SessionHealth } from '../../types';
 import { SessionCard } from './SessionCard';
 import { SessionFilter } from './SessionFilter';
 
 export type SessionSortKey = 'recent' | 'oldest' | 'most_records' | 'most_subagents';
 export type HealthFilter = 'all' | SessionHealth;
-export type SourceFilter = 'all' | 'local' | 'imported';
 
 function workspaceKey(s: SessionSummary): string {
   if (!s.workDir) return '(no workspace)';
@@ -31,45 +30,29 @@ function sortSessions(sessions: readonly SessionSummary[], key: SessionSortKey):
 export function SessionRail() {
   const { data, isLoading, error } = useSessions();
   const deleteSession = useDeleteSession();
-  const importZip = useImportZip();
   const navigate = useNavigate();
   const { sessionId } = useParams<{ sessionId: string }>();
   const [search, setSearch] = useState('');
   const [sortKey, setSortKey] = useState<SessionSortKey>('recent');
   const [healthFilter, setHealthFilter] = useState<HealthFilter>('all');
-  const [sourceFilter, setSourceFilter] = useState<SourceFilter>('all');
 
   const filtered = useMemo(() => {
     if (!data) return [];
     const q = search.trim().toLowerCase();
     return data.filter((s) => {
       if (healthFilter !== 'all' && s.health !== healthFilter) return false;
-      if (sourceFilter === 'local' && s.imported) return false;
-      if (sourceFilter === 'imported' && !s.imported) return false;
       if (!q) return true;
       const hay = [
         s.sessionId,
         s.title ?? '',
         s.lastPrompt ?? '',
         s.workDir ?? '',
-        s.importMeta?.originalName ?? '',
       ]
         .join(' ')
         .toLowerCase();
       return hay.includes(q);
     });
-  }, [data, search, healthFilter, sourceFilter]);
-
-  const importedCount = useMemo(() => (data ?? []).filter((s) => s.imported).length, [data]);
-
-  async function handleImport(file: File) {
-    try {
-      const result = await importZip.mutateAsync(file);
-      void navigate(`/sessions/${result.sessionId}`);
-    } catch (importError) {
-      window.alert(`Import failed: ${importError instanceof Error ? importError.message : String(importError)}`);
-    }
-  }
+  }, [data, search, healthFilter]);
 
   const grouped = useMemo(() => {
     if (sortKey !== 'recent') return null;
@@ -124,13 +107,8 @@ export function SessionRail() {
         onSortChange={setSortKey}
         healthFilter={healthFilter}
         onHealthChange={setHealthFilter}
-        sourceFilter={sourceFilter}
-        onSourceChange={setSourceFilter}
         totalCount={data?.length ?? 0}
         filteredCount={filtered.length}
-        importedCount={importedCount}
-        onImport={(file) => { void handleImport(file); }}
-        importing={importZip.isPending}
       />
       <div className="min-h-0 flex-1 overflow-y-auto">
         {isLoading ? (