Skip to content

chore(upstream): порт v2.3.0 — 101 в порт, 75 на решение #222

Open

Description

@kobzevvv

Апстрим v2.3.0 → наш форк (gpt-mem/opencode-mem, main)

  • Апстрим: anomalyco/opencode @ a6b15d3
  • База форка: 843a6c5
  • Коммитов в диапазоне: 200 (разобрано 200)

Итог

Класс Коммитов Что значит
PORT 101 берём в порт — ядро, CLI, TUI, core, ai, codemode, plugin, sdk, protocol
ASK 75 требует решения человека — задевают наше расхождение, must_keep, схему БД или смешаны с skip-файлами
SKIP 24 мимо — веб/сайты/релизы/шум

Наш профиль

Чисто терминальный агент: без нативного приложения (packages/app, packages/desktop) и без веба (packages/web, packages/session-ui, packages/gui-extensions). Единственный интерфейс — TUI + CLI + core. Экономия токенов — усечение вывода инструментов (packages/core/src/tool-output.ts) и компактификация сессии. Наши фишки: детектор doom-loop, свой cross-spawn spawner, миграции БД без леджера масок и идемпотентные, оперативная память v2 (mem_record + put/search/get_operational_memory), проекция контекста (memory-context.ts), путь восстановления (get_tool_call_details), Unified Mask ledger (cache-mark-ledger.ts). Codemode, Ladder-провайдер, общая база сессий со стоком. Чего не держим: нативное приложение, веб, сайты/статистика/публикации, деплойные workflow'ы апстрима.

PORT — что берём в порт

PR Коммит Что Почему Файлы

SKIP — мимо

нативное приложение (app/desktop): 20

статистика//function/posts: 1

релизы и шум: 1

веб (web/session-ui/gui-extensions): 2

Решение по классу ASK

