Merge branch 'main' into dev/jernej-google/jank_columns

Author: jernej-google

.github/workflows/finalize-release.yml

@@ -238,8 +238,9 @@ jobs:
             --title "Update ai-agents skills bundle ($VERSION)" \
             --body "$(cat <<EOF
           Automated agent-skills bundle for **$VERSION** (RFC-0026): this tag's
-          \`skills/\` plus the freshly rolled \`bin/trace_processor\` and the
-          per-agent manifests.
+          skill tree (with the freshly rolled \`trace_processor\` wrapper
+          bundled inside it at \`plugins/perfetto/skills/perfetto/bin/\`) and
+          the per-agent manifests.
           The version pin \`refs/ai-agent-tag/$VERSION\` already points at this
           bundle commit (\`$BUNDLE_SHA\`). On merge, \`ai-agents\` advances and
           installed agents pick up the update through their normal channels.

Android.bp

@@ -226,7 +226,7 @@ gensrcs {
         "&& $(location aprotoc) " +
         "--plugin=$(location protoc-gen-javastream) " +
 
-        "--javastream_opt=include_filter:perfetto.protos.TracePacket,perfetto.protos.ShellTransition,perfetto.protos.ShellHandlerMappings,perfetto.protos.ProtoLogMessage,perfetto.protos.ProtoLogViewerConfig,perfetto.protos.ShellHandlerMapping,perfetto.protos.ShellHandlerMappings,perfetto.protos.ProtoLogGroup,perfetto.protos.ProtoLogConfig,perfetto.protos.DataSourceConfig,perfetto.protos.InternedString,perfetto.protos.InternedData,perfetto.protos.ProtoLogLevel,perfetto.protos.TestEvent,perfetto.protos.TestEvent.TestPayload,perfetto.protos.TestConfig,perfetto.protos.TestConfig.DummyFields,perfetto.protos.WinscopeExtensionsImpl,perfetto.protos.ViewCapture,perfetto.protos.AppWakelocksConfig,perfetto.protos.AppWakelockInfo,perfetto.protos.AppWakelockBundle," +
+        "--javastream_opt=include_filter:perfetto.protos.TracePacket,perfetto.protos.ShellTransition,perfetto.protos.ShellHandlerMappings,perfetto.protos.ProtoLogMessage,perfetto.protos.ProtoLogViewerConfig,perfetto.protos.ShellHandlerMapping,perfetto.protos.ShellHandlerMappings,perfetto.protos.ProtoLogGroup,perfetto.protos.ProtoLogConfig,perfetto.protos.DataSourceConfig,perfetto.protos.InternedString,perfetto.protos.InternedData,perfetto.protos.ProtoLogLevel,perfetto.protos.TestEvent,perfetto.protos.TestEvent.TestPayload,perfetto.protos.TestConfig,perfetto.protos.TestConfig.DummyFields,perfetto.protos.WinscopeExtensionsImpl,perfetto.protos.ViewCapture,perfetto.protos.AppWakelocksConfig,perfetto.protos.AppWakelockInfo,perfetto.protos.AppWakelockBundle,perfetto.protos.DisplayVideoConfig," +
 
         // IME protos
         "perfetto.protos.ClientSideProto,perfetto.protos.DisplayCutoutProto,perfetto.protos.EditorInfoProto,perfetto.protos.ImeFocusControllerProto,perfetto.protos.InputConnectionCallProto,perfetto.protos.InputConnectionProto,perfetto.protos.InputMethodClientsTraceProto,perfetto.protos.InputMethodClientsTraceFileProto,perfetto.protos.InputMethodConfig,perfetto.protos.InputMethodManagerProto,perfetto.protos.InputMethodManagerServiceProto,perfetto.protos.InputMethodManagerServiceTraceProto,perfetto.protos.InputMethodManagerServiceTraceFileProto,perfetto.protos.InputMethodServiceProto,perfetto.protos.InputMethodServiceTraceProto,perfetto.protos.InputMethodServiceTraceFileProto,perfetto.protos.InsetsAnimationControlImplProto,perfetto.protos.InsetsControllerProto,perfetto.protos.InsetsProto,perfetto.protos.InsetsFrameProviderProto,perfetto.protos.InsetsSizeOverrideProto,perfetto.protos.InsetsSourceConsumerProto,perfetto.protos.InsetsSourceControlProto,perfetto.protos.InsetsSourceProto,perfetto.protos.InsetsStateProto,perfetto.protos.RectProto,perfetto.protos.SoftInputWindowProto,perfetto.protos.SurfaceControlProto,perfetto.protos.ViewRootImplProto,perfetto.protos.WindowLayoutParamsProto," +

Android.bp.extras

@@ -8,11 +8,28 @@ Unreleased:
     * Added a client-server mode to `trace_processor_shell`: start a server
       over a unix socket (`server unix`) or WebSocket (`server http`) and
       connect a thin client with `--remote`.
+    * Added trace merging: a ZIP or TAR archive containing several traces
+      imports as one merged trace on a single timeline, with per-machine
+      attribution. An optional `perfetto_manifest` JSON file in the archive
+      configures the merge (machine names, clock relations, fixed offsets).
+      See https://perfetto.dev/docs/analysis/merging-traces.
+    * Added `trace_processor_shell util merge`: packs traces and an optional
+      manifest into a merged-trace archive and sanity-checks the result.
   UI:
-    *
+    * Opening multiple trace files is now supported by default: the "Open
+      multiple trace files" sidebar item (or multi-selecting / dropping
+      several files) opens a dialog to configure how the traces merge onto
+      a shared timeline, warns if any events would be dropped, and can
+      export the merged set as a self-contained .tar archive.
   SDK:
     *
 
+v57.1 - 2026-07-02:
+  AI:
+    * Fixed the AI skill missing its bundled `trace_processor` wrapper.
+      The wrapper now ships inside the skill directory itself, for every
+      install method and agent.
+
 v57.0 - 2026-06-19:
   Tracing service and probes:
     * Scoped the RelayPort IPC service so it is only exposed on producer

BUILD

@@ -7,16 +7,14 @@ primiano@google.com
 
 # Trace Processor, metrics, infra.
 lalitm@google.com
-mayzner@google.com
 
 # Ftrace interop, traced_probes, protozero, Android internals.
 # Callstack / memory profilers, traced_probes & Linux internals.
-ddiproietto@google.com
 rsavitski@google.com
 
 # Horizontal work
 sashwinbalaji@google.com
-ktimofeev@google.com
+safayat@google.com
 
 # UI
 stevegolton@google.com
@@ -27,6 +25,5 @@ ilkos@google.com
 # Chromium-related things and tracing SDK.
 eseckler@google.com
 nuskos@google.com
-oysteine@google.com
 
 include platform/system/core:main:/janitors/OWNERS #{LAST_RESORT_SUGGESTION}

CHANGELOG

@@ -18,25 +18,27 @@ for how users install.
 ```
 ai/extensions/
 ├── claude-code/
-│   ├── plugin.json              → plugins/perfetto/.claude-plugin/plugin.json
+│   ├── plugin.json              → .claude-plugin/plugin.json
 │   └── marketplace.json         → .claude-plugin/marketplace.json
 └── codex/
-    ├── plugin.json              → plugins/perfetto/.codex-plugin/plugin.json
+    ├── plugin.json              → .codex-plugin/plugin.json
     └── marketplace.json         → .agents/plugins/marketplace.json
 ```
 
 The arrows show where each file lands on the `ai-agents` branch. Claude Code
 and Codex are the only agents that need a per-agent manifest. Every other
-agent (OpenCode, Pi, Antigravity, …) is a fallback consumer of the root
-`skills/` tree, installed via `tools/agents-install` (served at
+agent (OpenCode, Pi, Antigravity, …) is a fallback consumer installed via
+`tools/agents-install` (served at
 <https://get.perfetto.dev/agents-install>) — no manifest required.
 
-The one content difference between the two consumers is the environment
-setup the bundler resolves into the skill: plugin consumers
-(`plugins/perfetto/skills/`) get the bundled-`trace_processor` variant,
-fallback consumers (root `skills/`) get the standalone fetch-it-yourself
-variant. See [`ai/skills/README.md`](../skills/README.md) for how the
-bundler assembles the single skill.
+The skill tree is emitted exactly once, at `plugins/perfetto/skills/`:
+plugin installs consume the `plugins/perfetto/` subdir, and fallback
+consumers (OpenCode's `index.json` URL, `tools/agents-install`) read the
+same tree at its full path. Every install gets the identical assembled
+skill, which carries the `trace_processor` wrapper at `bin/` inside the
+skill, so `$SKILL_ROOT/bin/trace_processor` resolves everywhere. See
+[`ai/skills/README.md`](../skills/README.md) for how the bundler
+assembles the single skill.
 
 ## Versioning
 

OWNERS

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/claude-code-marketplace.json",
   "name": "perfetto",
-  "version": "v56.1",
+  "version": "v57.1",
   "description": "Perfetto skills for Claude Code: query traces with PerfettoSQL, install trace_processor, and run guided investigation workflows.",
   "owner": {
     "name": "Perfetto",

ai/extensions/README.md

@@ -1,6 +1,6 @@
 {
   "name": "perfetto",
-  "version": "v56.1",
+  "version": "v57.1",
   "description": "Perfetto skills for trace analysis: query traces, install trace_processor, and run guided investigation workflows.",
   "author": {
     "name": "Perfetto",

ai/extensions/claude-code/marketplace.json

@@ -1,6 +1,6 @@
 {
   "name": "perfetto",
-  "version": "v56.1",
+  "version": "v57.1",
   "description": "Perfetto skills for trace analysis: query traces, install trace_processor, and run guided investigation workflows.",
   "author": {
     "name": "Perfetto",