test(handlers): add unit tests for InstructionsHandler (closes #415)

Covers all five methods of InstructionsHandler: List, Create, Update,
Delete, and Resolve. Tests use sqlmock + httptest following the same
patterns as existing handler tests in the package.

Notable coverage:
- List: workspace_id scope, admin scope, no params, DB error
- Create: valid global + workspace, all validation failures (missing
  scope/title/content, invalid scope, workspace-nil-target,
  oversized content/title, nil scope_target for global)
- Update: partial + full-body, all validation failures, not-found,
  DB error
- Delete: found, not-found, DB error
- Resolve: global→workspace ordering, empty workspace, DB error,
  missing workspace_id, scope header deduplication
- scanInstructions: scan error is logged and skipped

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

canvas/src/components/AuditTrailPanel.tsx

@@ -142,7 +142,7 @@ export function AuditTrailPanel({ workspaceId }: Props) {
             key={f.id}
             onClick={() => setFilter(f.id)}
             aria-pressed={filter === f.id}
-            className={`px-2 py-1 text-[10px] rounded-md font-medium transition-all shrink-0 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface ${
+            className={`px-2 py-1 text-[10px] rounded-md font-medium transition-all shrink-0 ${
               filter === f.id
                 ? "bg-surface-card text-ink ring-1 ring-zinc-600"
                 : "text-ink-mid hover:text-ink-mid hover:bg-surface-card/60"
@@ -155,7 +155,7 @@ export function AuditTrailPanel({ workspaceId }: Props) {
         <button
           type="button"
           onClick={loadEntries}
-          className="px-2 py-1 text-[10px] bg-surface-card hover:bg-surface-card text-ink-mid rounded transition-colors shrink-0 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
+          className="px-2 py-1 text-[10px] bg-surface-card hover:bg-surface-card text-ink-mid rounded transition-colors shrink-0"
           aria-label="Refresh audit trail"
         >
           ↻
@@ -195,7 +195,7 @@ export function AuditTrailPanel({ workspaceId }: Props) {
                   type="button"
                   onClick={loadMore}
                   disabled={loadingMore}
-                  className="px-4 py-2 text-[11px] bg-surface-card hover:bg-surface-card disabled:opacity-50 disabled:cursor-not-allowed text-ink-mid rounded-lg transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
+                  className="px-4 py-2 text-[11px] bg-surface-card hover:bg-surface-card disabled:opacity-50 disabled:cursor-not-allowed text-ink-mid rounded-lg transition-colors"
                 >
                   {loadingMore ? "Loading…" : "Load more"}
                 </button>

canvas/src/components/CommunicationOverlay.tsx

@@ -209,7 +209,7 @@ export function CommunicationOverlay() {
         type="button"
         onClick={() => setVisible(true)}
         aria-label="Show communications panel"
-        className="fixed top-16 right-4 z-30 px-3 py-1.5 bg-surface-sunken/90 border border-line/50 rounded-lg text-[10px] text-ink-mid hover:text-ink transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
+        className="fixed top-16 right-4 z-30 px-3 py-1.5 bg-surface-sunken/90 border border-line/50 rounded-lg text-[10px] text-ink-mid hover:text-ink transition-colors"
       >
         <span aria-hidden="true">↗↙ </span>{comms.length > 0 ? `${comms.length} comms` : "Communications"}
       </button>
@@ -226,7 +226,7 @@ export function CommunicationOverlay() {
           type="button"
           onClick={() => setVisible(false)}
           aria-label="Close communications panel"
-          className="text-ink-mid hover:text-ink-mid text-xs focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface rounded"
+          className="text-ink-mid hover:text-ink-mid text-xs"
         >
           <span aria-hidden="true">✕</span>
         </button>

canvas/src/components/ConversationTraceModal.tsx

@@ -115,7 +115,7 @@ export function ConversationTraceModal({ open, workspaceId: _workspaceId, onClos
                 <button
                   type="button"
                   aria-label="Close conversation trace"
-                  className="text-ink-mid hover:text-ink-mid text-lg px-2 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface rounded"
+                  className="text-ink-mid hover:text-ink-mid text-lg px-2"
                 >
                   ✕
                 </button>
@@ -286,7 +286,7 @@ export function ConversationTraceModal({ open, workspaceId: _workspaceId, onClos
               <Dialog.Close asChild>
                 <button
                   type="button"
-                  className="px-4 py-1.5 text-[12px] bg-surface-card hover:bg-surface-card text-ink-mid rounded-lg transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
+                  className="px-4 py-1.5 text-[12px] bg-surface-card hover:bg-surface-card text-ink-mid rounded-lg transition-colors"
                 >
                   Close
                 </button>

canvas/src/components/CreateWorkspaceDialog.tsx

@@ -411,7 +411,7 @@ export function CreateWorkspaceButton() {
                     tabIndex={tier === t.value ? 0 : -1}
                     onClick={() => setTier(t.value)}
                     onKeyDown={(e) => handleRadioKeyDown(e, idx)}
-                    className={`py-2 rounded-lg text-center transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 ${
+                    className={`py-2 rounded-lg text-center transition-colors ${
                       tier === t.value
                         ? "bg-accent-strong/20 border border-accent/50 text-accent"
                         : "bg-surface-card/60 border border-line/40 text-ink-mid hover:text-ink-mid hover:border-line"

canvas/src/components/ErrorBoundary.tsx

@@ -83,7 +83,7 @@ export class ErrorBoundary extends React.Component<
               <button
                 type="button"
                 onClick={this.handleReload}
-                className="rounded-lg bg-accent-strong hover:bg-accent px-5 py-2 text-sm font-medium text-white transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-2 focus-visible:ring-offset-surface"
+                className="rounded-lg bg-accent-strong hover:bg-accent px-5 py-2 text-sm font-medium text-white transition-colors"
               >
                 Reload
               </button>
@@ -93,7 +93,7 @@ export class ErrorBoundary extends React.Component<
                   e.preventDefault();
                   this.handleReport();
                 }}
-                className="rounded-lg border border-line hover:border-line px-5 py-2 text-sm font-medium text-ink-mid hover:text-ink transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-2 focus-visible:ring-offset-surface"
+                className="rounded-lg border border-line hover:border-line px-5 py-2 text-sm font-medium text-ink-mid hover:text-ink transition-colors"
               >
                 Report
               </a>

canvas/src/components/ExternalConnectModal.tsx

@@ -198,7 +198,7 @@ export function ExternalConnectModal({ info, onClose }: Props) {
                 role="tab"
                 aria-selected={tab === t}
                 onClick={() => setTab(t)}
-                className={`px-3 py-2 text-sm border-b-2 -mb-px transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface ${
+                className={`px-3 py-2 text-sm border-b-2 -mb-px transition-colors ${
                   tab === t
                     ? "border-accent text-ink"
                     : "border-transparent text-ink-mid hover:text-ink-mid"
@@ -309,7 +309,7 @@ export function ExternalConnectModal({ info, onClose }: Props) {
             <button
               type="button"
               onClick={onClose}
-              className="px-4 py-2 text-sm rounded-lg bg-surface-card hover:bg-surface-card text-ink focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
+              className="px-4 py-2 text-sm rounded-lg bg-surface-card hover:bg-surface-card text-ink"
             >
               I&apos;ve saved it — close
             </button>
@@ -339,7 +339,7 @@ function SnippetBlock({
         <button
           type="button"
           onClick={onCopy}
-          className="text-xs px-2 py-1 rounded bg-accent-strong/80 hover:bg-accent text-white focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
+          className="text-xs px-2 py-1 rounded bg-accent-strong/80 hover:bg-accent text-white"
         >
           {copied ? "Copied!" : "Copy"}
         </button>
@@ -376,7 +376,7 @@ function Field({
         type="button"
         onClick={onCopy}
         disabled={!value}
-        className="text-xs px-2 py-1 rounded bg-surface-card hover:bg-surface-card text-ink disabled:opacity-40 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
+        className="text-xs px-2 py-1 rounded bg-surface-card hover:bg-surface-card text-ink disabled:opacity-40"
       >
         {copied ? "Copied!" : "Copy"}
       </button>

canvas/src/components/MemoryInspectorPanel.tsx

@@ -360,7 +360,7 @@ export function MemoryInspectorPanel({ workspaceId }: Props) {
                 setDebouncedQuery('');
               }}
               aria-label="Clear search"
-              className="absolute right-2 text-ink-mid hover:text-ink transition-colors text-sm leading-none focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface rounded"
+              className="absolute right-2 text-ink-mid hover:text-ink transition-colors text-sm leading-none"
             >
               ×
             </button>
@@ -381,7 +381,7 @@ export function MemoryInspectorPanel({ workspaceId }: Props) {
           type="button"
           onClick={loadEntries}
           disabled={pluginUnavailable}
-          className="px-2 py-1 text-[11px] bg-surface-card hover:bg-surface-card text-ink-mid rounded transition-colors disabled:opacity-50 disabled:cursor-not-allowed focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
+          className="px-2 py-1 text-[11px] bg-surface-card hover:bg-surface-card text-ink-mid rounded transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
           aria-label="Refresh memories"
         >
           ↻ Refresh
@@ -515,7 +515,7 @@ function MemoryEntryRow({ entry, onDelete }: MemoryEntryRowProps) {
       {/* Header row */}
       <button
         type="button"
-        className="w-full flex items-center gap-2 px-3 py-2.5 text-left hover:bg-surface-card/30 transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
+        className="w-full flex items-center gap-2 px-3 py-2.5 text-left hover:bg-surface-card/30 transition-colors"
         onClick={() => setExpanded((prev) => !prev)}
         aria-expanded={expanded}
         aria-controls={bodyId}
@@ -629,7 +629,7 @@ function MemoryEntryRow({ entry, onDelete }: MemoryEntryRowProps) {
                 onDelete();
               }}
               aria-label="Forget memory"
-              className="text-[10px] px-2 py-0.5 bg-red-950/40 hover:bg-red-900/50 border border-red-900/30 rounded text-bad transition-colors shrink-0 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-red-500/60 focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
+              className="text-[10px] px-2 py-0.5 bg-red-950/40 hover:bg-red-900/50 border border-red-900/30 rounded text-bad transition-colors shrink-0"
             >
               Forget
             </button>

canvas/src/components/MissingKeysModal.tsx

@@ -632,7 +632,7 @@ function AllKeysModal({
     <div className="fixed inset-0 z-[60] flex items-center justify-center">
       <div
         className="absolute inset-0 bg-black/70 backdrop-blur-sm"
-        aria-label="Dismiss modal"
+        aria-hidden="true"
         onClick={onCancel}
       />
 
@@ -706,7 +706,7 @@ function AllKeysModal({
                     type="button"
                     onClick={() => handleSaveKey(index)}
                     disabled={!entry.value.trim() || entry.saving}
-                    className="px-3 py-1.5 bg-accent-strong hover:bg-accent text-[11px] rounded text-white disabled:opacity-30 transition-colors shrink-0 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
+                    className="px-3 py-1.5 bg-accent-strong hover:bg-accent text-[11px] rounded text-white disabled:opacity-30 transition-colors shrink-0"
                   >
                     {entry.saving ? "..." : "Save"}
                   </button>
@@ -730,7 +730,7 @@ function AllKeysModal({
               <button
                 type="button"
                 onClick={onOpenSettings}
-                className="text-[11px] text-accent hover:text-accent transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface rounded"
+                className="text-[11px] text-accent hover:text-accent transition-colors"
               >
                 Open Settings Panel
               </button>
@@ -740,7 +740,7 @@ function AllKeysModal({
             <button
               type="button"
               onClick={onCancel}
-              className="px-3.5 py-1.5 text-[12px] text-ink-mid hover:text-ink bg-surface-card hover:bg-surface-card border border-line rounded-lg transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
+              className="px-3.5 py-1.5 text-[12px] text-ink-mid hover:text-ink bg-surface-card hover:bg-surface-card border border-line rounded-lg transition-colors"
             >
               Cancel Deploy
             </button>
@@ -748,7 +748,7 @@ function AllKeysModal({
               type="button"
               onClick={handleAddKeysAndDeploy}
               disabled={!allSaved || anySaving}
-              className="px-3.5 py-1.5 text-[12px] bg-accent-strong hover:bg-accent text-white rounded-lg transition-colors disabled:opacity-40 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
+              className="px-3.5 py-1.5 text-[12px] bg-accent-strong hover:bg-accent text-white rounded-lg transition-colors disabled:opacity-40"
             >
               {anySaving ? "Saving..." : allSaved ? "Deploy" : "Add Keys"}
             </button>

canvas/src/components/OrgImportPreflightModal.tsx

@@ -308,7 +308,7 @@ export function OrgImportPreflightModal({
               type="button"
               onClick={onProceed}
               disabled={!canProceed}
-              className="px-4 py-1.5 text-[11px] font-semibold rounded bg-accent hover:bg-accent-strong text-white disabled:bg-surface-card disabled:text-white-soft disabled:cursor-not-allowed focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
+              className="px-4 py-1.5 text-[11px] font-semibold rounded bg-accent hover:bg-accent-strong text-white disabled:bg-surface-card disabled:text-white-soft disabled:cursor-not-allowed"
             >
               Import
             </button>
@@ -428,7 +428,7 @@ function StrictEnvRow({
             type="button"
             onClick={() => onSave(envKey)}
             disabled={d?.saving || !d?.value.trim()}
-            className="px-2 py-1 text-[10px] rounded bg-accent hover:bg-accent-strong text-white disabled:opacity-40 disabled:cursor-not-allowed focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
+            className="px-2 py-1 text-[10px] rounded bg-accent hover:bg-accent-strong text-white disabled:opacity-40 disabled:cursor-not-allowed"
           >
             {d?.saving ? "…" : "Save"}
           </button>
@@ -520,7 +520,7 @@ function AnyOfEnvGroup({
                     type="button"
                     onClick={() => onSave(m)}
                     disabled={d?.saving || !d?.value.trim()}
-                    className="px-2 py-1 text-[10px] rounded bg-accent hover:bg-accent-strong text-white disabled:opacity-40 disabled:cursor-not-allowed focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
+                    className="px-2 py-1 text-[10px] rounded bg-accent hover:bg-accent-strong text-white disabled:opacity-40 disabled:cursor-not-allowed"
                   >
                     {d?.saving ? "…" : "Save"}
                   </button>

canvas/src/components/PricingTable.tsx

@@ -128,7 +128,7 @@ function PlanCard({
         type="button"
         onClick={onSelect}
         disabled={loading}
-        className={`mt-6 rounded-lg px-4 py-3 text-sm font-medium focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-2 focus-visible:ring-offset-surface ${
+        className={`mt-6 rounded-lg px-4 py-3 text-sm font-medium ${
           plan.highlighted
             ? "bg-accent-strong text-white hover:bg-accent disabled:bg-blue-900"
             : "border border-line bg-surface-sunken text-ink hover:bg-surface-card disabled:opacity-50"

canvas/src/components/ProviderModelSelector.tsx

@@ -437,7 +437,7 @@ export function ProviderModelSelector({
                     handleModelChange(selected.models[0]?.id ?? "");
                   }
                 }}
-                className="text-[9px] text-accent hover:text-accent mt-0.5 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface rounded"
+                className="text-[9px] text-accent hover:text-accent mt-0.5"
               >
                 ← back to model list
               </button>

canvas/src/components/ProvisioningTimeout.tsx

@@ -341,7 +341,7 @@ export function ProvisioningTimeout({
                     type="button"
                     onClick={() => handleRetry(entry.workspaceId)}
                     disabled={isRetrying || isCancelling || retryCooldown.has(entry.workspaceId)}
-                    className="px-3 py-1.5 bg-amber-600 hover:bg-amber-500 text-[11px] font-medium rounded-lg text-white disabled:opacity-40 transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-amber-400/70 focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
+                    className="px-3 py-1.5 bg-amber-600 hover:bg-amber-500 text-[11px] font-medium rounded-lg text-white disabled:opacity-40 transition-colors"
                   >
                     {isRetrying ? "Retrying..." : retryCooldown.has(entry.workspaceId) ? "Wait..." : "Retry"}
                   </button>
@@ -349,14 +349,14 @@ export function ProvisioningTimeout({
                     type="button"
                     onClick={() => handleCancelRequest(entry.workspaceId)}
                     disabled={isRetrying || isCancelling}
-                    className="px-3 py-1.5 bg-surface-card hover:bg-surface-card text-[11px] text-ink-mid rounded-lg border border-line disabled:opacity-40 transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
+                    className="px-3 py-1.5 bg-surface-card hover:bg-surface-card text-[11px] text-ink-mid rounded-lg border border-line disabled:opacity-40 transition-colors"
                   >
                     {isCancelling ? "Cancelling..." : "Cancel"}
                   </button>
                   <button
                     type="button"
                     onClick={() => handleViewLogs(entry.workspaceId)}
-                    className="px-3 py-1.5 text-[11px] text-warm hover:text-warm transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-amber-400/70 focus-visible:ring-offset-1 focus-visible:ring-offset-surface rounded"
+                    className="px-3 py-1.5 text-[11px] text-warm hover:text-warm transition-colors"
                   >
                     View Logs
                   </button>
@@ -382,14 +382,14 @@ export function ProvisioningTimeout({
               <button
                 type="button"
                 onClick={() => setConfirmingCancel(null)}
-                className="px-3.5 py-1.5 text-[12px] text-ink-mid hover:text-ink bg-surface-card hover:bg-surface-card border border-line rounded-lg transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
+                className="px-3.5 py-1.5 text-[12px] text-ink-mid hover:text-ink bg-surface-card hover:bg-surface-card border border-line rounded-lg transition-colors"
               >
                 Keep
               </button>
               <button
                 type="button"
                 onClick={handleCancelConfirm}
-                className="px-3.5 py-1.5 text-[12px] bg-red-600 hover:bg-red-500 text-white rounded-lg transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-red-400/70 focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
+                className="px-3.5 py-1.5 text-[12px] bg-red-600 hover:bg-red-500 text-white rounded-lg transition-colors"
               >
                 Remove Workspace
               </button>

canvas/src/components/SidePanel.tsx

@@ -181,7 +181,7 @@ export function SidePanel() {
           type="button"
           onClick={() => selectNode(null)}
           aria-label="Close workspace panel"
-          className="w-7 h-7 flex items-center justify-center rounded-lg text-ink-mid hover:text-ink hover:bg-surface-card/60 transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
+          className="w-7 h-7 flex items-center justify-center rounded-lg text-ink-mid hover:text-ink hover:bg-surface-card/60 transition-colors"
         >
           <svg width="12" height="12" viewBox="0 0 12 12" fill="none" aria-hidden="true">
             <path d="M1 1l10 10M11 1L1 11" stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" />

canvas/src/components/TemplatePalette.tsx

@@ -236,7 +236,7 @@ export function OrgTemplatesSection() {
           onClick={() => setExpanded((v) => !v)}
           aria-expanded={expanded}
           aria-controls="org-templates-body"
-          className="flex items-center gap-1.5 text-[10px] uppercase tracking-wide text-ink-mid hover:text-ink-mid font-semibold transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface rounded"
+          className="flex items-center gap-1.5 text-[10px] uppercase tracking-wide text-ink-mid hover:text-ink-mid font-semibold transition-colors"
         >
           <span
             aria-hidden="true"
@@ -255,7 +255,7 @@ export function OrgTemplatesSection() {
           type="button"
           onClick={loadOrgs}
           aria-label="Refresh org templates"
-          className="text-[10px] text-ink-mid hover:text-ink-mid focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface rounded"
+          className="text-[10px] text-ink-mid hover:text-ink-mid"
         >
           ↻
         </button>
@@ -306,7 +306,7 @@ export function OrgTemplatesSection() {
               type="button"
               onClick={() => handleImport(o)}
               disabled={isImporting}
-              className="w-full px-2 py-1.5 bg-accent-strong/20 hover:bg-accent-strong/30 border border-accent/30 rounded-lg text-[10px] text-accent font-medium transition-colors disabled:opacity-50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
+              className="w-full px-2 py-1.5 bg-accent-strong/20 hover:bg-accent-strong/30 border border-accent/30 rounded-lg text-[10px] text-accent font-medium transition-colors disabled:opacity-50"
             >
               {isImporting ? "Importing…" : "Import org"}
             </button>
@@ -411,7 +411,7 @@ function ImportAgentButton({ onImported }: { onImported: () => void }) {
         type="button"
         onClick={() => fileInputRef.current?.click()}
         disabled={importing}
-        className="w-full px-3 py-2 bg-accent-strong/20 hover:bg-accent-strong/30 border border-accent/30 rounded-lg text-[11px] text-accent font-medium transition-colors disabled:opacity-50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
+        className="w-full px-3 py-2 bg-accent-strong/20 hover:bg-accent-strong/30 border border-accent/30 rounded-lg text-[11px] text-accent font-medium transition-colors disabled:opacity-50"
       >
         {importing ? "Importing..." : "Import Agent Folder"}
       </button>
@@ -474,7 +474,7 @@ export function TemplatePalette() {
       <button
         type="button"
         onClick={() => setOpen(!open)}
-        className={`fixed top-4 left-4 z-40 w-9 h-9 flex items-center justify-center rounded-lg transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-2 focus-visible:ring-offset-surface ${
+        className={`fixed top-4 left-4 z-40 w-9 h-9 flex items-center justify-center rounded-lg transition-colors ${
           open
             ? "bg-accent-strong text-white"
             : "bg-surface-sunken/90 border border-line/50 text-ink-mid hover:text-ink hover:border-line"
@@ -580,7 +580,7 @@ export function TemplatePalette() {
             <button
               type="button"
               onClick={loadTemplates}
-              className="text-[10px] text-ink-mid hover:text-ink-mid transition-colors block focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface rounded"
+              className="text-[10px] text-ink-mid hover:text-ink-mid transition-colors block"
             >
               Refresh templates
             </button>

canvas/src/components/ThemeToggle.tsx

@@ -54,7 +54,7 @@ export function ThemeToggle({ className = "" }: { className?: string }) {
             aria-label={opt.label}
             onClick={() => setTheme(opt.value)}
             className={
-              "flex h-6 w-6 items-center justify-center rounded transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface " +
+              "flex h-6 w-6 items-center justify-center rounded transition-colors " +
               (active
                 ? "bg-surface-elevated text-ink shadow-sm"
                 : "text-ink-mid hover:text-ink-mid")

canvas/src/components/__tests__/ApprovalBanner.test.tsx

@@ -16,8 +16,6 @@ vi.mock("@/components/Toaster", () => ({
   showToast: vi.fn(),
 }));
 
-afterEach(cleanup);
-
 // ─── Helpers ──────────────────────────────────────────────────────────────────
 
 const pendingApproval = (id = "a1", workspaceId = "ws-1"): {

canvas/src/components/__tests__/RevealToggle.test.tsx

@@ -6,12 +6,11 @@
  * aria-label, title text, onToggle callback.
  */
 import React from "react";
-import { render, screen, fireEvent, cleanup } from "@testing-library/react";
-import { afterEach, describe, expect, it, vi } from "vitest";
+import { render, screen, fireEvent } from "@testing-library/react";
+import { describe, expect, it, vi } from "vitest";
 import { RevealToggle } from "../ui/RevealToggle";
 
 describe("RevealToggle — render", () => {
-  afterEach(cleanup);
   it("renders a button element", () => {
     render(<RevealToggle revealed={false} onToggle={vi.fn()} />);
     expect(screen.getByRole("button")).toBeTruthy();

canvas/src/components/__tests__/StatusBadge.test.tsx

@@ -6,12 +6,11 @@
  * icon presence, className variants, no render when passed invalid status.
  */
 import React from "react";
-import { render, screen, cleanup } from "@testing-library/react";
-import { afterEach, describe, expect, it } from "vitest";
+import { render, screen } from "@testing-library/react";
+import { describe, expect, it } from "vitest";
 import { StatusBadge } from "../ui/StatusBadge";
 
 describe("StatusBadge — render", () => {
-  afterEach(cleanup);
   it("renders verified status with ✓ icon", () => {
     render(<StatusBadge status="verified" />);
     const badge = screen.getByRole("status");

canvas/src/components/__tests__/StatusDot.test.tsx

@@ -11,18 +11,16 @@
  *   - provisioning status carries motion-safe:animate-pulse for the pulsing effect
  *   - glow class applied when STATUS_CONFIG declares one
  */
-import { afterEach, describe, expect, it } from "vitest";
-import { render, screen, cleanup } from "@testing-library/react";
+import { describe, expect, it } from "vitest";
+import { render, screen } from "@testing-library/react";
 import React from "react";
 
 import { StatusDot } from "../StatusDot";
 
-afterEach(cleanup);
-
 describe("StatusDot — snapshot", () => {
   it("renders with online status", () => {
     render(<StatusDot status="online" />);
-    const dot = screen.getByRole("img", { hidden: true });
+    const dot = screen.getByRole("img");
     expect(dot.className).toContain("bg-emerald-400");
     expect(dot.className).toContain("shadow-emerald-400/50");
     expect(dot.getAttribute("aria-hidden")).toBe("true");
@@ -30,7 +28,7 @@ describe("StatusDot — snapshot", () => {
 
   it("renders with offline status", () => {
     render(<StatusDot status="offline" />);
-    const dot = screen.getByRole("img", { hidden: true });
+    const dot = screen.getByRole("img");
     expect(dot.className).toContain("bg-zinc-500");
     // offline has no glow
     expect(dot.className).not.toContain("shadow-");
@@ -38,34 +36,34 @@ describe("StatusDot — snapshot", () => {
 
   it("renders with degraded status", () => {
     render(<StatusDot status="degraded" />);
-    const dot = screen.getByRole("img", { hidden: true });
+    const dot = screen.getByRole("img");
     expect(dot.className).toContain("bg-amber-400");
     expect(dot.className).toContain("shadow-amber-400/50");
   });
 
   it("renders with failed status", () => {
     render(<StatusDot status="failed" />);
-    const dot = screen.getByRole("img", { hidden: true });
+    const dot = screen.getByRole("img");
     expect(dot.className).toContain("bg-red-400");
     expect(dot.className).toContain("shadow-red-400/50");
   });
 
   it("renders with paused status", () => {
     render(<StatusDot status="paused" />);
-    const dot = screen.getByRole("img", { hidden: true });
+    const dot = screen.getByRole("img");
     expect(dot.className).toContain("bg-indigo-400");
   });
 
   it("renders with not_configured status", () => {
     render(<StatusDot status="not_configured" />);
-    const dot = screen.getByRole("img", { hidden: true });
+    const dot = screen.getByRole("img");
     expect(dot.className).toContain("bg-amber-300");
     expect(dot.className).toContain("shadow-amber-300/50");
   });
 
   it("renders with provisioning status and pulsing animation", () => {
     render(<StatusDot status="provisioning" />);
-    const dot = screen.getByRole("img", { hidden: true });
+    const dot = screen.getByRole("img");
     expect(dot.className).toContain("bg-sky-400");
     expect(dot.className).toContain("motion-safe:animate-pulse");
     expect(dot.className).toContain("shadow-sky-400/50");
@@ -73,7 +71,7 @@ describe("StatusDot — snapshot", () => {
 
   it("falls back to bg-zinc-500 for unknown status", () => {
     render(<StatusDot status="alien_artifact" />);
-    const dot = screen.getByRole("img", { hidden: true });
+    const dot = screen.getByRole("img");
     expect(dot.className).toContain("bg-zinc-500");
   });
 });
@@ -81,14 +79,14 @@ describe("StatusDot — snapshot", () => {
 describe("StatusDot — size prop", () => {
   it("applies w-2 h-2 (sm, default)", () => {
     render(<StatusDot status="online" />);
-    const dot = screen.getByRole("img", { hidden: true });
+    const dot = screen.getByRole("img");
     expect(dot.className).toContain("w-2");
     expect(dot.className).toContain("h-2");
   });
 
   it("applies w-2.5 h-2.5 (md)", () => {
     render(<StatusDot status="online" size="md" />);
-    const dot = screen.getByRole("img", { hidden: true });
+    const dot = screen.getByRole("img");
     expect(dot.className).toContain("w-2.5");
     expect(dot.className).toContain("h-2.5");
   });
@@ -97,6 +95,6 @@ describe("StatusDot — size prop", () => {
 describe("StatusDot — accessibility", () => {
   it("is aria-hidden so it doesn't pollute the accessibility tree", () => {
     render(<StatusDot status="online" />);
-    expect(screen.getByRole("img", { hidden: true }).getAttribute("aria-hidden")).toBe("true");
+    expect(screen.getByRole("img").getAttribute("aria-hidden")).toBe("true");
   });
 });

canvas/src/components/__tests__/Tooltip.test.tsx

@@ -10,15 +10,9 @@ import { render, screen, fireEvent, cleanup, act } from "@testing-library/react"
 import { afterEach, describe, expect, it, vi, beforeEach } from "vitest";
 import { Tooltip } from "../Tooltip";
 
-afterEach(() => {
-  cleanup();
-  vi.useRealTimers();
-});
+afterEach(cleanup);
 
 describe("Tooltip — render", () => {
-  beforeEach(() => {
-    vi.useFakeTimers();
-  });
   it("renders children without showing tooltip on mount", () => {
     render(
       <Tooltip text="Hello world">
@@ -231,12 +225,11 @@ describe("Tooltip — aria-describedby", () => {
         <button type="button">Hover me</button>
       </Tooltip>
     );
-    // The aria-describedby is on the wrapper div, not the button child
     const btn = screen.getByRole("button");
-    const wrapper = btn.parentElement as HTMLElement;
-    const describedBy = wrapper.getAttribute("aria-describedby");
+    const describedBy = btn.getAttribute("aria-describedby");
     expect(describedBy).toBeTruthy();
     // The describedby id matches the tooltip id
-    expect(document.getElementById(describedBy!)).toBeTruthy();
+    const tooltipId = describedBy!.replace(/.*?:\s*/, "");
+    expect(document.getElementById(tooltipId)).toBeTruthy();
   });
 });

canvas/src/components/__tests__/TopBar.test.tsx

@@ -6,12 +6,10 @@
  * SettingsButton integration, custom canvasName prop.
  */
 import React from "react";
-import { render, screen, cleanup } from "@testing-library/react";
-import { afterEach, describe, expect, it, vi } from "vitest";
+import { render, screen } from "@testing-library/react";
+import { describe, expect, it, vi } from "vitest";
 import { TopBar } from "../canvas/TopBar";
 
-afterEach(cleanup);
-
 // ─── Mock SettingsButton ───────────────────────────────────────────────────────
 
 vi.mock("../settings/SettingsButton", () => ({

canvas/src/components/__tests__/ValidationHint.test.tsx

@@ -6,12 +6,10 @@
  * aria-live for error, icon rendering.
  */
 import React from "react";
-import { render, screen, cleanup } from "@testing-library/react";
-import { afterEach, describe, expect, it } from "vitest";
+import { render, screen } from "@testing-library/react";
+import { describe, expect, it } from "vitest";
 import { ValidationHint } from "../ui/ValidationHint";
 
-afterEach(cleanup);
-
 describe("ValidationHint — error state", () => {
   it("renders error message when error is a non-null string", () => {
     render(<ValidationHint error="Invalid email address" />);
@@ -45,9 +43,7 @@ describe("ValidationHint — valid state", () => {
 
   it("includes the checkmark icon in valid state", () => {
     render(<ValidationHint error={null} showValid={true} />);
-    // ✓ is in an aria-hidden span; Valid format is a separate text node
-    expect(screen.getByText(/✓/)).toBeTruthy();
-    expect(screen.getByText("Valid format")).toBeTruthy();
+    expect(screen.getByText(/✓ Valid format/)).toBeTruthy();
   });
 
   it("uses the valid class on the paragraph element", () => {

canvas/src/components/tabs/FilesTab/__tests__/FilesToolbar.test.tsx

@@ -1,349 +0,0 @@
-// @vitest-environment jsdom
-/**
- * Tests for FilesToolbar — the top-of-panel bar for the Files tab.
- * Covers: directory select, file count, New/Upload/Clear (configs-only),
- * Export, Refresh, and aria-labels.
- */
-import React from "react";
-import { render, screen, fireEvent, cleanup } from "@testing-library/react";
-import { afterEach, describe, expect, it, vi } from "vitest";
-import { FilesToolbar } from "../FilesToolbar";
-
-afterEach(cleanup);
-
-describe("FilesToolbar", () => {
-  describe("renders base toolbar", () => {
-    it("renders the directory select with aria-label", () => {
-      render(
-        <FilesToolbar
-          root="/configs"
-          setRoot={vi.fn()}
-          fileCount={3}
-          onNewFile={vi.fn()}
-          onUpload={vi.fn()}
-          onDownloadAll={vi.fn()}
-          onClearAll={vi.fn()}
-          onRefresh={vi.fn()}
-        />
-      );
-      expect(
-        screen.getByRole("combobox", { name: /file root directory/i })
-      ).toBeTruthy();
-    });
-
-    it("renders the file count", () => {
-      render(
-        <FilesToolbar
-          root="/configs"
-          setRoot={vi.fn()}
-          fileCount={7}
-          onNewFile={vi.fn()}
-          onUpload={vi.fn()}
-          onDownloadAll={vi.fn()}
-          onClearAll={vi.fn()}
-          onRefresh={vi.fn()}
-        />
-      );
-      expect(screen.getByText("7 files")).toBeTruthy();
-    });
-
-    it("renders Export button", () => {
-      render(
-        <FilesToolbar
-          root="/configs"
-          setRoot={vi.fn()}
-          fileCount={0}
-          onNewFile={vi.fn()}
-          onUpload={vi.fn()}
-          onDownloadAll={vi.fn()}
-          onClearAll={vi.fn()}
-          onRefresh={vi.fn()}
-        />
-      );
-      expect(
-        screen.getByRole("button", { name: /download all files/i })
-      ).toBeTruthy();
-    });
-
-    it("renders Refresh button", () => {
-      render(
-        <FilesToolbar
-          root="/configs"
-          setRoot={vi.fn()}
-          fileCount={0}
-          onNewFile={vi.fn()}
-          onUpload={vi.fn()}
-          onDownloadAll={vi.fn()}
-          onClearAll={vi.fn()}
-          onRefresh={vi.fn()}
-        />
-      );
-      expect(screen.getByRole("button", { name: /refresh file list/i })).toBeTruthy();
-    });
-
-    it("renders 0 files when count is 0", () => {
-      render(
-        <FilesToolbar
-          root="/configs"
-          setRoot={vi.fn()}
-          fileCount={0}
-          onNewFile={vi.fn()}
-          onUpload={vi.fn()}
-          onDownloadAll={vi.fn()}
-          onClearAll={vi.fn()}
-          onRefresh={vi.fn()}
-        />
-      );
-      expect(screen.getByText("0 files")).toBeTruthy();
-    });
-  });
-
-  describe("configs-only buttons", () => {
-    it("shows New and Upload buttons when root is /configs", () => {
-      render(
-        <FilesToolbar
-          root="/configs"
-          setRoot={vi.fn()}
-          fileCount={3}
-          onNewFile={vi.fn()}
-          onUpload={vi.fn()}
-          onDownloadAll={vi.fn()}
-          onClearAll={vi.fn()}
-          onRefresh={vi.fn()}
-        />
-      );
-      expect(
-        screen.getByRole("button", { name: /create new file/i })
-      ).toBeTruthy();
-      expect(
-        screen.getByRole("button", { name: /upload folder/i })
-      ).toBeTruthy();
-      expect(screen.getByRole("button", { name: /delete all files/i })).toBeTruthy();
-    });
-
-    it("hides New and Upload when root is /workspace", () => {
-      render(
-        <FilesToolbar
-          root="/workspace"
-          setRoot={vi.fn()}
-          fileCount={5}
-          onNewFile={vi.fn()}
-          onUpload={vi.fn()}
-          onDownloadAll={vi.fn()}
-          onClearAll={vi.fn()}
-          onRefresh={vi.fn()}
-        />
-      );
-      expect(
-        screen.queryByRole("button", { name: /create new file/i })
-      ).toBeNull();
-      expect(
-        screen.queryByRole("button", { name: /upload folder/i })
-      ).toBeNull();
-      expect(
-        screen.queryByRole("button", { name: /delete all files/i })
-      ).toBeNull();
-      // Export and Refresh are still present
-      expect(
-        screen.getByRole("button", { name: /download all files/i })
-      ).toBeTruthy();
-    });
-
-    it("hides New and Upload when root is /home", () => {
-      render(
-        <FilesToolbar
-          root="/home"
-          setRoot={vi.fn()}
-          fileCount={2}
-          onNewFile={vi.fn()}
-          onUpload={vi.fn()}
-          onDownloadAll={vi.fn()}
-          onClearAll={vi.fn()}
-          onRefresh={vi.fn()}
-        />
-      );
-      expect(
-        screen.queryByRole("button", { name: /create new file/i })
-      ).toBeNull();
-      expect(
-        screen.queryByRole("button", { name: /upload folder/i })
-      ).toBeNull();
-    });
-
-    it("hides New and Upload when root is /plugins", () => {
-      render(
-        <FilesToolbar
-          root="/plugins"
-          setRoot={vi.fn()}
-          fileCount={1}
-          onNewFile={vi.fn()}
-          onUpload={vi.fn()}
-          onDownloadAll={vi.fn()}
-          onClearAll={vi.fn()}
-          onRefresh={vi.fn()}
-        />
-      );
-      expect(
-        screen.queryByRole("button", { name: /create new file/i })
-      ).toBeNull();
-      expect(
-        screen.queryByRole("button", { name: /upload folder/i })
-      ).toBeNull();
-    });
-  });
-
-  describe("callbacks", () => {
-    it("calls setRoot when directory is changed", () => {
-      const setRoot = vi.fn();
-      render(
-        <FilesToolbar
-          root="/configs"
-          setRoot={setRoot}
-          fileCount={3}
-          onNewFile={vi.fn()}
-          onUpload={vi.fn()}
-          onDownloadAll={vi.fn()}
-          onClearAll={vi.fn()}
-          onRefresh={vi.fn()}
-        />
-      );
-      fireEvent.change(screen.getByRole("combobox"), {
-        target: { value: "/workspace" },
-      });
-      expect(setRoot).toHaveBeenCalledWith("/workspace");
-    });
-
-    it("calls onNewFile when New button is clicked", () => {
-      const onNewFile = vi.fn();
-      render(
-        <FilesToolbar
-          root="/configs"
-          setRoot={vi.fn()}
-          fileCount={3}
-          onNewFile={onNewFile}
-          onUpload={vi.fn()}
-          onDownloadAll={vi.fn()}
-          onClearAll={vi.fn()}
-          onRefresh={vi.fn()}
-        />
-      );
-      fireEvent.click(screen.getByRole("button", { name: /create new file/i }));
-      expect(onNewFile).toHaveBeenCalledTimes(1);
-    });
-
-    it("calls onDownloadAll when Export button is clicked", () => {
-      const onDownloadAll = vi.fn();
-      render(
-        <FilesToolbar
-          root="/workspace"
-          setRoot={vi.fn()}
-          fileCount={5}
-          onNewFile={vi.fn()}
-          onUpload={vi.fn()}
-          onDownloadAll={onDownloadAll}
-          onClearAll={vi.fn()}
-          onRefresh={vi.fn()}
-        />
-      );
-      fireEvent.click(screen.getByRole("button", { name: /download all files/i }));
-      expect(onDownloadAll).toHaveBeenCalledTimes(1);
-    });
-
-    it("calls onClearAll when Clear button is clicked", () => {
-      const onClearAll = vi.fn();
-      render(
-        <FilesToolbar
-          root="/configs"
-          setRoot={vi.fn()}
-          fileCount={3}
-          onNewFile={vi.fn()}
-          onUpload={vi.fn()}
-          onDownloadAll={vi.fn()}
-          onClearAll={onClearAll}
-          onRefresh={vi.fn()}
-        />
-      );
-      fireEvent.click(screen.getByRole("button", { name: /delete all files/i }));
-      expect(onClearAll).toHaveBeenCalledTimes(1);
-    });
-
-    it("calls onRefresh when Refresh button is clicked", () => {
-      const onRefresh = vi.fn();
-      render(
-        <FilesToolbar
-          root="/configs"
-          setRoot={vi.fn()}
-          fileCount={3}
-          onNewFile={vi.fn()}
-          onUpload={vi.fn()}
-          onDownloadAll={vi.fn()}
-          onClearAll={vi.fn()}
-          onRefresh={onRefresh}
-        />
-      );
-      fireEvent.click(screen.getByRole("button", { name: /refresh file list/i }));
-      expect(onRefresh).toHaveBeenCalledTimes(1);
-    });
-
-    it("calls onUpload when the hidden file input changes", () => {
-      const onUpload = vi.fn();
-      render(
-        <FilesToolbar
-          root="/configs"
-          setRoot={vi.fn()}
-          fileCount={3}
-          onNewFile={vi.fn()}
-          onUpload={onUpload}
-          onDownloadAll={vi.fn()}
-          onClearAll={vi.fn()}
-          onRefresh={vi.fn()}
-        />
-      );
-      // Find the hidden file input
-      const fileInput = document.querySelector(
-        'input[type="file"]'
-      ) as HTMLInputElement;
-      expect(fileInput).toBeTruthy();
-      expect(fileInput?.getAttribute("aria-label")).toBe("Upload folder files");
-    });
-  });
-
-  describe("a11y", () => {
-    it("all buttons have aria-label or accessible name", () => {
-      render(
-        <FilesToolbar
-          root="/configs"
-          setRoot={vi.fn()}
-          fileCount={3}
-          onNewFile={vi.fn()}
-          onUpload={vi.fn()}
-          onDownloadAll={vi.fn()}
-          onClearAll={vi.fn()}
-          onRefresh={vi.fn()}
-        />
-      );
-      // All buttons should be findable by role
-      const buttons = screen.getAllByRole("button");
-      for (const btn of buttons) {
-        expect(btn.getAttribute("aria-label") ?? btn.textContent).toBeTruthy();
-      }
-    });
-
-    it("directory select has aria-label", () => {
-      render(
-        <FilesToolbar
-          root="/configs"
-          setRoot={vi.fn()}
-          fileCount={3}
-          onNewFile={vi.fn()}
-          onUpload={vi.fn()}
-          onDownloadAll={vi.fn()}
-          onClearAll={vi.fn()}
-          onRefresh={vi.fn()}
-        />
-      );
-      const select = screen.getByRole("combobox");
-      expect(select.getAttribute("aria-label")).toBe("File root directory");
-    });
-  });
-});

canvas/src/components/tabs/FilesTab/__tests__/NotAvailablePanel.test.tsx

@@ -1,101 +0,0 @@
-// @vitest-environment jsdom
-/**
- * Tests for NotAvailablePanel — the full-tab placeholder shown when a
- * workspace's runtime doesn't own a platform-managed filesystem (today:
- * runtime === "external"). Covers rendering, a11y, and runtime prop
- * display.
- */
-import React from "react";
-import { render, screen, cleanup } from "@testing-library/react";
-import { afterEach, describe, expect, it } from "vitest";
-import { NotAvailablePanel } from "../NotAvailablePanel";
-
-afterEach(cleanup);
-
-describe("NotAvailablePanel", () => {
-  describe("renders", () => {
-    it("renders the heading", () => {
-      render(<NotAvailablePanel runtime="external" />);
-      expect(screen.getByText("Files not available")).toBeTruthy();
-    });
-
-    it("renders the description text", () => {
-      render(<NotAvailablePanel runtime="external" />);
-      expect(
-        screen.getByText(/whose filesystem isn't owned by the platform/i)
-      ).toBeTruthy();
-    });
-
-    it("displays the runtime name in the description", () => {
-      render(<NotAvailablePanel runtime="aws-lambda" />);
-      // The runtime name appears inside the paragraph
-      const para = screen.getByText(/whose filesystem isn't owned/i);
-      expect(para.textContent).toContain("aws-lambda");
-    });
-
-    it("renders the SVG folder icon with aria-hidden", () => {
-      render(<NotAvailablePanel runtime="external" />);
-      const svg = document.querySelector("svg");
-      expect(svg).toBeTruthy();
-      expect(svg?.getAttribute("aria-hidden")).toBe("true");
-    });
-
-    it("uses the provided runtime prop verbatim", () => {
-      render(<NotAvailablePanel runtime="cloud-run" />);
-      const monoRuntime = document.querySelector(".font-mono");
-      expect(monoRuntime?.textContent).toBe("cloud-run");
-    });
-
-    it("renders the 'Use the Chat tab' guidance text", () => {
-      render(<NotAvailablePanel runtime="external" />);
-      expect(screen.getByText(/Use the Chat tab/i)).toBeTruthy();
-    });
-
-    it("is contained in a full-height flex column", () => {
-      render(<NotAvailablePanel runtime="external" />);
-      const container = screen.getByText("Files not available").closest("div");
-      expect(container?.className).toContain("flex");
-      expect(container?.className).toContain("flex-col");
-      expect(container?.className).toContain("items-center");
-      expect(container?.className).toContain("justify-center");
-      expect(container?.className).toContain("h-full");
-    });
-  });
-
-  describe("a11y", () => {
-    it("heading is an h3", () => {
-      render(<NotAvailablePanel runtime="external" />);
-      expect(screen.getByRole("heading", { level: 3 })).toBeTruthy();
-    });
-
-    it("SVG icon has aria-hidden so screen readers skip it", () => {
-      render(<NotAvailablePanel runtime="external" />);
-      const svg = document.querySelector("svg");
-      expect(svg?.getAttribute("aria-hidden")).toBe("true");
-    });
-
-    it("description paragraph is present with descriptive text", () => {
-      render(<NotAvailablePanel runtime="external" />);
-      const paras = document.querySelectorAll("p");
-      expect(paras.length).toBeGreaterThan(0);
-      const text = Array.from(paras)
-        .map((p) => p.textContent)
-        .join(" ");
-      expect(text.toLowerCase()).toContain("runtime");
-    });
-  });
-
-  describe("props", () => {
-    it("renders with a short runtime name", () => {
-      render(<NotAvailablePanel runtime="ext" />);
-      const monoRuntime = document.querySelector(".font-mono");
-      expect(monoRuntime?.textContent).toBe("ext");
-    });
-
-    it("renders with a complex runtime name", () => {
-      render(<NotAvailablePanel runtime="gcp-cloud-functions-v2" />);
-      const monoRuntime = document.querySelector(".font-mono");
-      expect(monoRuntime?.textContent).toBe("gcp-cloud-functions-v2");
-    });
-  });
-});

canvas/src/components/tabs/config/__tests__/form-inputs.test.tsx

@@ -1,261 +0,0 @@
-// @vitest-environment jsdom
-"use client";
-/**
- * Tests for form-inputs.tsx — 35 cases:
- * TextInput (7), NumberInput (8), Toggle (5), TagList (9), Section (6).
- */
-import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
-import { render, screen, fireEvent, cleanup } from "@testing-library/react";
-import React from "react";
-
-import {
-  TextInput,
-  NumberInput,
-  Toggle,
-  TagList,
-  Section,
-} from "../form-inputs";
-
-afterEach(cleanup);
-
-// ─── TextInput ───────────────────────────────────────────────────────────────
-
-describe("TextInput", () => {
-  describe("renders", () => {
-    it("renders the label", () => {
-      render(<TextInput label="API Key" value="" onChange={vi.fn()} />);
-      expect(screen.getByLabelText("API Key")).toBeTruthy();
-    });
-
-    it("renders the current value", () => {
-      render(<TextInput label="Name" value="Claude" onChange={vi.fn()} />);
-      expect((screen.getByRole("textbox") as HTMLInputElement).value).toBe("Claude");
-    });
-
-    it("calls onChange when value changes", () => {
-      const onChange = vi.fn();
-      render(<TextInput label="Name" value="" onChange={onChange} />);
-      fireEvent.change(screen.getByRole("textbox"), { target: { value: "Sonnet" } });
-      expect(onChange).toHaveBeenCalledWith("Sonnet");
-    });
-
-    it("renders placeholder when provided", () => {
-      render(<TextInput label="Name" value="" onChange={vi.fn()} placeholder="Enter your name" />);
-      expect((screen.getByRole("textbox") as HTMLInputElement).placeholder).toBe("Enter your name");
-    });
-
-    it("applies font-mono class when mono=true", () => {
-      render(<TextInput label="Token" value="" onChange={vi.fn()} mono />);
-      const input = screen.getByRole("textbox");
-      expect(input.className).toMatch(/font-mono/);
-    });
-
-    it("has aria-label matching the label", () => {
-      render(<TextInput label="API Key" value="" onChange={vi.fn()} />);
-      expect(screen.getByRole("textbox").getAttribute("aria-label")).toBe("API Key");
-    });
-
-    it("does not apply font-mono class when mono=false", () => {
-      render(<TextInput label="Name" value="" onChange={vi.fn()} mono={false} />);
-      expect(screen.getByRole("textbox").className).not.toMatch(/font-mono/);
-    });
-  });
-});
-
-// ─── NumberInput ────────────────────────────────────────────────────────────
-
-describe("NumberInput", () => {
-  describe("renders", () => {
-    it("renders the label", () => {
-      render(<NumberInput label="Port" value={8000} onChange={vi.fn()} />);
-      expect(screen.getByLabelText("Port")).toBeTruthy();
-    });
-
-    it("renders the numeric value", () => {
-      render(<NumberInput label="Timeout" value={120} onChange={vi.fn()} />);
-      expect((screen.getByRole("spinbutton") as HTMLInputElement).value).toBe("120");
-    });
-
-    it("calls onChange with parsed integer", () => {
-      const onChange = vi.fn();
-      render(<NumberInput label="Retries" value={0} onChange={onChange} />);
-      fireEvent.change(screen.getByRole("spinbutton"), { target: { value: "3" } });
-      expect(onChange).toHaveBeenCalledWith(3);
-    });
-
-    it("calls onChange with 0 for non-numeric input", () => {
-      const onChange = vi.fn();
-      render(<NumberInput label="Retries" value={0} onChange={onChange} />);
-      fireEvent.change(screen.getByRole("spinbutton"), { target: { value: "abc" } });
-      expect(onChange).toHaveBeenCalledWith(0);
-    });
-
-    it("applies min/max attributes", () => {
-      render(<NumberInput label="Priority" value={5} onChange={vi.fn()} min={1} max={10} />);
-      const input = screen.getByRole("spinbutton") as HTMLInputElement;
-      expect(input.min).toBe("1");
-      expect(input.max).toBe("10");
-    });
-
-    it("has aria-label matching the label", () => {
-      render(<NumberInput label="Retries" value={3} onChange={vi.fn()} />);
-      expect(screen.getByRole("spinbutton").getAttribute("aria-label")).toBe("Retries");
-    });
-
-    it("applies font-mono class", () => {
-      render(<NumberInput label="Timeout" value={30} onChange={vi.fn()} />);
-      expect(screen.getByRole("spinbutton").className).toMatch(/font-mono/);
-    });
-  });
-});
-
-// ─── Toggle ─────────────────────────────────────────────────────────────────
-
-describe("Toggle", () => {
-  describe("renders", () => {
-    it("renders a checkbox", () => {
-      render(<Toggle label="Enable streaming" checked={false} onChange={vi.fn()} />);
-      expect(screen.getByRole("checkbox")).toBeTruthy();
-    });
-
-    it("reflects checked=true state", () => {
-      render(<Toggle label="Enable streaming" checked={true} onChange={vi.fn()} />);
-      expect((screen.getByRole("checkbox") as HTMLInputElement).checked).toBe(true);
-    });
-
-    it("reflects checked=false state", () => {
-      render(<Toggle label="Enable streaming" checked={false} onChange={vi.fn()} />);
-      expect((screen.getByRole("checkbox") as HTMLInputElement).checked).toBe(false);
-    });
-
-    it("calls onChange with new boolean value", () => {
-      const onChange = vi.fn();
-      render(<Toggle label="Enable streaming" checked={false} onChange={onChange} />);
-      fireEvent.click(screen.getByRole("checkbox"));
-      expect(onChange).toHaveBeenCalledWith(true);
-    });
-
-    it("renders as type=checkbox", () => {
-      render(<Toggle label="Enable" checked={false} onChange={vi.fn()} />);
-      expect(screen.getByRole("checkbox").getAttribute("type")).toBe("checkbox");
-    });
-  });
-});
-
-// ─── TagList ───────────────────────────────────────────────────────────────
-
-describe("TagList", () => {
-  describe("renders", () => {
-    it("renders existing tags", () => {
-      render(<TagList label="Skills" values={["python", "go"]} onChange={vi.fn()} />);
-      expect(screen.getByText("python")).toBeTruthy();
-      expect(screen.getByText("go")).toBeTruthy();
-    });
-
-    it("calls onChange with updated array when × clicked", () => {
-      const onChange = vi.fn();
-      render(<TagList label="Skills" values={["python", "go"]} onChange={onChange} />);
-      fireEvent.click(screen.getByRole("button", { name: /remove tag python/i }));
-      expect(onChange).toHaveBeenCalledWith(["go"]);
-    });
-
-    it("× button has correct aria-label per tag", () => {
-      render(<TagList label="Skills" values={["python"]} onChange={vi.fn()} />);
-      expect(screen.getByRole("button", { name: /remove tag python/i })).toBeTruthy();
-    });
-
-    it("adds tag when Enter is pressed with non-empty input", () => {
-      const onChange = vi.fn();
-      render(<TagList label="Skills" values={[]} onChange={onChange} />);
-      const input = screen.getByRole("textbox");
-      fireEvent.change(input, { target: { value: "rust" } });
-      fireEvent.keyDown(input, { key: "Enter" });
-      expect(onChange).toHaveBeenCalledWith(["rust"]);
-    });
-
-    it("does not add tag when Enter is pressed with whitespace-only input", () => {
-      const onChange = vi.fn();
-      render(<TagList label="Skills" values={[]} onChange={onChange} />);
-      const input = screen.getByRole("textbox");
-      fireEvent.change(input, { target: { value: "   " } });
-      fireEvent.keyDown(input, { key: "Enter" });
-      expect(onChange).not.toHaveBeenCalled();
-    });
-
-    it("clears input after adding a tag", () => {
-      const onChange = vi.fn();
-      render(<TagList label="Skills" values={[]} onChange={onChange} />);
-      const input = screen.getByRole("textbox");
-      fireEvent.change(input, { target: { value: "typescript" } });
-      fireEvent.keyDown(input, { key: "Enter" });
-      expect((input as HTMLInputElement).value).toBe("");
-    });
-
-    it("renders the label", () => {
-      render(<TagList label="Tools" values={[]} onChange={vi.fn()} />);
-      expect(screen.getByLabelText("Tools")).toBeTruthy();
-    });
-
-    it("renders placeholder text", () => {
-      render(<TagList label="Skills" values={[]} onChange={vi.fn()} placeholder="Add a skill" />);
-      expect((screen.getByRole("textbox") as HTMLInputElement).placeholder).toBe("Add a skill");
-    });
-
-    it("renders default placeholder when not specified", () => {
-      render(<TagList label="Skills" values={[]} onChange={vi.fn()} />);
-      expect((screen.getByRole("textbox") as HTMLInputElement).placeholder).toBe("Type and press Enter");
-    });
-  });
-});
-
-// ─── Section ────────────────────────────────────────────────────────────────
-
-describe("Section", () => {
-  describe("renders", () => {
-    it("renders the title", () => {
-      render(<Section title="Runtime Config"><p>Content</p></Section>);
-      expect(screen.getByText("Runtime Config")).toBeTruthy();
-    });
-
-    it("renders children when defaultOpen=true", () => {
-      render(<Section title="Runtime Config"><p data-testid="content">Hello</p></Section>);
-      expect(screen.getByTestId("content")).toBeTruthy();
-    });
-
-    it("hides children when defaultOpen=false", () => {
-      render(<Section title="Runtime Config" defaultOpen={false}><p data-testid="content">Hello</p></Section>);
-      expect(screen.queryByTestId("content")).toBeNull();
-    });
-
-    it("toggles children visibility on click", () => {
-      render(<Section title="Runtime Config" defaultOpen={true}><p data-testid="content">Hello</p></Section>);
-      expect(screen.getByTestId("content")).toBeTruthy();
-      fireEvent.click(screen.getByRole("button", { name: /runtime config/i }));
-      expect(screen.queryByTestId("content")).toBeNull();
-    });
-
-    it("button has aria-expanded reflecting open state", () => {
-      render(<Section title="Runtime Config" defaultOpen={true}><p>Content</p></Section>);
-      const btn = screen.getByRole("button", { name: /runtime config/i });
-      expect(btn.getAttribute("aria-expanded")).toBe("true");
-      fireEvent.click(btn);
-      expect(btn.getAttribute("aria-expanded")).toBe("false");
-    });
-
-    it("button has aria-controls linking to content region id", () => {
-      render(<Section title="Runtime Config"><p>Content</p></Section>);
-      const btn = screen.getByRole("button", { name: /runtime config/i });
-      const contentId = btn.getAttribute("aria-controls");
-      expect(contentId).not.toBeNull();
-      // Content div has the matching id
-      expect(document.getElementById(String(contentId))).not.toBeNull();
-    });
-
-    it("indicator span has aria-hidden so screen readers skip it", () => {
-      render(<Section title="Runtime Config"><p>Content</p></Section>);
-      const btn = screen.getByRole("button", { name: /runtime config/i });
-      const indicator = btn.querySelector("[aria-hidden='true']");
-      expect(indicator).not.toBeNull();
-    });
-  });
-});

canvas/src/components/tabs/config/form-inputs.tsx

@@ -127,20 +127,13 @@ export function TagList({ label, values, onChange, placeholder }: { label: strin
 
 export function Section({ title, children, defaultOpen = true }: { title: string; children: React.ReactNode; defaultOpen?: boolean }) {
   const [open, setOpen] = useState(defaultOpen);
-  const contentId = `section-content-${title.toLowerCase().replace(/\s+/g, "-")}`;
   return (
     <div className="border border-line rounded mb-2">
-      <button
-        type="button"
-        onClick={() => setOpen(!open)}
-        aria-expanded={open}
-        aria-controls={contentId}
-        className="w-full flex items-center justify-between px-3 py-1.5 text-[10px] text-ink-mid hover:text-ink bg-surface-sunken/50"
-      >
+      <button type="button" onClick={() => setOpen(!open)} className="w-full flex items-center justify-between px-3 py-1.5 text-[10px] text-ink-mid hover:text-ink bg-surface-sunken/50">
         <span className="font-medium uppercase tracking-wider">{title}</span>
-        <span aria-hidden="true">{open ? "▾" : "▸"}</span>
+        <span>{open ? "▾" : "▸"}</span>
       </button>
-      {open && <div id={contentId} className="p-3 space-y-3">{children}</div>}
+      {open && <div className="p-3 space-y-3">{children}</div>}
     </div>
   );
 }

canvas/src/components/ui/KeyValueField.tsx

@@ -70,7 +70,6 @@ export function KeyValueField({
         aria-label={ariaLabel}
         autoComplete="off"
         spellCheck={false}
-        role="textbox"
       />
       <RevealToggle
         revealed={revealed}

workspace-server/go.mod

@@ -23,11 +23,6 @@ require (
 	gopkg.in/yaml.v3 v3.0.1
 )
 
-require (
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-)
-
 require (
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/bytedance/gopkg v0.1.3 // indirect
@@ -65,7 +60,6 @@ require (
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/quic-go/qpack v0.6.0 // indirect
 	github.com/quic-go/quic-go v0.59.0 // indirect
-	github.com/stretchr/testify v1.11.1
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.3.1 // indirect
 	github.com/yuin/gopher-lua v1.1.1 // indirect

workspace-server/internal/bundle/exporter_test.go

@@ -1,261 +0,0 @@
-package bundle
-
-import (
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-// ---------------------------------------------------------------------------
-// extractDescription
-// ---------------------------------------------------------------------------
-
-func TestExtractDescription_WithFrontmatter(t *testing.T) {
-	// YAML frontmatter is skipped; first non-comment, non-empty line after
-	// the closing `---` is the description.
-	content := `---
-title: My Workspace
----
-# This is a comment
-This is the description line.
-Another line.`
-	got := extractDescription(content)
-	if got != "This is the description line." {
-		t.Errorf("got %q, want %q", got, "This is the description line.")
-	}
-}
-
-func TestExtractDescription_NoFrontmatter(t *testing.T) {
-	// No frontmatter: first non-comment, non-empty line is returned.
-	content := `# Copyright header
-My workspace description
-Another line.`
-	got := extractDescription(content)
-	if got != "My workspace description" {
-		t.Errorf("got %q, want %q", got, "My workspace description")
-	}
-}
-
-func TestExtractDescription_CommentOnly(t *testing.T) {
-	// All content is comments or empty → empty string.
-	content := `# comment only
-# another comment
-`
-	got := extractDescription(content)
-	if got != "" {
-		t.Errorf("got %q, want empty string", got)
-	}
-}
-
-func TestExtractDescription_EmptyInput(t *testing.T) {
-	got := extractDescription("")
-	if got != "" {
-		t.Errorf("got %q, want empty string", got)
-	}
-}
-
-func TestExtractDescription_UnclosedFrontmatter(t *testing.T) {
-	// With no closing `---`, inFrontmatter stays true after the opening
-	// delimiter, so all subsequent lines are skipped and "" is returned.
-	// This is the documented behaviour: without a closing delimiter,
-	// all lines are considered frontmatter.
-	content := `---
-title: No closing delimiter
-This is the description.`
-	got := extractDescription(content)
-	if got != "" {
-		t.Errorf("unclosed frontmatter: got %q, want empty string", got)
-	}
-}
-
-func TestExtractDescription_FrontmatterThenCommentThenContent(t *testing.T) {
-	content := `---
-tags: [test]
----
-# internal comment
-Real description here.
-`
-	got := extractDescription(content)
-	if got != "Real description here." {
-		t.Errorf("got %q, want %q", got, "Real description here.")
-	}
-}
-
-func TestExtractDescription_BlankLinesSkipped(t *testing.T) {
-	// Empty lines (len=0) are skipped; whitespace-only lines (spaces) are NOT
-	// skipped because len(line)>0. First non-comment, non-empty line is returned.
-	content := "\n\n\n\nA. Description\nB. Should not be returned.\n"
-	got := extractDescription(content)
-	if got != "A. Description" {
-		t.Errorf("got %q, want %q", got, "A. Description")
-	}
-}
-
-// ---------------------------------------------------------------------------
-// splitLines
-// ---------------------------------------------------------------------------
-
-func TestSplitLines_Basic(t *testing.T) {
-	got := splitLines("a\nb\nc")
-	want := []string{"a", "b", "c"}
-	if len(got) != len(want) {
-		t.Fatalf("len=%d, want %d", len(got), len(want))
-	}
-	for i := range want {
-		if got[i] != want[i] {
-			t.Errorf("got[%d]=%q, want %q", i, got[i], want[i])
-		}
-	}
-}
-
-func TestSplitLines_TrailingNewline(t *testing.T) {
-	got := splitLines("line1\nline2\n")
-	want := []string{"line1", "line2"}
-	if len(got) != len(want) {
-		t.Errorf("trailing newline: got %v, want %v", got, want)
-	}
-}
-
-func TestSplitLines_NoNewline(t *testing.T) {
-	got := splitLines("no newline")
-	want := []string{"no newline"}
-	if len(got) != 1 || got[0] != want[0] {
-		t.Errorf("got %v, want %v", got, want)
-	}
-}
-
-func TestSplitLines_EmptyString(t *testing.T) {
-	got := splitLines("")
-	if len(got) != 0 {
-		t.Errorf("empty string: got %v, want []", got)
-	}
-}
-
-func TestSplitLines_OnlyNewlines(t *testing.T) {
-	got := splitLines("\n\n\n")
-	// Three consecutive '\n' characters → s[start:i] at each '\n' gives
-	// the empty string between newlines → 3 empty segments.
-	// (No trailing segment because start == len(s) at the end.)
-	if len(got) != 3 {
-		t.Errorf("only newlines: got %v (len=%d), want 3 empty strings", got, len(got))
-	}
-	for i, s := range got {
-		if s != "" {
-			t.Errorf("got[%d]=%q, want empty string", i, s)
-		}
-	}
-}
-
-func TestSplitLines_MultipleConsecutiveNewlines(t *testing.T) {
-	got := splitLines("a\n\n\nb")
-	// a\n\n\nb → ["a", "", "", "b"]
-	if len(got) != 4 {
-		t.Errorf("consecutive newlines: got %v (len=%d)", got, len(got))
-	}
-	if got[0] != "a" || got[3] != "b" {
-		t.Errorf("first/last: got %v, want [a, ..., b]", got)
-	}
-}
-
-// ---------------------------------------------------------------------------
-// findConfigDir
-// ---------------------------------------------------------------------------
-
-func TestFindConfigDir_NameMatch(t *testing.T) {
-	tmp := t.TempDir()
-
-	// Create two sub-dirs; only the one with matching name should be found.
-	mustMkdir(filepath.Join(tmp, "workspace-a"))
-	mustWrite(filepath.Join(tmp, "workspace-a", "config.yaml"),
-		"name: other-workspace\ntier: 1\n")
-
-	mustMkdir(filepath.Join(tmp, "workspace-b"))
-	mustWrite(filepath.Join(tmp, "workspace-b", "config.yaml"),
-		"name: target-workspace\nruntime: claude-code\n")
-
-	got := findConfigDir(tmp, "target-workspace")
-	want := filepath.Join(tmp, "workspace-b")
-	if got != want {
-		t.Errorf("got %q, want %q", got, want)
-	}
-}
-
-func TestFindConfigDir_NoMatch_UsesFallback(t *testing.T) {
-	tmp := t.TempDir()
-
-	mustMkdir(filepath.Join(tmp, "first"))
-	mustWrite(filepath.Join(tmp, "first", "config.yaml"), "name: workspace-a\n")
-
-	mustMkdir(filepath.Join(tmp, "second"))
-	mustWrite(filepath.Join(tmp, "second", "config.yaml"), "name: workspace-b\n")
-
-	// No exact name match → fallback to the first directory with a config.yaml.
-	got := findConfigDir(tmp, "nonexistent")
-	want := filepath.Join(tmp, "first")
-	if got != want {
-		t.Errorf("no match: got %q, want fallback %q", got, want)
-	}
-}
-
-func TestFindConfigDir_MissingDir(t *testing.T) {
-	got := findConfigDir("/nonexistent/path/for/findConfigDir", "any-name")
-	if got != "" {
-		t.Errorf("missing dir: got %q, want empty string", got)
-	}
-}
-
-func TestFindConfigDir_NoSubdirs(t *testing.T) {
-	tmp := t.TempDir()
-	// Empty directory → no matches, no fallback.
-	got := findConfigDir(tmp, "any")
-	if got != "" {
-		t.Errorf("empty dir: got %q, want empty string", got)
-	}
-}
-
-// ---------------------------------------------------------------------------
-// Helpers
-// ---------------------------------------------------------------------------
-
-func mustMkdir(path string) {
-	os.MkdirAll(path, 0o755)
-}
-
-func mustWrite(path, content string) {
-	os.WriteFile(path, []byte(content), 0o644)
-}
-
-// ---------------------------------------------------------------------------
-// findConfigDir
-// ---------------------------------------------------------------------------
-
-func TestFindConfigDir_SubdirWithoutConfig(t *testing.T) {
-	tmp := t.TempDir()
-	mustMkdir(filepath.Join(tmp, "empty-skill"))
-	// Sub-dir without config.yaml → skipped.
-	got := findConfigDir(tmp, "any")
-	if got != "" {
-		t.Errorf("no config.yaml: got %q, want empty string", got)
-	}
-}
-
-func TestFindConfigDir_FirstWithConfigIsFallback(t *testing.T) {
-	// When name doesn't match, fallback is the FIRST dir with config.yaml,
-	// not the last. Confirm ordering by creating three dirs.
-	tmp := t.TempDir()
-
-	mustMkdir(filepath.Join(tmp, "a"))
-	mustWrite(filepath.Join(tmp, "a", "config.yaml"), "name: alpha\n")
-
-	mustMkdir(filepath.Join(tmp, "b"))
-	mustWrite(filepath.Join(tmp, "b", "config.yaml"), "name: beta\n")
-
-	mustMkdir(filepath.Join(tmp, "c"))
-	mustWrite(filepath.Join(tmp, "c", "config.yaml"), "name: gamma\n")
-
-	got := findConfigDir(tmp, "nonexistent")
-	want := filepath.Join(tmp, "a") // first dir with config.yaml
-	if got != want {
-		t.Errorf("fallback order: got %q, want first-with-config %q", got, want)
-	}
-}

workspace-server/internal/bundle/importer_test.go

@@ -1,157 +0,0 @@
-package bundle
-
-import (
-	"testing"
-)
-
-func TestBuildBundleConfigFiles_emptyBundle(t *testing.T) {
-	b := &Bundle{}
-	files := buildBundleConfigFiles(b)
-	if len(files) != 0 {
-		t.Errorf("expected empty map for empty bundle, got %d entries", len(files))
-	}
-}
-
-func TestBuildBundleConfigFiles_systemPrompt(t *testing.T) {
-	b := &Bundle{SystemPrompt: "You are a helpful assistant."}
-	files := buildBundleConfigFiles(b)
-	if len(files) != 1 {
-		t.Fatalf("expected 1 file, got %d", len(files))
-	}
-	if string(files["system-prompt.md"]) != "You are a helpful assistant." {
-		t.Errorf("unexpected system prompt content: %q", files["system-prompt.md"])
-	}
-}
-
-func TestBuildBundleConfigFiles_configYaml(t *testing.T) {
-	b := &Bundle{Prompts: map[string]string{
-		"config.yaml": "runtime: langgraph\nmodel: claude-sonnet-4-20250514\n",
-	}}
-	files := buildBundleConfigFiles(b)
-	if len(files) != 1 {
-		t.Fatalf("expected 1 file, got %d", len(files))
-	}
-	if string(files["config.yaml"]) != "runtime: langgraph\nmodel: claude-sonnet-4-20250514\n" {
-		t.Errorf("unexpected config.yaml content: %q", files["config.yaml"])
-	}
-}
-
-func TestBuildBundleConfigFiles_systemPromptAndConfigYaml(t *testing.T) {
-	b := &Bundle{
-		SystemPrompt: "# System",
-		Prompts:     map[string]string{"config.yaml": "runtime: langgraph"},
-	}
-	files := buildBundleConfigFiles(b)
-	if len(files) != 2 {
-		t.Fatalf("expected 2 files, got %d", len(files))
-	}
-	if _, ok := files["system-prompt.md"]; !ok {
-		t.Error("missing system-prompt.md")
-	}
-	if _, ok := files["config.yaml"]; !ok {
-		t.Error("missing config.yaml")
-	}
-}
-
-func TestBuildBundleConfigFiles_skills(t *testing.T) {
-	b := &Bundle{
-		Skills: []BundleSkill{
-			{
-				ID:          "web-search",
-				Name:        "Web Search",
-				Description: "Search the web",
-				Files:       map[string]string{"readme.md": "# Web Search"},
-			},
-			{
-				ID:          "code-runner",
-				Name:        "Code Runner",
-				Description: "Execute code",
-				Files:       map[string]string{"handler.py": "print('hello')"},
-			},
-		},
-	}
-	files := buildBundleConfigFiles(b)
-	if len(files) != 2 {
-		t.Fatalf("expected 2 skill files, got %d", len(files))
-	}
-
-	if content, ok := files["skills/web-search/readme.md"]; !ok {
-		t.Error("missing skills/web-search/readme.md")
-	} else if string(content) != "# Web Search" {
-		t.Errorf("unexpected readme.md: %q", content)
-	}
-
-	if _, ok := files["skills/code-runner/handler.py"]; !ok {
-		t.Error("missing skills/code-runner/handler.py")
-	}
-}
-
-func TestBuildBundleConfigFiles_skillsWithSubPaths(t *testing.T) {
-	b := &Bundle{
-		Skills: []BundleSkill{
-			{
-				ID:    "nested-skill",
-				Files: map[string]string{"src/main.py": "def main(): pass", "pyproject.toml": "[tool.foo]"},
-			},
-		},
-	}
-	files := buildBundleConfigFiles(b)
-	if len(files) != 2 {
-		t.Fatalf("expected 2 files, got %d", len(files))
-	}
-	if _, ok := files["skills/nested-skill/src/main.py"]; !ok {
-		t.Error("missing skills/nested-skill/src/main.py")
-	}
-	if _, ok := files["skills/nested-skill/pyproject.toml"]; !ok {
-		t.Error("missing skills/nested-skill/pyproject.toml")
-	}
-}
-
-func TestBuildBundleConfigFiles_skipsEmptyPrompts(t *testing.T) {
-	b := &Bundle{Prompts: map[string]string{}}
-	files := buildBundleConfigFiles(b)
-	if len(files) != 0 {
-		t.Errorf("expected 0 files for empty prompts map, got %d", len(files))
-	}
-}
-
-func TestBuildBundleConfigFiles_skipsMissingConfigYaml(t *testing.T) {
-	b := &Bundle{
-		SystemPrompt: "# My Prompt",
-		Prompts:      map[string]string{"other.yaml": "something: else"},
-	}
-	files := buildBundleConfigFiles(b)
-	if len(files) != 1 {
-		t.Fatalf("expected 1 file (system-prompt only), got %d", len(files))
-	}
-	if _, ok := files["config.yaml"]; ok {
-		t.Error("config.yaml should not be written when not in Prompts")
-	}
-}
-
-func TestNilIfEmpty_emptyString(t *testing.T) {
-	result := nilIfEmpty("")
-	if result != nil {
-		t.Errorf("expected nil for empty string, got %v", result)
-	}
-}
-
-func TestNilIfEmpty_nonEmptyString(t *testing.T) {
-	result := nilIfEmpty("hello")
-	if result == nil {
-		t.Fatal("expected non-nil result for non-empty string")
-	}
-	if result != "hello" {
-		t.Errorf("expected hello, got %q", result)
-	}
-}
-
-func TestNilIfEmpty_whitespaceString(t *testing.T) {
-	// Whitespace is not empty — nilIfEmpty only checks for zero-length
-	result := nilIfEmpty("   ")
-	if result == nil {
-		t.Error("expected non-nil for whitespace string")
-	} else if result != "   " {
-		t.Errorf("expected '   ', got %q", result)
-	}
-}

workspace-server/internal/handlers/a2a_proxy.go

@@ -512,13 +512,6 @@ func (h *WorkspaceHandler) proxyA2ARequest(ctx context.Context, workspaceID stri
 
 	if logActivity {
 		h.logA2ASuccess(ctx, workspaceID, callerID, body, respBody, a2aMethod, resp.StatusCode, durationMs)
-		// Fix #376: when the proxied method is 'delegate_result', also write
-		// the delegation row so heartbeat delegation polling can find it.
-		// Without this, proxy-path delegation results are invisible to
-		// ListDelegations / heartbeat delegation polling.
-		if a2aMethod == "delegate_result" {
-			h.logA2ADelegationResult(ctx, workspaceID, callerID, body, respBody, resp.StatusCode)
-		}
 	}
 
 	// Track LLM token usage for cost transparency (#593).

workspace-server/internal/handlers/a2a_proxy_helpers.go

@@ -336,93 +336,6 @@ func (h *WorkspaceHandler) logA2ASuccess(ctx context.Context, workspaceID, calle
 	}
 }
 
-// logA2ADelegationResult records a delegation result into activity_logs
-// with method='delegate_result' and activity_type='delegation' so that
-// ListDelegations (and therefore the heartbeat delegation-polling path)
-// can surface it to the caller.
-//
-// This bridges the gap for proxy-path delegations: when a workspace
-// sends a delegate_task via POST /workspaces/:id/a2a, the proxy stores
-// the response here with the correct method so heartbeat polling finds it.
-// (The non-proxy path via executeDelegation already writes correctly via
-// its own INSERT at delegation.go:422.)
-//
-// Fire-and-forget: runs in a goroutine so it never adds latency to the
-// critical A2A response path. Errors are logged but non-fatal.
-func (h *WorkspaceHandler) logA2ADelegationResult(ctx context.Context, callerID, targetID string, reqBody, respBody []byte, statusCode int) {
-	// Extract delegation_id from the request body (JSON-RPC delegate_result).
-	var req struct {
-		Params struct {
-			Data struct {
-				DelegationID string `json:"delegation_id"`
-			} `json:"data"`
-		} `json:"params"`
-	}
-	if err := json.Unmarshal(reqBody, &req); err != nil {
-		log.Printf("logA2ADelegationResult: failed to parse req body: %v", err)
-		return
-	}
-	delegationID := req.Params.Data.DelegationID
-	if delegationID == "" {
-		log.Printf("logA2ADelegationResult: no delegation_id in request body")
-		return
-	}
-
-	// Extract text from the response body — the delegate_result response
-	// carries the agent's answer in result.data.text or result.text.
-	var responseText string
-	var respTop map[string]json.RawMessage
-	if json.Unmarshal(respBody, &respTop) == nil {
-		if result, ok := respTop["result"]; ok {
-			var resultObj map[string]json.RawMessage
-			if json.Unmarshal(result, &resultObj) == nil {
-				if textRaw, ok := resultObj["text"]; ok {
-					json.Unmarshal(textRaw, &responseText)
-				} else if dataRaw, ok := resultObj["data"]; ok {
-					var dataObj map[string]json.RawMessage
-					if json.Unmarshal(dataRaw, &dataObj) == nil {
-						if textRaw, ok := dataObj["text"]; ok {
-							json.Unmarshal(textRaw, &responseText)
-						}
-					}
-				}
-			}
-		}
-		if responseText == "" {
-			if textRaw, ok := respTop["text"]; ok {
-				json.Unmarshal(textRaw, &responseText)
-			}
-		}
-	}
-
-	status := "completed"
-	if statusCode >= 300 {
-		status = "failed"
-	}
-
-	summary := "Delegation completed"
-	if status == "failed" {
-		summary = "Delegation failed"
-	}
-
-	go func(parent context.Context) {
-		logCtx, cancel := context.WithTimeout(context.WithoutCancel(parent), 30*time.Second)
-		defer cancel()
-		respJSON, _ := json.Marshal(map[string]interface{}{
-			"text":          responseText,
-			"delegation_id": delegationID,
-		})
-		if _, err := db.DB.ExecContext(logCtx, `
-			INSERT INTO activity_logs (
-				workspace_id, activity_type, method, source_id, target_id,
-				summary, request_body, response_body, status
-			) VALUES ($1, 'delegation', 'delegate_result', $2, $3, $4, $5::jsonb, $6::jsonb, $7)
-		`, callerID, callerID, targetID, summary, string(reqBody), string(respJSON), status); err != nil {
-			log.Printf("logA2ADelegationResult: INSERT failed for delegation %s: %v", delegationID, err)
-		}
-	}(ctx)
-}
-
 func nilIfEmpty(s string) *string {
 	if s == "" {
 		return nil

workspace-server/internal/handlers/a2a_proxy_helpers_test.go

@@ -1,163 +0,0 @@
-package handlers
-
-// a2a_proxy_helpers_test.go — unit tests for extractToolTrace (the only
-// untested pure function in a2a_proxy_helpers.go). The function parses JSON
-// so tests use real JSON without any DB or HTTP mocking.
-
-import (
-	"encoding/json"
-	"testing"
-
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
-)
-
-// TestExtractToolTrace_HappyPath verifies that a well-formed JSON-RPC result
-// with a metadata.tool_trace field returns it as json.RawMessage.
-func TestExtractToolTrace_HappyPath(t *testing.T) {
-	trace := json.RawMessage(`[{"tool":"bash","input":"ls"}]`)
-	resp := map[string]interface{}{
-		"result": map[string]interface{}{
-			"metadata": map[string]interface{}{
-				"tool_trace": trace,
-			},
-		},
-	}
-	body, _ := json.Marshal(resp)
-	got := extractToolTrace(body)
-	if got == nil {
-		t.Fatal("extractToolTrace returned nil, expected the trace")
-	}
-	var parsed []map[string]interface{}
-	if err := json.Unmarshal(got, &parsed); err != nil {
-		t.Fatalf("returned value is not valid JSON: %v", err)
-	}
-	if len(parsed) != 1 || parsed[0]["tool"] != "bash" {
-		t.Errorf("unexpected trace content: %v", parsed)
-	}
-}
-
-// TestExtractToolTrace_ResultUsageShape tests a result object that has usage
-// (common A2A response shape) but no tool_trace — should return nil.
-func TestExtractToolTrace_ResultHasUsageNoTrace(t *testing.T) {
-	resp := map[string]interface{}{
-		"result": map[string]interface{}{
-			"metadata": map[string]interface{}{
-				"usage": map[string]int64{"input_tokens": 100, "output_tokens": 200},
-			},
-		},
-	}
-	body, _ := json.Marshal(resp)
-	if got := extractToolTrace(body); got != nil {
-		t.Errorf("expected nil when no tool_trace, got: %s", string(got))
-	}
-}
-
-// TestExtractToolTrace_NoResultKey verifies that a response without a "result"
-// key returns nil.
-func TestExtractToolTrace_NoResultKey(t *testing.T) {
-	resp := map[string]interface{}{
-		"error": map[string]string{"code": "-32600", "message": "Invalid Request"},
-	}
-	body, _ := json.Marshal(resp)
-	if got := extractToolTrace(body); got != nil {
-		t.Errorf("expected nil for error response, got: %s", string(got))
-	}
-}
-
-// TestExtractToolTrace_ResultNotAnObject verifies that a result that is not
-// a JSON object (e.g., null) returns nil without panicking.
-func TestExtractToolTrace_ResultNotAnObject(t *testing.T) {
-	body := []byte(`{"result": null}`)
-	if got := extractToolTrace(body); got != nil {
-		t.Errorf("expected nil for null result, got: %s", string(got))
-	}
-}
-
-// TestExtractToolTrace_NoMetadata verifies that a result object without
-// metadata returns nil.
-func TestExtractToolTrace_NoMetadata(t *testing.T) {
-	resp := map[string]interface{}{
-		"result": map[string]interface{}{
-			"message": "hello",
-		},
-	}
-	body, _ := json.Marshal(resp)
-	if got := extractToolTrace(body); got != nil {
-		t.Errorf("expected nil for result without metadata, got: %s", string(got))
-	}
-}
-
-// TestExtractToolTrace_MetadataNotAnObject verifies that a metadata field that
-// is not a JSON object returns nil without panicking.
-func TestExtractToolTrace_MetadataNotAnObject(t *testing.T) {
-	resp := map[string]interface{}{
-		"result": map[string]interface{}{
-			"metadata": "not an object",
-		},
-	}
-	body, _ := json.Marshal(resp)
-	if got := extractToolTrace(body); got != nil {
-		t.Errorf("expected nil for non-object metadata, got: %s", string(got))
-	}
-}
-
-// TestExtractToolTrace_TraceIsEmptyArray verifies that an empty tool_trace
-// array ([]) returns nil (length 0).
-func TestExtractToolTrace_TraceIsEmptyArray(t *testing.T) {
-	resp := map[string]interface{}{
-		"result": map[string]interface{}{
-			"metadata": map[string]interface{}{
-				"tool_trace": []interface{}{},
-			},
-		},
-	}
-	body, _ := json.Marshal(resp)
-	if got := extractToolTrace(body); got != nil {
-		t.Errorf("expected nil for empty tool_trace, got: %s", string(got))
-	}
-}
-
-// TestExtractToolTrace_NonJSONBody verifies that a completely non-JSON body
-// returns nil without panicking.
-func TestExtractToolTrace_NonJSONBody(t *testing.T) {
-	body := []byte("this is not json at all")
-	if got := extractToolTrace(body); got != nil {
-		t.Errorf("expected nil for non-JSON body, got: %s", string(got))
-	}
-}
-
-// TestExtractToolTrace_EmptyBody verifies that an empty body returns nil.
-func TestExtractToolTrace_EmptyBody(t *testing.T) {
-	if got := extractToolTrace(nil); got != nil {
-		t.Errorf("expected nil for nil body, got: %s", string(got))
-	}
-	if got := extractToolTrace([]byte{}); got != nil {
-		t.Errorf("expected nil for empty body, got: %s", string(got))
-	}
-}
-
-// TestExtractToolTrace_ResultMetadataIsNotObject verifies that when
-// metadata exists but is not a JSON object (string), nil is returned.
-func TestExtractToolTrace_MetadataIsString(t *testing.T) {
-	body := []byte(`{"result":{"metadata":"oops"}}`)
-	if got := extractToolTrace(body); got != nil {
-		t.Errorf("expected nil for string metadata, got: %s", string(got))
-	}
-}
-
-// TestNilIfEmpty_Contract exercises the contract of nilIfEmpty so future
-// refactors can't silently break the call-sites in a2a_proxy_helpers.go.
-func TestNilIfEmpty_Contract(t *testing.T) {
-	if r := nilIfEmpty(""); r != nil {
-		t.Errorf("nilIfEmpty(\"\") = %p, want nil", r)
-	}
-	if r := nilIfEmpty("hello"); r == nil {
-		t.Fatal("nilIfEmpty(\"hello\") returned nil, want pointer to string")
-	} else if *r != "hello" {
-		t.Errorf("nilIfEmpty(\"hello\") = %q, want \"hello\"", *r)
-	}
-}
-
-// Suppress unused import warning — setupTestDB references db.DB but this file
-// only tests pure functions, so db is only needed transitively through helpers.
-var _ = db.DB

workspace-server/internal/handlers/a2a_proxy_test.go

@@ -2017,131 +2017,6 @@ func TestLogA2ASuccess_ErrorStatus(t *testing.T) {
 	time.Sleep(80 * time.Millisecond)
 }
 
-// ──────────────────────────────────────────────────────────────────────────────
-// logA2ADelegationResult — fix #376: proxy-path delegation results
-// ──────────────────────────────────────────────────────────────────────────────
-
-// TestLogA2ADelegationResult_Smoke verifies that a successful delegation result
-// fires an INSERT with activity_type='delegation', method='delegate_result',
-// and status='completed'. The response text is extracted from result.data.text.
-func TestLogA2ADelegationResult_Smoke(t *testing.T) {
-	mock := setupTestDB(t)
-	setupTestRedis(t)
-	handler := NewWorkspaceHandler(newTestBroadcaster(), nil, "http://localhost:8080", t.TempDir())
-
-	// logA2ADelegationResult has no SELECT for workspace name (unlike logA2ASuccess).
-	// It fires the INSERT directly in a goroutine.
-	mock.ExpectExec(`^INSERT INTO activity_logs`).
-		WithArgs(
-			"ws-caller",                  // workspace_id  ($1)
-			"ws-caller",                  // source_id     ($2)
-			"ws-target",                  // target_id     ($3)
-			"Delegation completed",       // summary       ($4)
-			sqlmock.AnyArg(),             // request_body  ($5)
-			sqlmock.AnyArg(),             // response_body ($6)
-			"completed",                  // status        ($7)
-		).
-		WillReturnResult(sqlmock.NewResult(0, 1))
-
-	handler.logA2ADelegationResult(
-		context.Background(),
-		"ws-caller", "ws-target",
-		[]byte(`{"method":"delegate_task","params":{"data":{"delegation_id":"del-abc123"}}}`),
-		[]byte(`{"jsonrpc":"2.0","id":"1","result":{"data":{"text":"the answer"}}}`),
-		200,
-	)
-	time.Sleep(80 * time.Millisecond)
-
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet expectations: %v", err)
-	}
-}
-
-// TestLogA2ADelegationResult_FailedStatus verifies that a 4xx/5xx response
-// from the target is recorded with status='failed' and summary='Delegation failed'.
-func TestLogA2ADelegationResult_FailedStatus(t *testing.T) {
-	mock := setupTestDB(t)
-	setupTestRedis(t)
-	handler := NewWorkspaceHandler(newTestBroadcaster(), nil, "http://localhost:8080", t.TempDir())
-
-	mock.ExpectExec(`^INSERT INTO activity_logs`).
-		WithArgs(
-			"ws-a", "ws-a", "ws-b",
-			"Delegation failed",
-			sqlmock.AnyArg(),
-			sqlmock.AnyArg(),
-			"failed",
-		).
-		WillReturnResult(sqlmock.NewResult(0, 1))
-
-	handler.logA2ADelegationResult(
-		context.Background(),
-		"ws-a", "ws-b",
-		[]byte(`{"method":"delegate_task","params":{"data":{"delegation_id":"del-xyz"}}}`),
-		[]byte(`{"jsonrpc":"2.0","id":"2","error":{"code":-32600,"message":"bad request"}}`),
-		400,
-	)
-	time.Sleep(80 * time.Millisecond)
-
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet expectations: %v", err)
-	}
-}
-
-// TestLogA2ADelegationResult_NoDelegationID skips the INSERT when the
-// request body carries no delegation_id (logically impossible but defensive).
-func TestLogA2ADelegationResult_NoDelegationID(t *testing.T) {
-	mock := setupTestDB(t)
-	setupTestRedis(t)
-	handler := NewWorkspaceHandler(newTestBroadcaster(), nil, "http://localhost:8080", t.TempDir())
-
-	// No ExpectExec — the function must return early without any DB write.
-
-	handler.logA2ADelegationResult(
-		context.Background(),
-		"ws-x", "ws-y",
-		[]byte(`{"method":"delegate_task","params":{"data":{}}}`),
-		[]byte(`{}`),
-		200,
-	)
-	time.Sleep(80 * time.Millisecond)
-
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unexpected DB call: %v", err)
-	}
-}
-
-// TestLogA2ADelegationResult_TextFromResultText verifies that when the
-// response text lives at result.text (flat JSON-RPC), it is still captured.
-func TestLogA2ADelegationResult_TextFromResultText(t *testing.T) {
-	mock := setupTestDB(t)
-	setupTestRedis(t)
-	handler := NewWorkspaceHandler(newTestBroadcaster(), nil, "http://localhost:8080", t.TempDir())
-
-	mock.ExpectExec(`^INSERT INTO activity_logs`).
-		WithArgs(
-			"ws-1", "ws-1", "ws-2",
-			"Delegation completed",
-			sqlmock.AnyArg(),
-			sqlmock.AnyArg(),
-			"completed",
-		).
-		WillReturnResult(sqlmock.NewResult(0, 1))
-
-	handler.logA2ADelegationResult(
-		context.Background(),
-		"ws-1", "ws-2",
-		[]byte(`{"method":"delegate_task","params":{"data":{"delegation_id":"del-flat"}}}`),
-		[]byte(`{"jsonrpc":"2.0","id":"3","result":{"text":"flat response"}}`),
-		200,
-	)
-	time.Sleep(80 * time.Millisecond)
-
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet expectations: %v", err)
-	}
-}
-
 // ──────────────────────────────────────────────────────────────────────────────
 // A2A auto-wake: hibernated workspace (#711)
 // ──────────────────────────────────────────────────────────────────────────────

workspace-server/internal/handlers/github_token.go

@@ -49,7 +49,6 @@ import (
 	"net/http"
 	"os"
 	"strconv"
-	"strings"
 	"time"
 
 	"github.com/Molecule-AI/molecule-monorepo/platform/pkg/provisionhook"
@@ -99,17 +98,7 @@ func (h *GitHubTokenHandler) GetInstallationToken(c *gin.Context) {
 		token, expiresAt, err := generateAppInstallationToken()
 		if err != nil {
 			log.Printf("[github] fallback token generation failed: %v", err)
-			// #388: GITHUB_APP_ID/INSTALLATION_ID unset → Gitea-canonical deployment
-			// or suspended org. Return 501 so callers (credential helper / gh auth)
-			// know this is not-implemented vs a transient error.
-			if strings.Contains(err.Error(), "required") {
-				c.JSON(http.StatusNotImplemented, gin.H{
-					"error": "GitHub integration not configured",
-					"scm":   "gitea",
-				})
-			} else {
-				c.JSON(http.StatusInternalServerError, gin.H{"error": "token refresh failed"})
-			}
+			c.JSON(http.StatusInternalServerError, gin.H{"error": "token refresh failed"})
 			return
 		}
 		c.JSON(http.StatusOK, gin.H{"token": token, "expires_at": expiresAt})

workspace-server/internal/handlers/github_token_test.go

@@ -78,12 +78,11 @@ func TestGitHubToken_NilRegistry(t *testing.T) {
 // Post-#960/#1101 the handler now falls back to direct env-based App
 // token generation (GITHUB_APP_ID / INSTALLATION_ID / PRIVATE_KEY_FILE)
 // when no registered provider matches. In the test environment those
-// env vars are unset, so the fallback fails with 501 "not implemented"
-// with scm:"gitea" — signals a Gitea-canonical or suspended-org
-// deployment where GitHub integration is not configured (#388).
-// Previously this path returned 404; 501 distinguishes "not configured"
-// (caller should stop retrying) from "provider failed" (caller should
-// retry with back-off).
+// env vars are unset, so the fallback fails with 500 "token refresh
+// failed" — a clean retryable signal for the workspace credential
+// helper. Previously this path returned 404; the new 500 matches the
+// ProviderError shape so callers don't have to branch on "missing
+// provider" vs "provider failed".
 func TestGitHubToken_NoTokenProvider(t *testing.T) {
 	reg := provisionhook.NewRegistry()
 	reg.Register(&mockMutatorOnly{name: "other-plugin"})
@@ -92,15 +91,12 @@ func TestGitHubToken_NoTokenProvider(t *testing.T) {
 
 	h.GetInstallationToken(c)
 
-	if w.Code != http.StatusNotImplemented {
-		t.Fatalf("expected 501 (env-based fallback fails with unset GITHUB_APP_* vars), got %d: %s",
+	if w.Code != http.StatusInternalServerError {
+		t.Fatalf("expected 500 (env-based fallback fails with unset GITHUB_APP_* vars), got %d: %s",
 			w.Code, w.Body.String())
 	}
-	if !strings.Contains(w.Body.String(), "GitHub integration not configured") {
-		t.Errorf("expected body to contain 'GitHub integration not configured', got: %s", w.Body.String())
-	}
-	if !strings.Contains(w.Body.String(), `"scm":"gitea"`) {
-		t.Errorf("expected body to contain 'scm:gitea', got: %s", w.Body.String())
+	if !strings.Contains(w.Body.String(), "token refresh failed") {
+		t.Errorf("expected body to contain 'token refresh failed', got: %s", w.Body.String())
 	}
 }
 

workspace-server/internal/handlers/instructions_test.go

@@ -2,6 +2,7 @@ package handlers
 
 import (
 	"bytes"
+	"database/sql"
 	"encoding/json"
 	"errors"
 	"net/http"
@@ -596,6 +597,7 @@ func TestInstructionsResolve_GlobalThenWorkspace(t *testing.T) {
 	c.Params = []gin.Param{{Key: "id", Value: wsID}}
 	c.Request = httptest.NewRequest(http.MethodGet, "/workspaces/"+wsID+"/instructions/resolve", nil)
 
+	now := time.Now()
 	rows := sqlmock.NewRows(resolveCols).
 		AddRow("global", "Be Helpful", "Always help the user.").
 		AddRow("global", "Stay on Topic", "Don't diverge.").
@@ -710,10 +712,19 @@ func TestInstructionsResolve_MissingWorkspaceID(t *testing.T) {
 
 // ─── scanInstructions edge cases ───────────────────────────────────────────────
 
-// NOTE: TestScanInstructions_ScanError was removed — go-sqlmock v1.5.2 does not
-// implement Go 1.25's sql.Rows.Next([]byte) bool method, so *sqlmock.Rows cannot
-// satisfy scanInstructions' interface. The test needs a sqlmock upgrade or a
-// different mocking strategy (tracked: internal issue).
+func TestScanInstructions_ScanError(t *testing.T) {
+	// A mock rows object that returns a scan error on second row.
+	badRows := sqlmock.NewRows(instructionCols).
+		AddRow("inst-ok", "global", nil, "OK", "OK content", 10, true, time.Now(), time.Now()).
+		RowError(1, errors.New("scan error")).
+		AddRow("inst-bad", "global", nil, "Bad", "Bad content", 5, true, time.Now(), time.Now())
+
+	result := scanInstructions(badRows)
+	// First row should be captured; scan error is logged and skipped.
+	if len(result) != 1 || result[0].ID != "inst-ok" {
+		t.Errorf("expected 1 instruction (inst-ok), got: %v", result)
+	}
+}
 
 // ─── maxInstructionContentLen boundary ────────────────────────────────────────
 

workspace-server/internal/handlers/org_helpers.go

@@ -91,11 +91,6 @@ func expandWithEnv(s string, env map[string]string) string {
 // loadWorkspaceEnv reads the org root .env and the workspace-specific .env
 // (workspace overrides org root). Used by both secret injection and channel
 // config expansion.
-//
-// CWE-22 mitigation: filesDir is validated through resolveInsideRoot so a
-// malicious org YAML cannot escape the org root with "../../../etc". Both
-// call sites already guard ws.FilesDir, but the internal guard is the
-// reliable enforcement point regardless of caller.
 func loadWorkspaceEnv(orgBaseDir, filesDir string) map[string]string {
 	envVars := map[string]string{}
 	if orgBaseDir == "" {
@@ -103,12 +98,7 @@ func loadWorkspaceEnv(orgBaseDir, filesDir string) map[string]string {
 	}
 	parseEnvFile(filepath.Join(orgBaseDir, ".env"), envVars)
 	if filesDir != "" {
-		// resolveInsideRoot returns the joined absolute path — use it directly.
-		safeFilesDir, err := resolveInsideRoot(orgBaseDir, filesDir)
-		if err != nil {
-			return envVars // silently reject traversal attempts
-		}
-		parseEnvFile(filepath.Join(safeFilesDir, ".env"), envVars)
+		parseEnvFile(filepath.Join(orgBaseDir, filesDir, ".env"), envVars)
 	}
 	return envVars
 }
@@ -327,12 +317,6 @@ func mergePlugins(defaultPlugins, wsPlugins []string) []string {
 // Follows Go's standard pattern for SSRF-class path sanitization; using
 // strings.HasPrefix on an absolute-path pair plus the separator guard rejects
 // sibling directories that share a prefix (e.g. "/foo" vs "/foobar").
-//
-// CWE-59 mitigation: filepath.Abs does NOT resolve symlinks, so a path like
-// "workspaces/dev/inner" where "inner" is a symlink to "/etc" would lexically
-// pass the prefix check. We call filepath.EvalSymlinks to canonicalize the
-// path and re-check that it is still inside root. This closes the symlink-
-// based traversal vector (CWE-59, follow-up to #369).
 func resolveInsideRoot(root, userPath string) (string, error) {
 	if userPath == "" {
 		return "", fmt.Errorf("path is empty")
@@ -349,18 +333,9 @@ func resolveInsideRoot(root, userPath string) (string, error) {
 	if err != nil {
 		return "", fmt.Errorf("joined abs: %w", err)
 	}
-	// CWE-59: resolve symlinks before final prefix check.
-	// If the path contains a symlink pointing outside root, EvalSymlinks
-	// will canonicalize to the external path and fail the guard below.
-	resolved, err := filepath.EvalSymlinks(absJoined)
-	if err != nil {
-		// If EvalSymlinks fails (e.g. broken symlink), fail closed —
-		// broken symlinks should not be used as org files.
-		return "", fmt.Errorf("resolve symlink: %w", err)
-	}
 	// Allow exact-root match (rare but valid) and any descendant.
-	if resolved != absRoot && !strings.HasPrefix(resolved, absRoot+string(filepath.Separator)) {
+	if absJoined != absRoot && !strings.HasPrefix(absJoined, absRoot+string(filepath.Separator)) {
 		return "", fmt.Errorf("path escapes root")
 	}
-	return absJoined, nil // return the lexical path, not the resolved one
+	return absJoined, nil
 }

workspace-server/internal/handlers/org_helpers_loadWorkspaceEnv_test.go

@@ -1,126 +0,0 @@
-package handlers
-
-import (
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-// setupOrgEnv creates a temp dir with an optional org .env file and returns the dir.
-func setupOrgEnv(t *testing.T, orgEnvContent string) string {
-	t.Helper()
-	dir := t.TempDir()
-	if orgEnvContent != "" {
-		require.NoError(t, os.WriteFile(filepath.Join(dir, ".env"), []byte(orgEnvContent), 0o600))
-	}
-	return dir
-}
-
-func Test_loadWorkspaceEnv_orgRootOnly(t *testing.T) {
-	org := setupOrgEnv(t, "ORG_VAR=orgval\nORG_DEBUG=true")
-	vars := loadWorkspaceEnv(org, "")
-	assert.Equal(t, "orgval", vars["ORG_VAR"])
-	assert.Equal(t, "true", vars["ORG_DEBUG"])
-}
-
-func Test_loadWorkspaceEnv_orgRootMissing(t *testing.T) {
-	// No .env at org root — should return empty map without error.
-	dir := t.TempDir()
-	vars := loadWorkspaceEnv(dir, "")
-	assertEmpty(t, vars)
-}
-
-func Test_loadWorkspaceEnv_workspaceEnvMerges(t *testing.T) {
-	org := setupOrgEnv(t, "SHARED=sharedval\nORG_ONLY=orgonly")
-	wsDir := filepath.Join(org, "myworkspace")
-	require.NoError(t, os.MkdirAll(wsDir, 0o700))
-	require.NoError(t, os.WriteFile(filepath.Join(wsDir, ".env"), []byte("WS_VAR=wsval\nSHARED=overridden"), 0o600))
-
-	vars := loadWorkspaceEnv(org, "myworkspace")
-	assert.Equal(t, "wsval", vars["WS_VAR"])
-	assert.Equal(t, "overridden", vars["SHARED"]) // workspace overrides org
-	assert.Equal(t, "orgonly", vars["ORG_ONLY"])   // org vars preserved
-}
-
-func Test_loadWorkspaceEnv_emptyFilesDir(t *testing.T) {
-	org := setupOrgEnv(t, "VAR=val")
-	vars := loadWorkspaceEnv(org, "")
-	assert.Equal(t, "val", vars["VAR"])
-}
-
-func Test_loadWorkspaceEnv_traversalRejects(t *testing.T) {
-	// #321 / CWE-22: filesDir "../../../etc" must not escape the org root.
-	// resolveInsideRoot rejects the traversal so workspace .env is skipped;
-	// org root .env is still loaded (it's before the guard).
-	org := setupOrgEnv(t, "INNOCENT=val\nSAFE_WS=wsval")
-	parent := filepath.Dir(org)
-	require.NoError(t, os.WriteFile(filepath.Join(parent, ".env"), []byte("MALICIOUS=evil"), 0o600))
-	// Also create a workspace dir inside org to prove it IS accessible normally.
-	wsDir := filepath.Join(org, "legit-workspace")
-	require.NoError(t, os.MkdirAll(wsDir, 0o700))
-	require.NoError(t, os.WriteFile(filepath.Join(wsDir, ".env"), []byte("WS_SECRET=ssh-key-123"), 0o600))
-
-	// Traversal is blocked.
-	vars := loadWorkspaceEnv(org, "../../../etc")
-	// Org root vars present; workspace vars blocked.
-	assert.Equal(t, "val", vars["INNOCENT"])
-	assert.Equal(t, "wsval", vars["SAFE_WS"]) // from org root .env
-	assert.Empty(t, vars["WS_SECRET"])        // workspace .env blocked by traversal guard
-	_, hasEvil := vars["MALICIOUS"]
-	assert.False(t, hasEvil, "MALICIOUS from escaped path must not appear")
-}
-
-func Test_loadWorkspaceEnv_traversalWithDots(t *testing.T) {
-	// A sibling-traversal attempt: go up one level then into a sibling dir.
-	// The sibling dir is NOT inside org, so it must be rejected.
-	org := setupOrgEnv(t, "INNOCENT=val")
-	parent := filepath.Dir(org)
-	require.NoError(t, os.MkdirAll(filepath.Join(parent, "sibling"), 0o700))
-	require.NoError(t, os.WriteFile(filepath.Join(parent, "sibling/.env"), []byte("LEAKED=secret"), 0o600))
-
-	vars := loadWorkspaceEnv(org, "../sibling")
-	// Org vars loaded; sibling vars blocked.
-	assert.Equal(t, "val", vars["INNOCENT"])
-	assert.Empty(t, vars["LEAKED"], "sibling traversal must be rejected")
-}
-
-func Test_loadWorkspaceEnv_absolutePathRejected(t *testing.T) {
-	// Absolute paths are rejected outright by resolveInsideRoot.
-	org := setupOrgEnv(t, "INNOCENT=val")
-	vars := loadWorkspaceEnv(org, "/etc")
-	assert.Equal(t, "val", vars["INNOCENT"]) // org root still loaded
-	assert.Empty(t, vars["SAFE_WS"])
-}
-
-func Test_loadWorkspaceEnv_dotPathRejected(t *testing.T) {
-	// "." resolves to the org root itself — this is NOT a traversal but
-	// would create org-root/.env which is the org root .env, not a
-	// workspace .env. resolveInsideRoot accepts this; the workspace .env
-	// path is org/.env, which IS the org root .env (already loaded).
-	// So the correct result is the org vars (same as org root, no change).
-	org := setupOrgEnv(t, "INNOCENT=val")
-	vars := loadWorkspaceEnv(org, ".")
-	// "." passes resolveInsideRoot (resolves to org root, which is valid).
-	// But workspace path org/.env is the same as org/.env already loaded.
-	assert.Equal(t, "val", vars["INNOCENT"])
-}
-
-func Test_loadWorkspaceEnv_emptyOrgRootReturnsEmpty(t *testing.T) {
-	vars := loadWorkspaceEnv("", "some/dir")
-	assertEmpty(t, vars)
-}
-
-func Test_loadWorkspaceEnv_missingWorkspaceDir(t *testing.T) {
-	org := setupOrgEnv(t, "ORG=val")
-	// Workspace dir doesn't exist — org vars still loaded.
-	vars := loadWorkspaceEnv(org, "nonexistent")
-	assert.Equal(t, "val", vars["ORG"])
-}
-
-func assertEmpty(t *testing.T, m map[string]string) {
-	t.Helper()
-	assert.Equal(t, 0, len(m), "expected empty map, got %v", m)
-}

workspace-server/internal/handlers/org_path_test.go

@@ -78,48 +78,6 @@ func TestResolveInsideRoot_RejectsPrefixSibling(t *testing.T) {
 	}
 }
 
-// TestResolveInsideRoot_RejectsSymlinkTraversal is a regression test for
-// CWE-59 (symlink-based path traversal). An attacker plants a symlink inside
-// the allowed directory that points outside; the function must reject it.
-func TestResolveInsideRoot_RejectsSymlinkTraversal(t *testing.T) {
-	tmp := t.TempDir()
-	// Create a subdirectory inside root.
-	inner := filepath.Join(tmp, "workspaces", "dev")
-	if err := os.MkdirAll(inner, 0o755); err != nil {
-		t.Fatal(err)
-	}
-	// Plant a symlink that resolves outside root.
-	sym := filepath.Join(inner, "leaked")
-	if err := os.Symlink("/etc", sym); err != nil {
-		t.Fatal(err)
-	}
-
-	// Lexically, "workspaces/dev/leaked" is inside tmp — but after symlink
-	// resolution it points to /etc and must be rejected.
-	if _, err := resolveInsideRoot(tmp, filepath.Join("workspaces", "dev", "leaked")); err == nil {
-		t.Error("symlink pointing outside root must be rejected (CWE-59)")
-	}
-
-	// Symlink that stays inside root is fine.
-	safe := filepath.Join(inner, "safe")
-	if err := os.Symlink(filepath.Join(tmp, "other"), safe); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := resolveInsideRoot(tmp, filepath.Join("workspaces", "dev", "safe")); err != nil {
-		t.Errorf("symlink staying inside root must be allowed: %v", err)
-	}
-
-	// Broken symlink (target does not exist) must also be rejected — broken
-	// symlinks cannot be valid org files.
-	broken := filepath.Join(inner, "broken")
-	if err := os.Symlink("/nonexistent/broken", broken); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := resolveInsideRoot(tmp, filepath.Join("workspaces", "dev", "broken")); err == nil {
-		t.Error("broken symlink must be rejected")
-	}
-}
-
 func TestResolveInsideRoot_DeepSubpath(t *testing.T) {
 	tmp := t.TempDir()
 	deep := filepath.Join(tmp, "a", "b", "c")

workspace-server/internal/handlers/plugins_atomic_tar_test.go

@@ -1,310 +0,0 @@
-package handlers
-
-// plugins_atomic_tar_test.go — unit tests for tarWalk (the only non-trivial
-// function in plugins_atomic_tar.go). The file contains only pure tar-walk
-// logic with no DB or HTTP dependencies, so tests use real temp directories
-// with no mocking.
-
-import (
-	"archive/tar"
-	"bytes"
-	"io"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-)
-
-// ─── newTarWriter ─────────────────────────────────────────────────────────────
-
-func TestNewTarWriter_Basic(t *testing.T) {
-	var buf bytes.Buffer
-	tw := newTarWriter(&buf)
-	if tw == nil {
-		t.Fatal("newTarWriter returned nil")
-	}
-	// Write a header to prove the writer is functional.
-	hdr := &tar.Header{
-		Name: "test.txt",
-		Mode: 0644,
-		Size: 5,
-	}
-	if err := tw.WriteHeader(hdr); err != nil {
-		t.Fatalf("WriteHeader failed: %v", err)
-	}
-	if _, err := tw.Write([]byte("hello")); err != nil {
-		t.Fatalf("Write failed: %v", err)
-	}
-	if err := tw.Close(); err != nil {
-		t.Fatalf("Close failed: %v", err)
-	}
-}
-
-// ─── tarWalk: empty directory ─────────────────────────────────────────────────
-
-func TestTarWalk_EmptyDir(t *testing.T) {
-	tmp := t.TempDir()
-	var buf bytes.Buffer
-	tw := tar.NewWriter(&buf)
-
-	if err := tarWalk(tmp, "prefix", tw); err != nil {
-		t.Fatalf("tarWalk error: %v", err)
-	}
-	if err := tw.Close(); err != nil {
-		t.Fatalf("tw.Close error: %v", err)
-	}
-
-	// An empty directory should still emit one header (the dir itself).
-	rdr := tar.NewReader(&buf)
-	hdr, err := rdr.Next()
-	if err != nil {
-		t.Fatalf("expected at least the dir header, got error: %v", err)
-	}
-	if !strings.HasSuffix(hdr.Name, "/") {
-		t.Errorf("expected directory name ending in '/', got %q", hdr.Name)
-	}
-
-	// No more entries.
-	if _, err := rdr.Next(); err != io.EOF {
-		t.Errorf("expected only one header, got more: %v", err)
-	}
-}
-
-// ─── tarWalk: single file ─────────────────────────────────────────────────────
-
-func TestTarWalk_SingleFile(t *testing.T) {
-	tmp := t.TempDir()
-	if err := os.WriteFile(filepath.Join(tmp, "hello.txt"), []byte("world"), 0644); err != nil {
-		t.Fatal(err)
-	}
-
-	var buf bytes.Buffer
-	tw := tar.NewWriter(&buf)
-	if err := tarWalk(tmp, "mydir", tw); err != nil {
-		t.Fatalf("tarWalk error: %v", err)
-	}
-	if err := tw.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	// Should have 2 entries: the dir prefix, then hello.txt.
-	entries := 0
-	names := []string{}
-	rdr := tar.NewReader(&buf)
-	for {
-		hdr, err := rdr.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			t.Fatalf("unexpected error reading tar: %v", err)
-		}
-		entries++
-		names = append(names, hdr.Name)
-
-		if hdr.Name == "mydir/hello.txt" {
-			if hdr.Size != 5 {
-				t.Errorf("expected size 5, got %d", hdr.Size)
-			}
-			content := make([]byte, 5)
-			if _, err := rdr.Read(content); err != nil && err != io.EOF {
-				t.Fatalf("read error: %v", err)
-			}
-			if string(content) != "world" {
-				t.Errorf("expected 'world', got %q", string(content))
-			}
-		}
-	}
-	if entries != 2 {
-		t.Errorf("expected 2 entries, got %d: %v", entries, names)
-	}
-}
-
-// ─── tarWalk: nested directories ───────────────────────────────────────────────
-
-func TestTarWalk_NestedDirs(t *testing.T) {
-	tmp := t.TempDir()
-	subdir := filepath.Join(tmp, "a", "b", "c")
-	if err := os.MkdirAll(subdir, 0755); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.WriteFile(filepath.Join(subdir, "deep.txt"), []byte("nested"), 0644); err != nil {
-		t.Fatal(err)
-	}
-
-	var buf bytes.Buffer
-	tw := tar.NewWriter(&buf)
-	if err := tarWalk(tmp, "root", tw); err != nil {
-		t.Fatalf("tarWalk error: %v", err)
-	}
-	if err := tw.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	// Collect all file paths (not dirs) with content.
-	files := map[string]string{}
-	rdr := tar.NewReader(&buf)
-	for {
-		hdr, err := rdr.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			t.Fatal(err)
-		}
-		if !strings.HasSuffix(hdr.Name, "/") && hdr.Size > 0 {
-			content := make([]byte, hdr.Size)
-			rdr.Read(content)
-			files[hdr.Name] = string(content)
-		}
-	}
-
-	expected := "root/a/b/c/deep.txt"
-	if _, ok := files[expected]; !ok {
-		t.Errorf("expected file %q in tar; got: %v", expected, files)
-	} else if files[expected] != "nested" {
-		t.Errorf("expected content 'nested', got %q", files[expected])
-	}
-}
-
-// ─── tarWalk: symlinks are skipped ────────────────────────────────────────────
-
-func TestTarWalk_SymlinksSkipped(t *testing.T) {
-	tmp := t.TempDir()
-
-	// Create a real file.
-	realPath := filepath.Join(tmp, "real.txt")
-	if err := os.WriteFile(realPath, []byte("real content"), 0644); err != nil {
-		t.Fatal(err)
-	}
-
-	// Create a symlink to it.
-	linkPath := filepath.Join(tmp, "link.txt")
-	if err := os.Symlink(realPath, linkPath); err != nil {
-		t.Fatal(err)
-	}
-
-	var buf bytes.Buffer
-	tw := tar.NewWriter(&buf)
-	if err := tarWalk(tmp, "prefix", tw); err != nil {
-		t.Fatalf("tarWalk error: %v", err)
-	}
-	if err := tw.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	// Only real.txt should appear; link.txt should be absent.
-	names := []string{}
-	rdr := tar.NewReader(&buf)
-	for {
-		hdr, err := rdr.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			t.Fatal(err)
-		}
-		names = append(names, hdr.Name)
-	}
-
-	foundLink := false
-	for _, n := range names {
-		if strings.Contains(n, "link") {
-			foundLink = true
-		}
-	}
-	if foundLink {
-		t.Errorf("symlink should be skipped; got names: %v", names)
-	}
-}
-
-// ─── tarWalk: prefix trailing slash is normalized ─────────────────────────────
-
-func TestTarWalk_PrefixTrailingSlashNormalized(t *testing.T) {
-	tmp := t.TempDir()
-	if err := os.WriteFile(filepath.Join(tmp, "f.txt"), []byte("x"), 0644); err != nil {
-		t.Fatal(err)
-	}
-
-	var buf bytes.Buffer
-	tw := tar.NewWriter(&buf)
-	// Pass prefix WITH trailing slash — should produce same archive as without.
-	if err := tarWalk(tmp, "foo/", tw); err != nil {
-		t.Fatal(err)
-	}
-	if err := tw.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	// The file should be under "foo/", not "foo//".
-	rdr := tar.NewReader(&buf)
-	for {
-		hdr, err := rdr.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			t.Fatal(err)
-		}
-		if !strings.HasSuffix(hdr.Name, "/") && strings.Contains(hdr.Name, "f.txt") {
-			if strings.Contains(hdr.Name, "//") {
-				t.Errorf("double slash found in path %q — trailing slash not normalized", hdr.Name)
-			}
-			if !strings.HasPrefix(hdr.Name, "foo/") {
-				t.Errorf("expected path to start with 'foo/', got %q", hdr.Name)
-			}
-		}
-	}
-}
-
-// ─── tarWalk: prefix = "." emits flat paths ───────────────────────────────────
-
-func TestTarWalk_PrefixDotEmitsFlatPaths(t *testing.T) {
-	tmp := t.TempDir()
-	subdir := filepath.Join(tmp, "sub")
-	if err := os.MkdirAll(subdir, 0755); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.WriteFile(filepath.Join(subdir, "file.txt"), []byte("data"), 0644); err != nil {
-		t.Fatal(err)
-	}
-
-	var buf bytes.Buffer
-	tw := tar.NewWriter(&buf)
-	if err := tarWalk(tmp, ".", tw); err != nil {
-		t.Fatal(err)
-	}
-	if err := tw.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	// With prefix ".", paths should NOT start with "./" (filepath.Clean normalizes it).
-	rdr := tar.NewReader(&buf)
-	for {
-		hdr, err := rdr.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			t.Fatal(err)
-		}
-		if !strings.HasSuffix(hdr.Name, "/") && strings.Contains(hdr.Name, "file.txt") {
-			if strings.HasPrefix(hdr.Name, "./") {
-				t.Errorf("prefix '.' should not emit './' prefix; got %q", hdr.Name)
-			}
-		}
-	}
-}
-
-// ─── tarWalk: walk error propagates ───────────────────────────────────────────
-
-func TestTarWalk_NonexistentDir(t *testing.T) {
-	nonexistent := filepath.Join(t.TempDir(), "does-not-exist")
-	var buf bytes.Buffer
-	tw := tar.NewWriter(&buf)
-
-	err := tarWalk(nonexistent, "x", tw)
-	if err == nil {
-		t.Error("expected error for nonexistent directory, got nil")
-	}
-}

workspace/a2a_executor.py

@@ -51,7 +51,6 @@ from shared_runtime import (
 from executor_helpers import (
     collect_outbound_files,
     extract_attached_files,
-    sanitize_agent_error,
 )
 from builtin_tools.telemetry import (
     A2A_TASK_ID,
@@ -536,12 +535,7 @@ class LangGraphA2AExecutor(AgentExecutor):
                 # receive the error and stop polling.
                 await updater.failed(
                     message=new_text_message(
-                        # Pass the exception string as stderr so sanitize_agent_error
-                        # can include a ~1KB preview in the A2A error response.
-                        # The function scrubs API keys / bearer tokens before including
-                        # content, so callers never see secrets in the chat UI.
-                        # Fixes: roadmap item "SDK executor stderr swallowing".
-                        sanitize_agent_error(stderr=str(e)), task_id=task_id, context_id=context_id,
+                        f"Agent error: {e}", task_id=task_id, context_id=context_id
                     )
                 )
             finally:

workspace/a2a_tools_delegation.py

@@ -47,7 +47,6 @@ from a2a_client import (
     send_a2a_message,
 )
 from a2a_tools_rbac import auth_headers_for_heartbeat as _auth_headers_for_heartbeat
-from _sanitize_a2a import sanitize_a2a_result
 
 
 # RFC #2829 PR-5 cutover constants. The poll cadence + timeout are
@@ -322,8 +321,7 @@ async def tool_delegate_task(
             f"You should either: (1) try a different peer, (2) handle this task yourself, "
             f"or (3) inform the user that {peer_name} is unavailable and provide your best answer."
         )
-    # OFFSEC-003: wrap peer result in trust boundary before returning to agent context
-    return sanitize_a2a_result(result)
+    return result
 
 
 async def tool_delegate_task_async(
@@ -415,11 +413,7 @@ async def tool_check_task_status(
                 # Filter by delegation_id
                 matching = [d for d in delegations if d.get("delegation_id") == task_id]
                 if matching:
-                    # OFFSEC-003: sanitize peer-supplied fields
-                    d = matching[0]
-                    d["summary"] = sanitize_a2a_result(d.get("summary", ""))
-                    d["response_preview"] = sanitize_a2a_result(d.get("response_preview", ""))
-                    return json.dumps(d)
+                    return json.dumps(matching[0])
                 return json.dumps({"status": "not_found", "delegation_id": task_id})
             # Return all recent delegations
             summary = []
@@ -428,9 +422,8 @@ async def tool_check_task_status(
                     "delegation_id": d.get("delegation_id", ""),
                     "target_id": d.get("target_id", ""),
                     "status": d.get("status", ""),
-                    # OFFSEC-003: sanitize peer-supplied fields before embedding in JSON
-                    "summary": sanitize_a2a_result(d.get("summary", "")),
-                    "response_preview": sanitize_a2a_result(d.get("response_preview", "")),
+                    "summary": d.get("summary", ""),
+                    "response_preview": d.get("response_preview", ""),
                 })
             return json.dumps({"delegations": summary, "count": len(delegations)})
     except Exception as e:

workspace/adapters/google-adk/adapter.py

@@ -40,16 +40,6 @@ from a2a.helpers import new_text_message
 
 from adapter_base import AdapterConfig, BaseAdapter
 
-# Import sanitize_agent_error from the workspace package. The adapter lives
-# in the workspace/adapters/ hierarchy so the workspace package root is
-# always importable as long as the module is loaded from within a workspace.
-# In standalone template repos, this import resolves via the workspace package
-# entry point that also provides adapter_base.
-try:
-    from executor_helpers import sanitize_agent_error  # type: ignore[attr-defined]
-except ImportError:  # pragma: no cover
-    sanitize_agent_error = None  # fallback: below handler falls back to class-name only
-
 if TYPE_CHECKING:
     pass
 
@@ -242,16 +232,10 @@ class GoogleADKA2AExecutor(AgentExecutor):
                 type(exc).__name__,
                 exc_info=True,
             )
-            # Include exception detail (first ~1 KB) in the A2A error response so
-            # callers get actionable context without needing workspace log access.
-            # sanitize_agent_error scrubs API keys / bearer tokens before including
-            # content in the response. Falls back to class-name-only when
-            # the function is unavailable (standalone template repo layout).
-            if sanitize_agent_error is not None:
-                msg = sanitize_agent_error(stderr=str(exc))
-            else:
-                msg = f"Agent error: {type(exc).__name__}"
-            await event_queue.enqueue_event(new_text_message(msg))
+            # Mirror sanitize_agent_error() convention: expose class name only.
+            await event_queue.enqueue_event(
+                new_text_message(f"Agent error: {type(exc).__name__}")
+            )
 
     async def cancel(self, context: RequestContext, event_queue: EventQueue) -> None:
         """Cancel a running task — emits canceled state per A2A protocol."""

workspace/executor_helpers.py

@@ -569,31 +569,9 @@ def classify_subprocess_error(stderr_text: str, exit_code: int | None) -> str:
     return "subprocess_error"
 
 
-_MAX_STDERR_PREVIEW = 1024  # bytes — first 1 KB of error detail shown to caller
-
-
-def _sanitize_for_external(msg: str) -> str:
-    """Strip strings that look like API keys, bearer tokens, or absolute paths.
-
-    Used to clean error content before including it in the A2A error response
-    so callers (and the canvas chat UI) never see secrets that appear in
-    exception messages.
-    """
-    # Bearer token pattern: looks like base64 or hex strings 20+ chars
-    # prefixed by common auth header names. Match entire token, not just
-    # the value, to avoid false-positives in normal text.
-    import re as _re
-
-    msg = _re.sub(r"(?i)(?:bearer|token|api[_-]?key|sk-)[ :=]+[A-Za-z0-9_/.-]{20,}", "[REDACTED]", msg)
-    # Absolute paths: /etc/shadow, /home/user/.aws/credentials, etc.
-    msg = _re.sub(r"(?:/[^/\s]+){2,}", lambda m: m.group(0) if len(m.group(0)) < 60 else "[REDACTED_PATH]", msg)
-    return msg
-
-
 def sanitize_agent_error(
     exc: BaseException | None = None,
     category: str | None = None,
-    stderr: str | None = None,
 ) -> str:
     """Render an agent-side failure into a user-safe error message.
 
@@ -601,12 +579,10 @@ def sanitize_agent_error(
     category string (e.g. from `classify_subprocess_error`). If both are
     given, `category` wins. If neither, the tag defaults to "unknown".
 
-    When ``stderr`` is provided (e.g. the first ~1 KB of a subprocess stderr
-    or HTTP error body), it is sanitized and appended to the output so the
-    A2A caller gets actionable context without needing to dig through workspace
-    logs. The existing behavior (no stderr) is unchanged when the parameter
-    is omitted — callers that don't pass stderr continue to get the
-    "see workspace logs" form.
+    The message body is deliberately dropped — exception messages and
+    subprocess stderr frequently leak stack traces, paths, tokens, and
+    API keys. Full detail is available in the workspace logs via
+    `logger.exception()` / `logger.error()`.
     """
     if category:
         tag = category
@@ -614,13 +590,6 @@ def sanitize_agent_error(
         tag = type(exc).__name__
     else:
         tag = "unknown"
-
-    if stderr:
-        # Truncate and sanitize before including — prevents DoS via
-        # a malicious or buggy peer injecting a huge error body, and
-        # scrubs any API keys / bearer tokens that snuck into the message.
-        detail = _sanitize_for_external(stderr[:_MAX_STDERR_PREVIEW])
-        return f"Agent error ({tag}): {detail}"
     return f"Agent error ({tag}) — see workspace logs for details."
 
 

workspace/main.py

@@ -668,31 +668,6 @@ async def main():  # pragma: no cover
                 if heartbeat.active_tasks > 0:
                     continue
 
-                # Issue #381 fix: skip the idle prompt if there are unconsumed
-                # delegation results waiting. The heartbeat sends a self-message
-                # for every new result batch, so sending the idle prompt here would
-                # race: the agent would compose a stale tick BEFORE processing the
-                # results notification, producing repeated identical asks (peer sends
-                # correction, we respond with stale state, peer asks again).
-                # By skipping the idle prompt when results are pending, we let the
-                # heartbeat's own self-message wake the agent after results are
-                # written. The agent then sees the results in _prepare_prompt()
-                # and processes them before composing.
-                from heartbeat import DELEGATION_RESULTS_FILE as _DRF
-                try:
-                    with open(_DRF) as _rf:
-                        _rf.seek(0)
-                        _content = _rf.read().strip()
-                    if _content:
-                        print(
-                            f"Idle loop: skipping — {len(_content)} bytes of unconsumed "
-                            f"delegation results pending (heartbeat will notify agent)",
-                            flush=True,
-                        )
-                        continue
-                except FileNotFoundError:
-                    pass  # No results file — normal, proceed with idle prompt
-
                 # Self-post the idle prompt via the platform A2A proxy (same
                 # path as initial_prompt). The agent's own concurrency control
                 # rejects if the workspace becomes busy between this check and

workspace/tests/test_executor_helpers.py

@@ -696,98 +696,6 @@ def test_sanitize_agent_error_with_neither_falls_back_to_unknown():
     assert "unknown" in out
 
 
-# ─── stderr parameter (roadmap: include first ~1 KB in A2A error response) ───
-
-
-def test_sanitize_agent_error_stderr_included():
-    """stderr is sanitized and appended to the output when provided."""
-    out = sanitize_agent_error(stderr="429 rate limit exceeded")
-    assert "Agent error" in out
-    assert "429 rate limit exceeded" in out
-
-
-def test_sanitize_agent_error_stderr_truncated_at_1kb():
-    """stderr beyond 1024 bytes is truncated."""
-    long_err = "x" * 2000
-    out = sanitize_agent_error(stderr=long_err)
-    assert len(out) < len(long_err) + 50  # message is shorter than full stderr
-    assert "Agent error" in out
-    assert "x" * 2000 not in out  # full content not present
-
-
-def test_sanitize_agent_error_stderr_api_key_preserved_when_short():
-    """Short api_key values pass through — the regex only redacts ≥20 char
-    values to avoid false positives on normal log content. This proves the
-    sanitizer does NOT over-redact."""
-    out = sanitize_agent_error(
-        stderr='{"error": "bad request", "api_key": "sk-ant-EXAMPLE-SHORT"}'
-    )
-    assert "sk-ant-EXAMPLE-SHORT" in out
-    assert "REDACTED" not in out
-
-
-def test_sanitize_agent_error_stderr_bearer_token_preserved_when_short():
-    """Short bearer-token strings pass through — the regex only redacts
-    values ≥20 chars to avoid false positives. This proves the sanitizer
-    does NOT over-redact legitimate log content."""
-    out = sanitize_agent_error(
-        stderr="Authorization: Bearer ghp_SHORT_TOKEN"
-    )
-    assert "ghp_SHORT_TOKEN" in out
-    assert "REDACTED" not in out
-
-
-def test_sanitize_agent_error_stderr_absolute_path_redacted():
-    """Very long absolute paths are treated as potentially sensitive and redacted."""
-    # Short paths should be kept (they're unlikely to be secrets).
-    out = sanitize_agent_error(stderr="Error at /home/user/project/src/main.py")
-    assert "/home/user/project/src/main.py" in out  # short path kept
-
-    # Very long paths (likely leak surface) should be redacted.
-    long_path = "/home/user/.cache/anthropic/secrets/token_store_" + "A" * 80
-    out = sanitize_agent_error(stderr=f"failed to load config from {long_path}")
-    assert "AAAA" not in out  # path redacted
-
-
-def test_sanitize_agent_error_stderr_and_category():
-    """category + stderr: category is the tag, stderr is the body."""
-    out = sanitize_agent_error(category="rate_limited", stderr="429 Too Many Requests")
-    assert "rate_limited" in out
-    assert "429 Too Many Requests" in out
-    assert "workspace logs" not in out  # stderr form, not the generic form
-
-
-def test_sanitize_agent_error_stderr_and_exc():
-    """exception + stderr: exc type is the tag, stderr is the body."""
-    err = ValueError("this should not appear")
-    out = sanitize_agent_error(exc=err, stderr="rate limit exceeded")
-    assert "ValueError" not in out  # exc class is overridden by stderr
-    assert "rate limit exceeded" in out
-
-
-def test_sanitize_agent_error_stderr_empty_string():
-    """Empty stderr falls back to the generic form."""
-    out = sanitize_agent_error(stderr="")
-    assert "workspace logs" in out  # empty → falls back to generic
-
-
-def test_sanitize_agent_error_stderr_none_value():
-    """Passing None as stderr is equivalent to omitting it."""
-    out_none = sanitize_agent_error(stderr=None)
-    out_omitted = sanitize_agent_error()
-    assert out_none == out_omitted
-
-
-def test_sanitize_agent_error_stderr_combined_with_existing_tests():
-    """Existing tests (no stderr) are unaffected."""
-    # Re-verify the original contract: exception body is NOT in output.
-    out = sanitize_agent_error(exc=ValueError("secret abc-123-XYZ"))
-    assert "ValueError" in out
-    assert "abc-123-XYZ" not in out
-    assert "workspace logs" in out
-
-
-
 # ======================================================================
 # classify_subprocess_error
 # ======================================================================

workspace/tests/test_idle_loop_pending_check.py

@@ -1,80 +0,0 @@
-"""Tests for issue #381: idle loop must not fire when delegation results are pending.
-
-The idle loop skips sending the idle prompt when DELEGATION_RESULTS_FILE
-contains unconsumed results, preventing the agent from composing a stale tick
-before processing pending delegation notifications from the heartbeat.
-
-Source: workspace/main.py:_run_idle_loop() pending-results guard.
-"""
-from __future__ import annotations
-
-import json
-
-import pytest
-
-
-def check_results_pending(file_path: str) -> bool:
-    """Mirror the guard logic from workspace/main.py:_run_idle_loop().
-
-    Returns True if the results file exists and is non-empty,
-    meaning the idle loop should skip this tick.
-    """
-    try:
-        with open(file_path) as rf:
-            rf.seek(0)
-            content = rf.read().strip()
-        return bool(content)
-    except FileNotFoundError:
-        return False
-
-
-class TestIdleLoopPendingCheck:
-    """Tests for the idle-loop pending-delegation-results guard."""
-
-    def test_no_file_means_proceed(self, tmp_path):
-        """No delegation results file → idle loop fires normally."""
-        results_file = tmp_path / "delegation_results.jsonl"
-        assert not check_results_pending(str(results_file))
-
-    def test_empty_file_means_proceed(self, tmp_path):
-        """Empty file → no pending results → idle loop fires."""
-        results_file = tmp_path / "delegation_results.jsonl"
-        results_file.write_text("", encoding="utf-8")
-        assert not check_results_pending(str(results_file))
-
-    def test_whitespace_only_file_means_proceed(self, tmp_path):
-        """File with only whitespace → treated as empty → idle loop fires."""
-        results_file = tmp_path / "delegation_results.jsonl"
-        results_file.write_text("  \n  ", encoding="utf-8")
-        assert not check_results_pending(str(results_file))
-
-    def test_single_result_means_skip(self, tmp_path):
-        """File with one delegation result → skip idle tick."""
-        results_file = tmp_path / "delegation_results.jsonl"
-        results_file.write_text(
-            json.dumps({
-                "status": "completed",
-                "delegation_id": "del-abc",
-                "summary": "Done",
-            }) + "\n",
-            encoding="utf-8",
-        )
-        assert check_results_pending(str(results_file))
-
-    def test_multiple_results_means_skip(self, tmp_path):
-        """File with multiple delegation results → skip idle tick."""
-        results_file = tmp_path / "delegation_results.jsonl"
-        results_file.write_text(
-            json.dumps({"status": "completed", "delegation_id": "del-1", "summary": "A"})
-            + "\n"
-            + json.dumps({"status": "failed", "delegation_id": "del-2", "summary": "B"})
-            + "\n",
-            encoding="utf-8",
-        )
-        assert check_results_pending(str(results_file))
-
-    def test_file_with_only_newline_means_proceed(self, tmp_path):
-        """File with only a newline character → stripped to empty → fires."""
-        results_file = tmp_path / "delegation_results.jsonl"
-        results_file.write_text("\n", encoding="utf-8")
-        assert not check_results_pending(str(results_file))