# PR Коммит Что Почему Файлы Решение
1 #62939 7ce50dde fix(tui): use the base text color for the dialog search cursor (anomalyco#62939) расхождение: packages/tui/src/ui/dialog-select.tsx, packages/tui/test/cli/tui/dialog-select.test.tsx packages/tui/src/ui/dialog-select.tsx, packages/tui/test/cli/tui/dialog-select.test.tsx тянуть / не тянуть
2 #62927 a3352f7b fix(tui): drop usage and the model detail line from the model picker (anomalyco#62927) расхождение: packages/tui/src/component/dialog-model.tsx packages/tui/src/component/dialog-model.tsx, packages/tui/test/usage-limits.test.tsx тянуть / не тянуть
3 #62928 a17fab50 fix(tui): remove dark gap between execute detail and its footer (anomalyco#62928) расхождение: packages/tui/src/ui/dialog.tsx packages/tui/src/routes/session/dialog-execute.tsx, packages/tui/src/ui/dialog.tsx, packages/tui/test/ui/dialog-layout.test.tsx тянуть / не тянуть
4 #62831 039765b0 fix(core): time warming from the model's cache.ttl by default (anomalyco#62831) схема/миграция: packages/schema/src/config/warming.ts, packages/schema/src/provider.ts packages/core/src/plugin/warming.ts, packages/core/test/plugin/warming.test.ts, packages/schema/src/config/warming.ts (+3) тянуть / не тянуть
5 #62931 f8fd7b0f chore(perf): bench with strobe 0.26.0 (anomalyco#62931) расхождение: bun.lock, package.json bun.lock, package.json тянуть / не тянуть
6 #62922 85dc877e feat(app): close side panel tabs to the right and make ⌘W/⌘⇧T side-panel aware (anomalyco#62922) смешанный: skip(packages/app/component-tests/plugin-host.fixture.tsx, packages/app/e2e/regression/side-panels.spec.ts, packages/app/e2e/regression/tabs.spec.ts) + порт packages/app/component-tests/plugin-host.fixture.tsx, packages/app/e2e/regression/side-panels.spec.ts, packages/app/e2e/regression/tabs.spec.ts (+17) тянуть / не тянуть
7 #62954 ae3aa94e ci: read deploy and release secrets from aws secrets manager (anomalyco#62954) расхождение: .github/actions/setup-git-committer/action.yml, .github/workflows/deploy-files.yml, .github/workflows/deploy-update.yml .github/actions/setup-git-committer/action.yml, .github/release/lib.sh, .github/workflows/bot-docs-locale.yml (+6) тянуть / не тянуть
8 #62964 d2627733 refactor(site): keep dev-only code out of production pages and group small shared chunks (anomalyco#62964) расхождение: bun.lock bun.lock, services/site/package.json, services/site/script/check-client-bundle.ts (+23) тянуть / не тянуть
9 #62985 8a99e907 chore(perf): bench with strobe 0.27.0 (anomalyco#62985) расхождение: bun.lock, package.json bun.lock, package.json тянуть / не тянуть
10 #62951 eba27be5 feat(site): serve V1 docs in the new design at /v1/docs (anomalyco#62951) расхождение: bun.lock bun.lock, packages/web/src/content/docs/da/github.mdx, services/site/AGENTS.md (+33) тянуть / не тянуть
11 #62956 82bdcc37 feat(site): translate the V1 docs' chrome and missing pages (anomalyco#62956) смешанный: skip(packages/web/src/content/docs/ar/config.mdx, packages/web/src/content/docs/ar/policies.mdx, packages/web/src/content/docs/ar/references.mdx) + порт packages/web/src/content/docs/ar/config.mdx, packages/web/src/content/docs/ar/policies.mdx, packages/web/src/content/docs/ar/references.mdx (+116) тянуть / не тянуть
12 #62982 5b6f8d1b chore(core): update MCP SDK to 2.4.0 (anomalyco#62982) расхождение: bun.lock, package.json, packages/client/package.json bun.lock, package.json, packages/client/package.json (+3) тянуть / не тянуть
13 #63006 df53325a fix(core): count session generate requests in the session's cost (anomalyco#63006) расхождение: packages/core/src/session/generate.ts, packages/core/test/session-generate.test.ts packages/client/src/effect/api/api.ts, packages/client/src/promise/generated/types.ts, packages/core/src/session.ts (+5) тянуть / не тянуть
14 #62832 d8e30c0c feat(ai): add embedding models with the OpenAI embeddings protocol (anomalyco#62832) расхождение: packages/ai/package.json packages/ai/README.md, packages/ai/package.json, packages/ai/src/ai-client.ts (+38) тянуть / не тянуть
15 #62997 37729b1d feat(core): add GitHub Copilot Auto and a model resolve hook (anomalyco#62997) расхождение: packages/core/src/session/generate.ts, packages/core/src/session/runner/llm.ts, packages/core/test/location-layer.test.ts packages/core/src/github-copilot/models.ts, packages/core/src/model-resolver.ts, packages/core/src/plugin/provider/github-copilot.ts (+11) тянуть / не тянуть
16 #63015 b88b867b refactor(plugin): edit the model in place in experimental.model.resolve (anomalyco#63015) расхождение: packages/core/test/location-layer.test.ts packages/core/src/plugin/provider/github-copilot.ts, packages/core/src/session/runner/model.ts, packages/core/test/location-layer.test.ts (+4) тянуть / не тянуть
17 #63017 9e2f9311 feat(ai): add Google and Vertex embedding entry points (anomalyco#63017) расхождение: packages/ai/package.json packages/ai/README.md, packages/ai/package.json, packages/ai/src/providers/google-vertex/embeddings.ts (+3) тянуть / не тянуть
18 #63022 94ee60df refactor(core): share OAuth credential refresh between provider logins and MCP (anomalyco#63022) расхождение: packages/core/test/config/config.test.ts packages/core/src/credential.ts, packages/core/src/integration.ts, packages/core/src/mcp/oauth.ts (+8) тянуть / не тянуть
19 #63036 3dc79ab6 fix(core): put Console event watches behind the console_watches flag (anomalyco#63036) расхождение: packages/core/src/plugin/provider/opencode.ts packages/client/src/promise/generated/types.ts, packages/core/src/plugin/provider/opencode.ts, packages/core/test/plugin/provider-opencode-watches.test.ts (+2) тянуть / не тянуть
20 #63040 374c97b5 ignore: wait for plugins again where managed policy applies (anomalyco#63040) расхождение: AGENTS.md AGENTS.md, packages/server/src/handlers/generate.ts, packages/server/src/handlers/model.ts (+5) тянуть / не тянуть
21 #63043 06aa6da2 chore(perf): bench with strobe 0.28.0 (anomalyco#63043) расхождение: bun.lock, package.json bun.lock, package.json тянуть / не тянуть
22 #62450 5f76acb1 release: v2.2.6 (anomalyco#62450) расхождение: bun.lock, package.json, packages/ai/package.json CHANGELOG.md, bun.lock, package.json (+33) тянуть / не тянуть
23 #63083 d619c940 feat(app): make session IDs easier to find and copy (anomalyco#63083) смешанный: skip(packages/app/e2e/regression/composer.spec.ts, packages/app/e2e/regression/subagent-child-navigation.spec.ts, packages/app/src/composer/editor/editor.css) + порт packages/app/e2e/regression/composer.spec.ts, packages/app/e2e/regression/subagent-child-navigation.spec.ts, packages/app/src/composer/editor/editor.css (+19) тянуть / не тянуть
24 #63085 8aa00e80 release: v2.2.7 (anomalyco#63085) расхождение: bun.lock, package.json, packages/ai/package.json CHANGELOG.md, bun.lock, package.json (+34) тянуть / не тянуть
25 #63089 98e4b534 feat(app): show tab shortcut numbers while holding the mod key (anomalyco#63089) смешанный: skip(packages/app/src/shell/layout/session-tab-avatar.tsx, packages/app/src/shell/titlebar/tab-hints-machine.test.ts, packages/app/src/shell/titlebar/tab-hints-machine.ts) + порт packages/app/src/shell/layout/session-tab-avatar.tsx, packages/app/src/shell/titlebar/tab-hints-machine.test.ts, packages/app/src/shell/titlebar/tab-hints-machine.ts (+5) тянуть / не тянуть
26 #63117 c1aa4e27 chore(web): move the V1 docs into services/site and remove packages/web (anomalyco#63117) расхождение: README.md, bun.lock, package.json .opencode/agent/translator.md, README.ar.md, README.bn.md (+297) тянуть / не тянуть
27 #63125 6c5d38d9 feat(app): link Console MCPs and skills in Extensions settings (anomalyco#63125) смешанный: skip(packages/app/e2e/regression/mcp-workspace-toggle.spec.ts, packages/app/e2e/regression/settings.spec.ts, packages/app/e2e/utils/console.ts) + порт packages/app/e2e/regression/mcp-workspace-toggle.spec.ts, packages/app/e2e/regression/settings.spec.ts, packages/app/e2e/utils/console.ts (+13) тянуть / не тянуть
28 #60674 eccfb829 fix(core): retry failed streams cleanly and keep finished work on interrupt (anomalyco#60674) расхождение: packages/core/src/session/runner/llm.ts, packages/core/src/session/runner/step.ts packages/core/src/session/runner/llm.ts, packages/core/src/session/runner/step.ts, packages/core/src/session/runner/to-llm-message.ts (+3) тянуть / не тянуть
29 #63024 96616880 feat(core): background shell commands when their timeout expires (anomalyco#63024) расхождение: packages/core/src/tool/plugin/shell.ts, packages/core/test/tool-shell.test.ts packages/client/src/promise/generated/types.ts, packages/core/src/tool/plugin/shell.ts, packages/core/test/tool-shell.test.ts (+2) тянуть / не тянуть
30 #62976 d22bc1d1 feat(core): speak opencode-pty protocol v8 (anomalyco#62976) расхождение: bun.lock, packages/cli/package.json, packages/core/package.json bun.lock, packages/cli/package.json, packages/core/package.json (+8) тянуть / не тянуть
31 #62977 05d347d7 fix(core): keep a shell command's output when the user interrupts its call (anomalyco#62977) расхождение: packages/core/src/codemode/tool.ts, packages/core/src/session/runner/llm.ts, packages/core/src/session/runner/step.ts; must_keep: packages/core/src/shell.ts packages/core/src/codemode/tool.ts, packages/core/src/session/execution.ts, packages/core/src/session/run-coordinator.ts (+21) тянуть / не тянуть
32 #62978 d4bcde91 feat(core): run shell commands in the process daemon across handoffs (anomalyco#62978) расхождение: packages/core/src/plugin/internal.ts, packages/core/src/session/runner/llm.ts, packages/core/src/session/runner/step.ts; must_keep: packages/core/src/plugin/internal.ts, packages/core/src/shell.ts packages/cli/src/commands/handlers/service/restart.ts, packages/cli/src/commands/handlers/service/stop.ts, packages/core/src/job.ts (+23) тянуть / не тянуть
33 #61703 53f2d631 feat(core): use freeform tool input on models that support it (anomalyco#61703) расхождение: packages/core/src/codemode/tool.ts, packages/core/src/session/model-request.ts, packages/core/test/session-model-request-hooks.test.ts packages/ai/src/schema/messages.ts, packages/client/src/promise/generated/types.ts, packages/codemode/README.md (+24) тянуть / не тянуть
34 #63055 c4bf1725 v0.8.4 (anomalyco#63055) расхождение: bun.lock, package.json, packages/plugin/package.json bun.lock, package.json, packages/plugin/package.json тянуть / не тянуть
35 #63200 33432347 feat(core): run LM Studio decision models (anomalyco#63200) расхождение: packages/ai/package.json, packages/core/test/generate.test.ts packages/ai/package.json, packages/ai/src/providers/openai-compatible.ts, packages/ai/src/providers/openai-compatible/decisions.ts (+7) тянуть / не тянуть
36 #63226 1e791be6 fix(core): describe the execute program as plain JavaScript for every tool shape (anomalyco#63226) расхождение: packages/core/src/codemode/tool.ts, packages/core/test/tool-execute.test.ts packages/core/src/codemode/tool.ts, packages/core/test/tool-execute.test.ts тянуть / не тянуть
37 — a8733360 chore(skills): describe the test tiers as they now run расхождение: .opencode/skills/app-e2e-tests/SKILL.md, .opencode/skills/component-tests/SKILL.md .opencode/skills/app-e2e-tests/SKILL.md, .opencode/skills/component-tests/SKILL.md тянуть / не тянуть
38 — 9c318ce4 chore: move the api worker into the legacy service расхождение: .github/workflows/deploy.yml, bun.lock, packages/function/package.json .github/workflows/deploy.yml, bun.lock, infra/app.ts (+19) тянуть / не тянуть
39 — 36f559b0 chore: move the data site off sst расхождение: .github/workflows/deploy.yml, .gitignore, bun.lock .github/workflows/deploy.yml, .gitignore, bun.lock (+67) тянуть / не тянуть
40 — 5fc7a62b chore: drop the sst-env.d.ts files sst regenerated смешанный: skip(packages/stats/app/sst-env.d.ts, packages/stats/core/sst-env.d.ts, packages/stats/server/sst-env.d.ts) + порт packages/plugins/figma/sst-env.d.ts, packages/process-daemon/npm/sst-env.d.ts, packages/stats/app/sst-env.d.ts (+7) тянуть / не тянуть
41 #63258 1af61ee4 fix(codemode): return compact JSON results (anomalyco#63258) расхождение: packages/core/src/codemode/tool.ts, packages/core/test/tool-execute.test.ts packages/core/src/codemode/tool.ts, packages/core/test/tool-execute.test.ts, packages/core/test/tool-registry.test.ts (+4) тянуть / не тянуть
42 #63254 6b1db275 feat(core): support MCP events in the MCP client (anomalyco#63254) схема/миграция: packages/schema/src/config/flag.ts packages/client/src/promise/generated/types.ts, packages/core/src/mcp/client.ts, packages/core/src/mcp/connection.ts (+9) тянуть / не тянуть
43 — 39502786 ci(deploy): mint short-lived cloudflare tokens from the token issuer расхождение: .github/workflows/deploy-files.yml, .github/workflows/deploy-update.yml, .github/workflows/deploy.yml .github/release/cloudflare-token.sh, .github/workflows/deploy-files.yml, .github/workflows/deploy-site.yml (+2) тянуть / не тянуть
44 #63269 eb670f1e feat(core): wake a session on MCP events with a watch tool (anomalyco#63269) расхождение: packages/core/src/plugin/internal.ts; must_keep: packages/core/src/plugin/internal.ts packages/core/src/plugin/internal.ts, packages/core/src/tool/plugin/mcp-events.ts, packages/core/test/tool-mcp-events.test.ts тянуть / не тянуть
45 — 070b980c refactor(data): strict dev/production stages and data naming расхождение: bun.lock, package.json, script/release.ts bun.lock, package.json, packages/data/AGENTS.md (+164) тянуть / не тянуть
46 #63235 e56eff2b feat(core): tell agents when they are in a fork (anomalyco#63235) расхождение: packages/core/src/plugin/internal.ts; must_keep: packages/core/src/plugin/internal.ts packages/core/src/plugin/fork-notice.ts, packages/core/src/plugin/internal.ts, packages/core/src/session.ts (+6) тянуть / не тянуть
47 — 7bac5bad fix(deploy): run Cloudflare deploys from verified artifacts behind pinned targets расхождение: .github/workflows/deploy-files.yml, .github/workflows/deploy-update.yml, .github/workflows/deploy.yml .github/release/README.md, .github/release/cf/package-lock.json, .github/release/cf/package.json (+35) тянуть / не тянуть
48 #63259 d4ea024c fix(core): fetch Console instructions and skills only when the config says the workspace has them (anomalyco#63259) расхождение: packages/core/src/plugin/provider/opencode.ts packages/core/src/plugin/provider/opencode.ts, packages/core/test/plugin/provider-opencode.test.ts тянуть / не тянуть
49 #63295 9e3290ab feat(app): add the New timeline experiment (anomalyco#63295) расхождение: packages/session-ui/package.json packages/app/src/runtime/i18n/en.ts, packages/app/src/session/timeline/controller.tsx, packages/app/src/session/timeline/message-timeline.tsx (+50) тянуть / не тянуть
50 #63315 2ef38b21 fix(app): accept a pasted redirect URL for provider sign-in (anomalyco#63315) расхождение: packages/ui/package.json packages/app/src/providers/connect/controller.ts, packages/app/src/providers/connect/dialog.tsx, packages/app/src/providers/connect/machine.test.ts (+81) тянуть / не тянуть
51 #63321 99f2bea6 fix(session): measure tps from the first streamed token (anomalyco#63321) схема/миграция: packages/schema/src/session-event.ts, packages/schema/src/session-message.ts, packages/schema/test/event-manifest.test.ts packages/client/src/effect/api/api.ts, packages/client/src/promise/generated/types.ts, packages/client/src/solid/data.ts (+14) тянуть / не тянуть
52 #62642 72616be4 refactor(codemode): remove the legacy interpreter; the VM is the only engine (anomalyco#62642) расхождение: packages/codemode/package.json, packages/codemode/src/stdlib/array.ts, packages/codemode/src/stdlib/bytes.ts packages/client/src/promise/generated/types.ts, packages/codemode/AGENTS.md, packages/codemode/README.md (+74) тянуть / не тянуть
53 #63334 51fcace7 fix(core): keep the truncated preview when tool output can't be saved (anomalyco#63334) расхождение: packages/core/src/tool-output.ts, packages/core/test/tool-output.test.ts; must_keep: packages/core/src/tool-output.ts, packages/core/test/tool-output.test.ts packages/core/src/tool-output.ts, packages/core/test/tool-output.test.ts тянуть / не тянуть
54 #63325 6eac5377 chore: remove beta what's new and visual svgs (anomalyco#63325) расхождение: AGENTS.md, bun.lock, packages/desktop/package.json .github/pull_request_template.md, .github/workflows/release.yml, AGENTS.md (+19) тянуть / не тянуть
55 #63209 609ee05a feat(core): report subagent results to the parent every time a child goes idle (anomalyco#63209) расхождение: packages/core/test/tool-shell.test.ts packages/core/src/config/plugin/command.ts, packages/core/src/job.ts, packages/core/src/job/list.ts (+30) тянуть / не тянуть
56 #63382 66e2fb94 feat(core): always run subagents in the background (anomalyco#63382) расхождение: packages/tui/test/mini/stream-v2.transport.test.ts packages/app/e2e/regression/subagent-child-navigation.spec.ts, packages/app/e2e/regression/timeline-stream.spec.ts, packages/app/src/session/composer/region.tsx (+28) тянуть / не тянуть
57 #63223 f5f5190d refactor(core): remove the unused foreground path from SubagentJob (anomalyco#63223) расхождение: packages/core/test/tool-shell.test.ts packages/core/src/config/plugin/command.ts, packages/core/src/session/execution.ts, packages/core/src/session/execution/subagent-report.ts (+11) тянуть / не тянуть
58 #63369 0bd8cee7 feat(ai): add Google Decisions (anomalyco#63369) расхождение: packages/ai/package.json, packages/core/test/generate.test.ts packages/ai/package.json, packages/ai/src/protocols/google-decisions.ts, packages/ai/src/protocols/index.ts (+10) тянуть / не тянуть
59 #63395 3039a8b5 fix(acp): stream the parent's reaction to background subagent reports (anomalyco#63395) расхождение: packages/cli/test/acp/subprocess.ts packages/cli/src/acp/translate.ts, packages/cli/src/acp/turn.ts, packages/cli/test/acp/background-turn.subprocess.test.ts (+2) тянуть / не тянуть
60 #63342 745636ae chore(core): bump gitlab-ai-provider to 6.24.0 (anomalyco#63342) расхождение: bun.lock, packages/core/package.json bun.lock, packages/core/package.json тянуть / не тянуть
61 #63379 33123b1c ci: deploy dev workers in anomaly-dev (anomalyco#63379) расхождение: .github/workflows/deploy-files.yml, .github/workflows/deploy.yml .github/release/cloudflare-token.sh, .github/release/deploy-data.sh, .github/release/deploy-files.sh (+20) тянуть / не тянуть
62 #63272 7392bd45 fix(core): show the start of tool output that exceeds the limit (anomalyco#63272) расхождение: packages/core/src/tool-output.ts, packages/core/test/tool-output.test.ts; must_keep: packages/core/src/tool-output.ts, packages/core/test/tool-output.test.ts packages/core/src/tool-output.ts, packages/core/test/tool-output.test.ts тянуть / не тянуть
63 #63392 23dd370a refactor(core): remove leftover foreground subagent and reattach code (anomalyco#63392) расхождение: packages/core/src/tool/plugin/shell.ts packages/core/src/job.ts, packages/core/src/session/background.ts, packages/core/src/session/execution.ts (+9) тянуть / не тянуть
64 #63391 ffcaeec3 refactor(app): remove leftover foreground subagent UI (anomalyco#63391) смешанный: skip(packages/app/src/runtime/i18n/en.ts, packages/app/src/session/composer/activity-chips.css, packages/app/src/session/composer/activity-chips.stories.tsx) + порт packages/app/src/runtime/i18n/en.ts, packages/app/src/session/composer/activity-chips.css, packages/app/src/session/composer/activity-chips.stories.tsx (+21) тянуть / не тянуть
65 #63409 63dd3f1c feat(core): run local Windows shell commands in the process daemon (anomalyco#63409) расхождение: bun.lock, packages/cli/package.json, packages/core/package.json; must_keep: packages/core/src/shell.ts bun.lock, packages/cli/package.json, packages/core/package.json (+7) тянуть / не тянуть
66 #63423 b451fe39 fix(legacy): keep github app secrets in production (anomalyco#63423) расхождение: .github/workflows/deploy.yml .github/release/deploy-legacy.sh, .github/release/targets/legacy/dev/worker.json, .github/workflows/deploy.yml (+3) тянуть / не тянуть
67 — f5ca39a9 fix(tui): open session list at the top instead of the current session расхождение: packages/tui/src/component/dialog-session-list.tsx packages/tui/src/component/dialog-session-list.tsx тянуть / не тянуть
68 #63441 4f51455a chore(perf): bench with strobe 0.29.0 (anomalyco#63441) расхождение: bun.lock, package.json bun.lock, package.json тянуть / не тянуть
69 #63261 2c1e17b5 feat(core): publish MCP events on the bus (anomalyco#63261) схема/миграция: packages/schema/src/event-manifest.ts, packages/schema/src/mcp-event.ts, packages/schema/src/mcp.ts packages/client/src/effect/api/api.ts, packages/client/src/promise/generated/types.ts, packages/core/src/instructions/index.ts (+12) тянуть / не тянуть
70 #63497 df7911ab chore(perf): bench with strobe 0.30.0 (anomalyco#63497) расхождение: bun.lock, package.json bun.lock, package.json тянуть / не тянуть
71 #63515 3d308eae chore(perf): bench with strobe 0.31.0 (anomalyco#63515) расхождение: bun.lock, package.json bun.lock, package.json тянуть / не тянуть
72 #59250 b268a4e8 feat(session-ui): maximize Mermaid diagrams to zoom and pan them (anomalyco#59250) смешанный: skip(packages/session-ui/component-tests/mermaid-preview.spec.ts, packages/session-ui/src/components/diagram-preview.tsx, packages/session-ui/src/components/markdown.css) + порт packages/plugin/src/gui/icon-name.ts, packages/session-ui/component-tests/mermaid-preview.spec.ts, packages/session-ui/src/components/diagram-preview.tsx (+10) тянуть / не тянуть
73 #63544 96d95017 fix(app): advance SSH prompts and close the dialog on connection (anomalyco#63544) смешанный: skip(packages/app/e2e/regression/settings-wsl.spec.ts, packages/app/e2e/utils/settings-wsl.fixture.tsx, packages/app/src/components-lab/lab.tsx) + порт packages/app/e2e/regression/settings-wsl.spec.ts, packages/app/e2e/utils/settings-wsl.fixture.tsx, packages/app/src/components-lab/lab.tsx (+11) тянуть / не тянуть
74 #63275 28f74f85 fix(tui): copy the paste inside the prompt selection (anomalyco#63275) расхождение: packages/tui/src/component/prompt/index.tsx packages/tui/src/component/prompt/index.tsx тянуть / не тянуть
75 #63575 5418e010 chore(perf): bench with strobe 0.32.0 (anomalyco#63575) расхождение: bun.lock, package.json bun.lock, package.json тянуть / не тянуть

Как портировать

  1. Этап 2 (сборка порта): по каждому PORT-коммиту — перенос диффа из апстрима в нашу ветку, разрешение конфликтов по факту (наши diverged-файлы приоритетны). Автоматически отбрасываем SKIP-файлы. Если PORT-коммит затрагивает файл из must_keep — он уже в ASK, не попадёт в автоматическую сборку.
  2. За человеком: по каждому ASK-пункту — решение «тянуть / не тянуть / тянуть с адаптацией». Особое внимание уделять изменениям в packages/core/src/tool-output.ts, packages/core/src/shell.ts, packages/core/src/plugin/internal.ts, packages/core/src/session/runner/llm.ts — там наши фишки (усечение, doom-loop, cross-spawn, идемпотентные миграции).
  3. После сборки: обновить our_diverged_files в upstream-policy.json (файлы, которые мы изменили при порте, плюс новые diverged-файлы), перезапустить детектор на следующий релиз.

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions