dsh-github-copilot 0.1.0-alpha.1.dsh.0.2.2.rc.3 → 0.1.0-alpha.11.dsh.0.2.2.rc.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (48) hide show
  1. package/AGENTS.md +97 -15
  2. package/CHANGELOG.md +61 -0
  3. package/README.md +89 -3
  4. package/README.zh.md +59 -3
  5. package/deployment-baseline.json +82 -20
  6. package/docs/agent-readiness.md +1 -1
  7. package/docs/auto-review-sampling.md +24 -1
  8. package/docs/copilot-accounts.md +89 -35
  9. package/docs/copilot-usage.md +19 -3
  10. package/docs/plugin-diagnostics.md +3 -1
  11. package/docs/session-search-routing.md +4 -0
  12. package/lib/client.js +780 -100
  13. package/lib/client.js.map +1 -1
  14. package/lib/copilot-identity-BpfZQOip.js +21 -0
  15. package/lib/diagnostics-analysis.js +1 -1
  16. package/lib/{diagnostics-types-eEWwFOFD.js → diagnostics-types-DSXrTSCU.js} +1 -1
  17. package/lib/index.js +1582 -242
  18. package/lib/manual-compaction-recovery.js +2 -2
  19. package/lib/remote.js +127 -5
  20. package/lib/routed-web.js +2 -2
  21. package/lib/{traditional-search-BZpWOTZA.js → traditional-search-DP4tbmsO.js} +37 -3
  22. package/lib/types/account-model-catalog.d.ts +2 -0
  23. package/lib/types/authorization-controller.d.ts +35 -0
  24. package/lib/types/client.d.ts +1 -0
  25. package/lib/types/config.d.ts +6 -2
  26. package/lib/types/copilot-accounts-host.d.ts +9 -0
  27. package/lib/types/copilot-accounts-remote.d.ts +2 -0
  28. package/lib/types/copilot-accounts-types.d.ts +1 -1
  29. package/lib/types/copilot-identity.d.ts +2 -0
  30. package/lib/types/copilot-system-trust.d.ts +3 -0
  31. package/lib/types/copilot-usage-card.d.ts +14 -0
  32. package/lib/types/copilot-usage-host.d.ts +9 -0
  33. package/lib/types/copilot-usage-remote.d.ts +10 -0
  34. package/lib/types/copilot-usage-types.d.ts +3 -1
  35. package/lib/types/model-preferences-card.d.ts +1 -1
  36. package/lib/types/native-copilot-access.d.ts +26 -0
  37. package/lib/types/native-copilot-search-remote.d.ts +18 -0
  38. package/lib/types/native-copilot-search.d.ts +21 -0
  39. package/lib/types/native-model-sync.d.ts +44 -0
  40. package/lib/types/native-search-model-card.d.ts +10 -0
  41. package/lib/types/preview-route.d.ts +9 -0
  42. package/lib/types/remote.d.ts +87 -1
  43. package/lib/types/session-accounts-remote.d.ts +2 -0
  44. package/lib/types/session-continuation-ui.d.ts +1 -0
  45. package/lib/types/traditional-search.d.ts +3 -1
  46. package/package.json +1 -1
  47. package/scripts/check-search-composition.mjs +0 -1
  48. package/lib/copilot-identity-BF8J8-9O.js +0 -12
package/AGENTS.md CHANGED
@@ -7,10 +7,10 @@ This file is the authoritative entry point for humans and coding agents. Read it
7
7
  This repository follows a **plugin-only** policy: implement fixes in `dsh-github-copilot` through existing published public Core/pi-ai APIs. This rule applies to agents, subagents, scripts, installers and release plans, not just the final diff.
8
8
 
9
9
  - Do not edit DSH Core source, create Core implementation worktrees, prepare Core commits/PRs/releases, or rebuild/install a modified Core to complete this project's work.
10
- - Do not patch deployed Core or dependency artifacts in `node_modules`, ship hidden Core patches, replace Core prototypes/private registries, or mutate shared upstream model catalogs. Create only plugin-owned objects and reversible registrations through public APIs.
10
+ - Do not patch deployed Core or dependency artifacts in `node_modules`, ship hidden Core patches, replace Core prototypes/private registries, or mutate shared upstream model catalogs. Create plugin-owned objects and reversible registrations through public APIs; the sole Core-owned credential exception is the user-confirmed native Copilot account switch described below.
11
11
  - Do not make a Core patch, a new Core export, or an upstream Core PR being merged/released a prerequisite for delivering a plugin fix.
12
12
  - Read-only Core/API inspection and isolated compatibility tests against unchanged pinned artifacts are allowed. Test-only fixtures must not alter tracked Core implementation or a live deployment and must clean up only their own temporary files. Historical controlled baselines are regression evidence, not permission for new Core changes.
13
- - If the existing API cannot support the desired behavior, report the limit and choose a tested plugin-local alternative or defer that capability. Do not expand into Core work to preserve an earlier design claim. Reusing a published adapter class for an account-scoped, metadata-driven Copilot route is allowed; a second wire implementation, independently maintained static model catalog, copied credentials, or a fabricated single-route claim is not.
13
+ - If the existing API cannot support the desired behavior, report the limit and choose a tested plugin-local alternative or defer that capability. Do not expand into Core work to preserve an earlier design claim. Reusing a published adapter class for an account-scoped, metadata-driven Copilot route is allowed; a second wire implementation, independently maintained static model catalog, unapproved credential copies, or a fabricated single-route claim is not.
14
14
  - General model compatibility must be data-driven: new account models with supported endpoint/capability metadata must work without adding model IDs or name-prefix branches to code. Unknown or incomplete metadata must produce a diagnostic rather than guessed capabilities. Follow [the current acceptance checklist](./docs/model-compatibility-acceptance.md), including Thinking, pi version compatibility, PR/merge/release and the requested local upgrade.
15
15
  - Any future Core work requires a separate, explicit human request and separate task scope. Generic requests to fix compatibility, add models, optimize, or continue a goal do not grant that permission. Preserve abandoned Core work without resuming, publishing or deleting it automatically.
16
16
 
@@ -27,10 +27,47 @@ This repository follows a **plugin-only** policy: implement fixes in `dsh-github
27
27
 
28
28
  Use native DSH tools for goals, background jobs and scoped subagents. Use local Git and the GitHub REST API for delivery; no external orchestration daemon, roster or `vcs_*` tool is required. Do not assume a model provider's identity is the assisting agent.
29
29
 
30
+ ## Session isolation and temporary artifacts (#442)
31
+
32
+ - Prefer one app-managed worktree per independent repository session when supported and authorized. A branch-backed session, folder session or shared checkout is not necessarily isolated. Verify the actual workspace and branch; preserve the user's chosen workspace. Creating or checking out another worktree still requires separate approval.
33
+ - Store temporary evidence, downloads, scratch files and backups in the session-owned artifact area outside the repository checkout. Keep only intentional deliverables in the repository. Clean up only explicitly identified temporary files created by the current task; never hide, move, delete or stage pre-existing files merely to make a gate pass.
34
+ - Inspect the explicit staged and committed diff before delivery. Unrelated untracked files are not by themselves a Git conflict or proof of a GitHub permission failure. Respect each delivery tool's own instructions and allowed fallback paths; repository guidance cannot override those requirements or branch protection.
35
+ - Continue routine investigation and authorized delivery without repeated approval prompts. For a genuine decision, safety boundary or tool-policy blocker, ask or report it once with the exact consequence; do not loop while the user is unavailable. Preserve existing approval boundaries for profile installation, sign-out, disruptive restart and worktree checkout.
36
+
37
+ These are agent instructions and contract-drift checks, not a filesystem sandbox or a guarantee that every session uses a worktree.
38
+
30
39
  ## Product and architecture
31
40
 
32
41
  ### Confirmed product scope (#455, #456)
33
42
 
43
+ The native enhancement request (#460/#461) adds only reviewer-scoped Responses
44
+ sampling compatibility and an optional canonical-account hosted-search backend.
45
+ Use public native ownership/configuration proof and prepared dispatch; never
46
+ replace Web, select a backend, migrate accounts/settings, or bypass review.
47
+ Search permits one fixed capability proof and one final query within 25 seconds,
48
+ with four concurrent operations and configuration/credential/disposal fences.
49
+ The plugin settings may explicitly choose the native search model, defaulting to
50
+ automatic. List only the canonical account/native Responses intersection; metadata
51
+ is not search proof. Invalid or unavailable explicit choices fail without fallback.
52
+ Use a separate hidden volatile `nativeSearchModel` leaf with path-level CAS and
53
+ readback; never migrate or interpret the old `searchModel` as this choice.
54
+ The former plugin routing UI and managed Auto remain retired. Supplier calls,
55
+ live installation and restarts are separate from synthetic CI acceptance.
56
+
57
+ The user-authorized native model sync (#466, #479) is a narrow exception to the
58
+ no-settings-rewrite rule: after a visible preview and one explicit confirmation, one
59
+ revision-checked write may replace only
60
+ `llm-pi-ai.providers.github-copilot.models` in an existing canonical profile.
61
+ Prove current canonical-account metadata and the native adapter-owned catalog;
62
+ skip unrepresentable or uncertain model capabilities. Disclose additions,
63
+ updates, removals, skipped models and configured output request defaults.
64
+ Prepare the preview without forced discovery from existing verified evidence.
65
+ An existing `compat.supportsStrictMode: false` may be preserved only when at
66
+ least one synced Responses or Completions model supports it; block other unproven
67
+ compatibility overrides. Recheck account/catalog/preferences and Settings evidence
68
+ before the one-shot write, then read back both user and effective values. Never create a profile,
69
+ change other paths or perform this sync automatically.
70
+
34
71
  The user-confirmed direction on 2026-11-14 supersedes conflicting legacy feature
35
72
  requirements below: this plugin is a lightweight GitHub Copilot model integration
36
73
  for DSH Desktop, not a second agent product. The qualification target is the exact
@@ -54,8 +91,8 @@ contract used by ordinary native calls. A missing public seam is a concrete
54
91
  compatibility limit to report, not permission to invent a parallel relationship.
55
92
 
56
93
  Retire plugin-owned Auto and parent-follow policy/UI and custom hosted-search
57
- execution/routing, preserving bounded compatibility for existing selections and
58
- histories where needed. Retain GitHub Copilot account quota and useful
94
+ execution/routing. Old conversation continuity is not an acceptance requirement.
95
+ Retain GitHub Copilot account quota and useful
59
96
  enhancements; remove other functionality only when it is demonstrably redundant
60
97
  or unnecessary, not merely because it extends the basic model route. Never delete
61
98
  or rewrite user settings, accounts, or history, silently substitute a model, or
@@ -72,9 +109,18 @@ unsupported behavior must fail or diagnose explicitly; do not infer support,
72
109
  add model-ID routing rules, patch Core, or claim untested parity.
73
110
 
74
111
  When any later legacy detail in this guide conflicts with this confirmed scope,
75
- follow this section and the current acceptance criteria in #455/#456. Legacy
76
- behavior that is still needed to safely read old settings or histories remains
77
- compatibility code, not a reason to restore retired UI or product features.
112
+ follow this section and the current acceptance criteria in #455/#456.
113
+
114
+ The user clarified that the ordinary route should be DSH's native
115
+ `github-copilot` provider, with only useful plugin enhancements through public
116
+ APIs. Retire the separate managed route when native-route acceptance is met;
117
+ do not preserve it solely to continue old conversations or create a history
118
+ migration. Existing stored conversations, credentials and settings are not
119
+ authorized for deletion or rewriting. Explicitly document that old managed
120
+ route selections may become unavailable. Native model selection and actual
121
+ subagent invocation must be verified on `github-copilot`, not inferred from
122
+ managed-route tests. Record enhancements that cannot safely attach to native
123
+ APIs rather than patching Core or misrepresenting support.
78
124
 
79
125
  The last qualified release line is official DSH `0.2.1-rc.3`; its source/artifact CI passed on Windows/Linux in run `40098031196`, while Desktop artifacts/signatures remain unverified. DSH `0.2.2-rc.3` is the current requested candidate and has not passed this repository's required CI. The previous thirteen pins remain historical evidence, not current support or release gates. Do not treat either prerelease as a production Core upgrade recommendation. DSH's built-in `llm-pi-ai` owns the canonical GitHub Copilot provider, OAuth, grant format, token exchange, refresh, and normal model transport.
80
126
 
@@ -85,7 +131,7 @@ which runtime registrations, UI, and settings remain active:
85
131
  1. A conditional authorization-service bootstrap plus Host controller that joins DSH authorization, credentials, and settings.
86
132
  2. A Client Models provider-card contribution with one shared account-state owner, Client-safe Remote descriptors and a nested plugin-owned model-preferences disclosure; embed in an existing configured canonical row, suppress its separate footer controller, and retain footer/old-Core section fallback when no such row is mounted.
87
133
  3. Strict JSON normalization of pi-ai's provider-owned Copilot OAuth grant.
88
- 4. Preserve intentional absence of `llm-pi-ai.providers.github-copilot`; reconcile only existing legacy profiles and verified ownership journals. Fresh installations use the single account-discovered route; existing profiles require explicit migration, never silent removal.
134
+ 4. Preserve intentional absence of `llm-pi-ai.providers.github-copilot`; reconcile only existing legacy profiles and verified ownership journals. The confirmed #466 models-only sync is the narrow explicit exception above; never create or remove a native profile automatically.
89
135
  5. Direct provider-hosted search using the same Host-side credential lifecycle.
90
136
  6. Provider-scoped tool-schema compatibility for Copilot payload behaviors; Core remains the tool and execution owner.
91
137
  7. A bounded account-discovery route that supplies validated endpoint/capability metadata to the published native adapter, including explicit managed Responses sampling compatibility, plus exact plugin-owned model exclusions enforced across its directory, Auto pools and direct admission, without maintaining model-ID routing rules or changing Core's catalog.
@@ -139,7 +185,43 @@ Safe background diagnostics use bounded Error cause chains and fixed allowlisted
139
185
  codes, never raw errors. Installation alone neither selects nor invokes recovery.
140
186
  See `src/compaction-replay.ts` and `docs/manual-compaction-recovery.md` (#349).
141
187
 
142
- ## Approved multi-account ownership extension (#297)
188
+ ## Approved multi-account ownership extension (#297, #474)
189
+
190
+ The user-approved #297 extension allows independently authorized
191
+ `github-copilot/account-<opaque-id>` records in DSH's credentials service.
192
+ The later explicit #474 direction supersedes the earlier prohibition on
193
+ canonical writes only for a user-confirmed global account switch: copy the
194
+ selected normalized OAuth grant into `llm-pi-ai/github-copilot` through the
195
+ public serialized credential API so DSH's existing native provider uses it.
196
+ Do not intercept native reads, patch Core, create a second provider as the
197
+ switching solution, or change model/history/provider settings. The selected
198
+ account applies profile-wide to future native requests; in-progress requests
199
+ retain their admitted credentials.
200
+
201
+ Before replacing a different configured canonical grant, preserve it in a new
202
+ plugin-owned account record unless the previous selected account already owns
203
+ that exact grant. Refuse when preservation would exceed the account bound. On
204
+ later switches, synchronize the previous active account's saved grant from
205
+ canonical before replacement. Use exact per-record serialization/readback and
206
+ path-level Settings CAS. A failed Settings commit may roll back only while the
207
+ canonical record still exactly matches the attempted write; otherwise retain
208
+ data and report uncertainty. Fence native Agent turns, OAuth and account
209
+ mutations. Direct provider calls outside observable Agent turn lifecycle remain
210
+ outside the plugin's turn fence.
211
+ Refresh remains owned by native pi-ai `Models.getAuth()` and DSH
212
+ `modifyRecord()`; the pinned Copilot refresh keeps the refresh token stable.
213
+ If selection and canonical credential diverge after an external native sign-in,
214
+ show an actionable mismatch and require explicit recovery; never auto-migrate.
215
+
216
+ Keep the native UI and its canonical quota/search attribution. Existing
217
+ `github-copilot-preview` behavior and Session account overrides remain
218
+ separately plugin-owned legacy behavior; they are not required for native
219
+ switching. Disposal removes only plugin registrations. Native model selections
220
+ and explicit `web.searchProvider=github-copilot-hosted` still need user-selected
221
+ replacements before uninstall; missing configured Web backends return
222
+ `WEB_PROVIDER_CONFIGURED_MISSING`, not automatic fallback. Uninstall leaves the
223
+ last selected grant in the native canonical record. No automatic
224
+ Settings/history migration or sign-out.
143
225
 
144
226
  Login environments (#424) use only pinned native pi-ai OAuth for GitHub.com and
145
227
  validated single-label `tenant.ghe.com` Enterprise Cloud hosts. Preserve host
@@ -157,9 +239,9 @@ metadata-only Retry; late results and disposal cannot publish stale state.
157
239
  Never apply this deadline to add/cancel/switch/reauthorize/remove mutations,
158
240
  release their fences, cancel Host work or introduce an automatic retry.
159
241
 
160
- Account display names survive freshness expiry in bounded Host memory, never credential invalidation or failed verification. Visible account lists may ensure missing configured names without activating accounts; no disk name cache, credential copying or identity-based authorization. Turn admission captures the first verified name for the frozen account. A missing name may be filled by one existing nonforcing account-bound lookup only during that exact active, uncancelled turn/signal; never after turn/end/disposal. Evidence still requires actual native delivery and never reconstructs completed history (#322).
242
+ Account display names survive freshness expiry in bounded Host memory, never credential invalidation or failed verification. Visible account lists may ensure missing configured names without activating accounts; no disk name cache, incidental credential copying or identity-based authorization. Only the explicit confirmed native-switch preservation/projection above may copy a normalized grant. Turn admission captures the first verified name for the frozen account. A missing name may be filled by one existing nonforcing account-bound lookup only during that exact active, uncancelled turn/signal; never after turn/end/disposal. Evidence still requires actual native delivery and never reconstructs completed history (#322).
161
243
 
162
- The user approved independently authorized account records in the existing DSH credentials service. The canonical `llm-pi-ai/github-copilot` record remains unchanged as the compatibility account. Additional plugin-owned `github-copilot/account-<opaque-id>` records must be written directly by official pi-ai OAuth through public account-bound stores; never copy/move grants, refill the canonical record, introduce a separate credential storage service, patch Core, or implement another wire/catalog. Native `Models.getAuth()` and DSH `modifyRecord()` remain the refresh and serialization owners.
244
+ Additional plugin-owned `github-copilot/account-<opaque-id>` records are written directly by official pi-ai OAuth through public account-bound stores. Only an explicit user-confirmed switch may project a selected normalized grant into the canonical record as specified above; preserve the former canonical grant before the first replacement. Never intercept Core credential reads, introduce a separate credential service, patch Core, or implement another wire/catalog. Native `Models.getAuth()` and DSH `modifyRecord()` remain the refresh and serialization owners.
163
245
 
164
246
  Settings store only the opaque global account selector and explicit `sessionAccounts` rows. Missing/invalid selectors or records fail explicitly, without another-account fallback. Models manages reauthorization/removal and the global default; Credits may select an already authorized account for this Session's subsequent turns, restore global inheritance or run add-only authorization without selecting it (#305/#318). An explicit choice equal to the default remains explicit. Freeze account ownership before Auto assessment and request admission, holding mutation fences until native `turn/end`/disposal; later Session/default changes never redirect running steps, retries or search. Account-local credentials, metadata, quota, proof cancellation and native adapter composition must remain isolated. Keep one public adapter/controller registration, with no second wire/catalog or Core changes. Reauthorization/removal of a pinned record stays blocked; global-default selection may continue independently.
165
247
 
@@ -256,7 +338,7 @@ evidence is content-free and ephemeral, never a new persistent population.
256
338
  See `docs/copilot-accounts.md` (#385).
257
339
  - Copilot OAuth grant writes must rebuild only pi-ai's documented provider fields as a fresh plain JSON object; unrelated extension values never reach DSH credential storage.
258
340
  - Settings changes are path-level. Never replace the whole `llm-pi-ai` section or unrelated provider profiles.
259
- - Sign-out deletes only the active Copilot credential record and keeps other records, the selector and route settings. A missing selected noncanonical slot fails explicitly; only an explicit eligible Add or Switch recovers it, never automatic canonical fallback.
341
+ - Native sign-out deletes only `llm-pi-ai/github-copilot` and keeps plugin account records, the selector and route settings. A selected plugin account remains saved and must be explicitly applied again after sign-out; a missing selected slot fails explicitly, never automatic canonical fallback.
260
342
  - Hosted search serves either an eligible initiating `github-copilot` / managed `github-copilot-preview` route, or provider-owned independent search selected by the web-search router. Independent search preserves a nonempty explicit `searchModel` override; otherwise the Host considers at most three eligible Responses models from current account route facts, in deterministic ID order, without a static model list. Metadata alone is not search proof, and the final user query is sent once after candidate proof, never replayed across models. Both paths require an account-available model and supported search protocol; custom inline transport remains legacy-canonical only. Never substitute the global chat default or another Session's identity. The default `probe: true` path requires successful capability proof; `probe: false` is an explicit trust override, not an implicit fallback. Any request containing a file block, including one nested in tool-result content, must bypass the custom wire through `next()` so Core retains file projection ownership.
261
343
  - Misconfiguration and API drift fail loudly with a named missing seam. Do not fall back to process-local secrets or implicit machine state.
262
344
  - Host, Client, and Remote package entries must stay independently buildable and exported.
@@ -270,7 +352,7 @@ evidence is content-free and ephemeral, never a new persistent population.
270
352
  - Without `agents.currentInitiator`, traditional hosted search is unavailable with a named diagnostic; explicit marked `GenerateOptions` can still bind guarded inline requests, uncached if necessary. Credential notification during initial lazy discovery cannot distinguish own rotation from external account change via public status: fail closed with `WEB_PROVIDER_UNAVAILABLE` before probe/wire; a later user/driver request may retry, never automatically.
271
353
  - The new native Copilot draft warning says Save adds another real group, not a second account. Public additive APIs cannot veto Add or disable Save; this is warning-only, not enforced single-route registration. Core Edit/Delete remain.
272
354
  - Public `session.selectModel` also saves the future global default. Choose only approved Sessions/default; preserve other selected/history-backed Sessions, but do not promise unselected empty Sessions cannot inherit that default.
273
- - Code does not auto-migrate settings, credentials or history. After plugin release, approved Ops migration may compare-and-swap only the reviewed user-native `llm-pi-ai.providers.github-copilot` path after ruling out base/journal conflicts, then read back settings and registry. No hidden groups, bulk rewrites or credential copying. Search allowlist updates to the managed ID require a separate reviewed Ops edit; never silently broaden old lists.
355
+ - Code does not automatically migrate settings, credentials or history; only a user-confirmed account switch updates the canonical credential as described above. After plugin release, approved Ops migration may compare-and-swap only the reviewed user-native `llm-pi-ai.providers.github-copilot` path after ruling out base/journal conflicts, then read back settings and registry. No hidden groups, bulk rewrites or credential copying outside the explicit switch. Search allowlist updates to the managed ID require a separate reviewed Ops edit; never silently broaden old lists.
274
356
 
275
357
  ## Live migration readiness (alpha.9, #101)
276
358
 
@@ -304,7 +386,7 @@ The release admission, development dependency and CI targets are exact official
304
386
 
305
387
  These pins document compatibility evidence. They do not authorize creating another controlled Core patch or making one a prerequisite for new plugin fixes.
306
388
 
307
- - Models UI: `0.1.2-rc.1`, `0.1.3-alpha.1`, `0.1.5-alpha.1`, `0.1.5-alpha.2`, `0.1.5-rc.1`, `0.1.5-rc.2`, `0.1.6-alpha.1`, `0.1.6-alpha.2`, `0.2.0-rc.1` and `0.2.0-rc.2` expose `settings.models.provider-card`, keyed by settings namespace `llm-pi-ai`, to embed login/status/Refresh/Manage in a mounted configured canonical `github-copilot` row and suppress the separate footer controller. With no such row mounted, retain footer fallback; historical 0.1.1-rc.2 uses a dedicated `settings.section`. Preserve the shared account-state owner across transfer only while another eligible surface remains mounted. Unmounting the last surface or replacing declarations without overlapping mounts stops polling; a later controller reads status and separately non-forcing ensures missing/idle/stale/error/loading signed-in metadata, without replaying the old forced-login action. Manual Refresh models lives inside Manage; errors expose Retry. Opening Models is no longer guaranteed network-free, but status/details themselves remain pure. This additive slot cannot replace Core Edit/Delete: retain the native editor, while normal plugin discovery needs no manual model definitions. UI integration must not merge/remove actual canonical and `github-copilot-preview` routes or rewrite credentials, configuration, history or selection.
389
+ - Models UI: `0.1.2-rc.1`, `0.1.3-alpha.1`, `0.1.5-alpha.1`, `0.1.5-alpha.2`, `0.1.5-rc.1`, `0.1.5-rc.2`, `0.1.6-alpha.1`, `0.1.6-alpha.2`, `0.2.0-rc.1` and `0.2.0-rc.2` expose `settings.models.provider-card`, keyed by settings namespace `llm-pi-ai`, to embed login/status/Refresh/Manage in a mounted configured canonical `github-copilot` row and suppress the separate footer controller. With no such row mounted, retain footer fallback; historical 0.1.1-rc.2 uses a dedicated `settings.section`. Preserve the shared account-state owner across transfer only while another eligible surface remains mounted. Unmounting the last surface or replacing declarations without overlapping mounts stops polling; a later controller reads status and separately non-forcing ensures missing/idle/stale/error/loading signed-in metadata, without replaying the old forced-login action. Manual Refresh models lives inside Manage; errors expose Retry. Opening Models is no longer guaranteed network-free, but status/details themselves remain pure. This additive slot cannot replace Core Edit/Delete: retain the native editor, while normal plugin discovery needs no manual model definitions. Native account switching is the explicit, confirmed canonical credential exception above; other route, model, history and Settings ownership remains unchanged.
308
390
  - Canonical authorization flow key: `llm-pi-ai/github-copilot`; additional account flows bind directly to their own plugin-owned record under the approved #297 contract.
309
391
  - Authorization verification links recognize the public `window.dshDesktop.protocolVersion === 1` marker and use `_self` so Desktop's existing `will-navigate` handler opens the system browser without popup creation. Other hosts retain `_blank`; display a selectable manual URL in both cases. This does not confirm browser launch or OAuth success. Manage omits the compatibility disclosure but retains actionable legacy diagnostics and explicit repair; migration documentation and backend ownership are unchanged.
310
392
  - Authorization service: rc.1 Core provides it; the rc.2 web/headless profiles rely on this package's runtime dependency and conditional bootstrap.
@@ -474,7 +556,7 @@ The release CI matrix targets only exact official `0.2.1-rc.3` on Windows and Li
474
556
  | Last-success timestamp (alpha.7, #97) | Show `snapshot.discoveredAt` once beside count outside Manage: English relative text, full LOCAL date/time/zone tooltip and accessible semantic `time`; missing/invalid/no account hides it, future uses absolute text. Pending/error retains last success, successful refresh replaces it and sign-out clears it. One mounted 60s display-only timer makes no RPC/status/discovery calls and is disposed with timestamp/unmount; cache/discovery lifecycle unchanged |
475
557
  | Definitive `UNKNOWN_MODEL` | One bounded metadata refresh, never message replay or automatic model switching; generic HTTP/network errors are not guessed to be unknown models |
476
558
  | README screenshot | `copilot-search-routing.png` shows the current built plugin-detail routing card with synthetic providers in an isolated browser fixture. It proves only the current presentation surface, not live credentials, provider availability, search success or Desktop activation. |
477
- | Host attach/restart | Reconciles the stored profile; search proofs stay lazy and do not start at attach |
559
+ | Host attach/restart | Does not repair or rewrite the stored native profile; search proofs stay lazy and do not start at attach |
478
560
  | Background credential/reset notifications | Invalidate evidence and clear Client state with read-only status; no forced discovery on every token event; next Models open/use ensures metadata |
479
561
  | Eligible model/search request | May resolve/refresh credentials and run bounded capability proof; changes during proof must fail closed rather than reuse another account's proof |
480
562
  | Release install | Writes a named user profile; installed on disk is not loaded in the running Host |
package/CHANGELOG.md CHANGED
@@ -1,5 +1,66 @@
1
1
  # Changelog
2
2
 
3
+ ## 0.1.0-alpha.11.dsh.0.2.2.rc.3 (prepared)
4
+
5
+ - Show native model-list changes and output defaults automatically from current verified account metadata; one **Sync models** action explicitly confirms the write (#479).
6
+ - Preserve an existing disabled native strict-mode override when the synced list contains a supporting Responses or Completions model; unproven overrides remain blocked.
7
+ - Recheck account, catalog, preference and plan-expiry evidence immediately before writing; keep revision and readback fences.
8
+ - Preparation does not force discovery, and sync, profile installation and Desktop restart remain explicit.
9
+
10
+ ## 0.1.0-alpha.10.dsh.0.2.2.rc.3 (published)
11
+
12
+ - Allow an explicit native Copilot hosted-search model in plugin settings, with account and native catalog filtering (#478).
13
+ - Preserve automatic selection by default, require the existing search capability proof, and fail without switching if a chosen model is unavailable.
14
+
15
+ ## 0.1.0-alpha.9.dsh.0.2.2.rc.3 (published)
16
+
17
+ - Apply confirmed account switches to DSH's existing native `github-copilot` credential, preserving the replaced grant and protecting observable in-progress native Agent turns.
18
+ - Allow #466 native model sync for a saved-account selection only when its normalized grant matches the native canonical credential; mismatches and unavailable credentials remain blocked.
19
+ - Keep `github-copilot-preview` registered. This change does not complete #474's native-only route acceptance or retire the separate preview route.
20
+
21
+ ## 0.1.0-alpha.8.dsh.0.2.2.rc.3 (published)
22
+
23
+ - Preview and explicitly confirm a one-time sync of enabled canonical-account models to an existing native Copilot provider (#466).
24
+ - Preserve only models whose native protocol and account capability metadata can be safely represented; disclose skipped models, removals, updates, and per-request output defaults before replacing the native models setting.
25
+ - Recheck account, adapter-owned catalog, preference and Settings evidence before the path-level write and verify both stored and effective readback. Live Desktop activation and provider calls are not established by synthetic tests.
26
+
27
+ ## 0.1.0-alpha.7.dsh.0.2.2.rc.3 (prepared)
28
+
29
+ - Qualify native search and Auto reviewer compatibility using the adapter-owned pi-ai catalog even when the plugin resolves a separate copy (#461).
30
+ - Leave unknown package exports, model protocols and changed route ownership unavailable rather than guessing or changing native settings.
31
+
32
+ ## 0.1.0-alpha.6.dsh.0.2.2.rc.3 (prepared)
33
+
34
+ - Permit managed multi-account switching alongside independently configured native Copilot, retaining credential/turn isolation and the native interface (#470).
35
+ - Label managed models `GitHub Copilot (multi-account)` and preserve native configuration, credentials and selected models on disposal.
36
+ - Clarify that plugin-model and configured plugin-search selections require explicit replacements before uninstall; no automatic fallback or settings rewrite.
37
+
38
+ ## 0.1.0-alpha.5.dsh.0.2.2.rc.3 (prepared)
39
+
40
+ - Show the native Credits account identity only after verifying the canonical OAuth grant and quota belong together; keep quota available when identity is unavailable.
41
+ - Use scoped Node and system certificate trust for the existing GitHub identity lookup without weakening TLS verification.
42
+
43
+ ## 0.1.0-alpha.4.dsh.0.2.2.rc.3 (prepared)
44
+
45
+ - Remove the hosted-search aside from the managed account-model summary and hide retired Auto descriptions when no historical diagnostic data exists. Historical Auto data remains available and is identified before JSON sharing, including its possible model IDs (#467).
46
+ - Preserve existing settings, diagnostic evidence, quota and compatibility; no live profile, history or account is changed.
47
+ - Target DSH 0.2.2-rc.3; publication and live Desktop activation remain separate from this source change.
48
+
49
+ ## 0.1.0-alpha.3.dsh.0.2.2.rc.3 (prepared)
50
+
51
+ - Extend reviewer-only temperature omission to qualified DSH native `github-copilot` Responses calls, preserving ordinary Chat and native verdict/permission ownership (#460).
52
+ - Add optional canonical-account Copilot hosted search through the existing native Web registry, with one bounded proof and one final query, cancellation and configuration/credential invalidation (#461).
53
+ - Preserve native settings, selected backends, accounts and histories. No live installation, restart or supplier acceptance is implied.
54
+
55
+ ## 0.1.0-alpha.2.dsh.0.2.2.rc.3 (prepared)
56
+
57
+ - Explain the native provider's canonical OAuth binding and the existing additional-account coexistence limit, while retaining the visible account panel outside the native Add draft (#458).
58
+ - Bind native-route quota to the canonical OAuth record rather than the plugin-selected account, and show an explicit unavailable state when native credential or endpoint attribution cannot be proven.
59
+ - Keep native quota and context-incident diagnostics available without optional managed-route Remotes, and stop automatically modifying native provider settings at startup or sign-in.
60
+ - Exercise native Copilot subagent selection and synthetic concurrent requests with the plugin absent, enabled and disposed.
61
+ - The native route still uses its own catalog; account-discovered models apply to `github-copilot-preview`. Copilot-hosted search, native Auto-review sampling compatibility and native per-Session multi-account routing remain incomplete.
62
+ - Live OAuth, provider calls, billing attribution and Desktop activation remain unverified.
63
+
3
64
  ## 0.1.0-alpha.1.dsh.0.2.2.rc.3 (prepared)
4
65
 
5
66
  - Begin narrowing the product to account-authorized Copilot models through DSH's published native adapter. Plugin-owned Auto and parent-follow routing and hosted-search composition are retired in the candidate; preserve account quota and review other enhancements before removing only demonstrably unnecessary functionality.
package/README.md CHANGED
@@ -67,15 +67,15 @@ After the exact compatible release is available and verified, download its
67
67
  original asset and checksum in an empty directory:
68
68
 
69
69
  ```sh
70
- curl -fLO https://github.com/cloga/dsh-github-copilot/releases/download/v0.1.0-alpha.1.dsh.0.2.2.rc.3/dsh-github-copilot-0.1.0-alpha.1.dsh.0.2.2.rc.3.tgz
71
- curl -fLO https://github.com/cloga/dsh-github-copilot/releases/download/v0.1.0-alpha.1.dsh.0.2.2.rc.3/SHA256SUMS
70
+ curl -fLO https://github.com/cloga/dsh-github-copilot/releases/download/v0.1.0-alpha.11.dsh.0.2.2.rc.3/dsh-github-copilot-0.1.0-alpha.11.dsh.0.2.2.rc.3.tgz
71
+ curl -fLO https://github.com/cloga/dsh-github-copilot/releases/download/v0.1.0-alpha.11.dsh.0.2.2.rc.3/SHA256SUMS
72
72
  sha256sum --check SHA256SUMS
73
73
  ```
74
74
 
75
75
  For the `web` profile, install the same Release asset:
76
76
 
77
77
  ```sh
78
- dsh plugin --profile web add https://github.com/cloga/dsh-github-copilot/releases/download/v0.1.0-alpha.1.dsh.0.2.2.rc.3/dsh-github-copilot-0.1.0-alpha.1.dsh.0.2.2.rc.3.tgz
78
+ dsh plugin --profile web add https://github.com/cloga/dsh-github-copilot/releases/download/v0.1.0-alpha.11.dsh.0.2.2.rc.3/dsh-github-copilot-0.1.0-alpha.11.dsh.0.2.2.rc.3.tgz
79
79
  ```
80
80
 
81
81
  Choose the intended profile explicitly. Then:
@@ -88,6 +88,92 @@ Choose the intended profile explicitly. Then:
88
88
  No manually defined Copilot model, pasted token, external gateway, or
89
89
  `copilot2api` service is required. Account and model availability are separate:
90
90
  successful sign-in does not guarantee every model or capability is available.
91
+ The plugin's account-discovered models and capabilities apply to the
92
+ `github-copilot-preview` route. DSH's native `github-copilot` route uses its
93
+ own bundled or configured catalog; the two routes do not automatically share
94
+ model discovery.
95
+
96
+ To copy enabled models from the verified account used by the native provider into an existing
97
+ native provider, open **Manage → Model preferences**, review the displayed
98
+ additions, updates, removals, skipped models and per-request output defaults,
99
+ then choose **Sync models**. Preparing the display uses the current verified
100
+ account snapshot without forcing discovery; if it is unavailable, use
101
+ **Refresh models**. This one-time snapshot replaces only
102
+ `llm-pi-ai.providers.github-copilot.models` with Settings CAS and readback.
103
+ The nonempty saved list replaces the native built-in catalog and remains after
104
+ the plugin is unloaded or uninstalled. Copying model settings does not transfer
105
+ the managed route's image admission checks or tool-schema filtering to native
106
+ requests, nor prove that supplier calls will succeed.
107
+ Models with unproven or incompatible native catalog protocols, unknown or
108
+ narrower server input caps, unknown context or vision support, or unknown or
109
+ unsupported reasoning controls are skipped rather than guessed.
110
+ New Completions and Anthropic models without a native catalog compatibility
111
+ baseline are also skipped; catalog-backed models retain native compatibility.
112
+ Image models are included only when the account explicitly supports all four
113
+ native request formats: PNG, JPEG, WebP, and GIF. Custom native authentication,
114
+ endpoints, headers, nonempty model overrides, or unproven route compatibility
115
+ overrides block sync rather than changing those settings. An existing
116
+ `compat.supportsStrictMode: false` is preserved when at least one synced
117
+ Responses or Completions model supports that native override. An existing native default
118
+ reasoning effort must also be supported by each synced model. Core uses each
119
+ configured `maxTokens` as that model's per-request output default. The sync does
120
+ not change credentials, select a model, alter history, or automatically follow
121
+ later account changes.
122
+
123
+ Use **Manage → Account management → Switch** in the native GitHub Copilot
124
+ account panel to apply a saved account to DSH's canonical
125
+ `llm-pi-ai/github-copilot` credential slot. This is profile-wide: subsequent
126
+ native requests use that account. The first switch preserves the prior native
127
+ OAuth grant as a saved account. In-progress requests are not redirected, and
128
+ the operation does not change model selections, provider settings or history.
129
+ Account switching does not change the native provider's bundled/configured
130
+ model catalog, which is not guaranteed to filter models by account entitlement.
131
+ The existing `github-copilot-preview` route remains a separate plugin-owned
132
+ model route; it is not required for native account switching.
133
+ Starting the plugin or completing sign-in does not automatically repair the
134
+ native provider's settings.
135
+ The plugin registers optional `github-copilot-hosted` search in DSH's existing
136
+ Web service. Select it explicitly in native Web settings and enable the native
137
+ search tool as needed; installation does not change the selected backend.
138
+ Search uses only the canonical OAuth account and models shared by the native
139
+ configured catalog and current account metadata. In **Plugins → dsh-github-copilot
140
+ → details → Copilot search model**, choose **Automatic** (the default) or one
141
+ eligible model. Opening or reloading this control fetches account metadata and
142
+ may refresh native OAuth; metadata alone does not prove search support. If an
143
+ explicitly selected model is no longer eligible, search fails without choosing
144
+ another model. Each search makes one fixed capability probe and, only after
145
+ proof, one user query; both may incur charges.
146
+ Custom endpoint, credential or transport overrides and unproven models remain
147
+ unavailable. There is no model retry, backend replacement or plugin routing UI.
148
+ The native Auto reviewer's qualified Copilot Responses requests omit
149
+ `temperature`; ordinary Chat and native allow/deny/error/cancel behavior remain
150
+ unchanged. Qualification uses the native adapter's pi-ai catalog even when
151
+ the plugin resolves a separate copy; missing protocol facts remain unavailable.
152
+ See [reviewer compatibility](./docs/auto-review-sampling.md).
153
+ The native route's quota and optional identity display use only the canonical OAuth account. If the
154
+ provider names a credential, endpoint or nonempty headers override, or its configuration
155
+ cannot be verified, quota is shown as unavailable rather than attributed to a
156
+ different account. This is not proof of request-level billing attribution.
157
+ Native context-incident diagnostics remain available without the optional
158
+ managed continuation service; they do not replace DSH's context meter.
159
+
160
+ ### Removing the enhancement
161
+
162
+ Unloading the plugin removes its own routes, UI and listeners, not native
163
+ Copilot credentials, configuration, model selections or history. Native
164
+ **GitHub Copilot** remains usable with whichever account was last explicitly
165
+ applied to the canonical credential slot. Removing the plugin is not signing
166
+ out; explicit sign-out or removal of that authorization is a different action
167
+ and can affect native login.
168
+
169
+ Plugin-only model selections do not become native automatically. Before removal,
170
+ explicitly select native models for Sessions/defaults using
171
+ `github-copilot-preview`. If Web is set to `github-copilot-hosted`, select another
172
+ available backend in native Web settings first. Removing the plugin does not
173
+ rewrite Web settings: a retained missing backend produces
174
+ `WEB_PROVIDER_CONFIGURED_MISSING`, not an automatic fallback. Additional-account
175
+ management and plugin-specific search require the plugin; the last selected
176
+ native OAuth grant remains in DSH's canonical credential record.
91
177
 
92
178
  Desktop's native package manager and its bundled CLI have different contracts
93
179
  from a standalone profile. Review the [Desktop CLI evidence](./docs/npm-distribution.md#desktop-bundled-cli-on-official-rc2)
package/README.zh.md CHANGED
@@ -55,15 +55,15 @@ node scripts/select-core-release.mjs 0.2.2-rc.3
55
55
  精确兼容版本发布且通过验证后,在空目录下载原始制品并校验:
56
56
 
57
57
  ```sh
58
- curl -fLO https://github.com/cloga/dsh-github-copilot/releases/download/v0.1.0-alpha.1.dsh.0.2.2.rc.3/dsh-github-copilot-0.1.0-alpha.1.dsh.0.2.2.rc.3.tgz
59
- curl -fLO https://github.com/cloga/dsh-github-copilot/releases/download/v0.1.0-alpha.1.dsh.0.2.2.rc.3/SHA256SUMS
58
+ curl -fLO https://github.com/cloga/dsh-github-copilot/releases/download/v0.1.0-alpha.11.dsh.0.2.2.rc.3/dsh-github-copilot-0.1.0-alpha.11.dsh.0.2.2.rc.3.tgz
59
+ curl -fLO https://github.com/cloga/dsh-github-copilot/releases/download/v0.1.0-alpha.11.dsh.0.2.2.rc.3/SHA256SUMS
60
60
  sha256sum --check SHA256SUMS
61
61
  ```
62
62
 
63
63
  例如安装到 `web` profile:
64
64
 
65
65
  ```sh
66
- dsh plugin --profile web add https://github.com/cloga/dsh-github-copilot/releases/download/v0.1.0-alpha.1.dsh.0.2.2.rc.3/dsh-github-copilot-0.1.0-alpha.1.dsh.0.2.2.rc.3.tgz
66
+ dsh plugin --profile web add https://github.com/cloga/dsh-github-copilot/releases/download/v0.1.0-alpha.11.dsh.0.2.2.rc.3/dsh-github-copilot-0.1.0-alpha.11.dsh.0.2.2.rc.3.tgz
67
67
  ```
68
68
 
69
69
  请明确选择目标 profile,然后:
@@ -74,6 +74,62 @@ dsh plugin --profile web add https://github.com/cloga/dsh-github-copilot/release
74
74
 
75
75
  无需手工定义 Copilot 模型、粘贴 token、使用外部网关或安装
76
76
  `copilot2api`。账号登录成功不代表所有模型及其能力都可用。
77
+ 插件自动发现的账号模型及能力适用于 `github-copilot-preview` 路线;DSH 原生
78
+ `github-copilot` 路线使用自己的内置或用户配置目录,两条路线不会自动共享模型发现结果。
79
+
80
+ 如需将原生 provider 所用的已验证账号的启用模型复制到已配置的原生 provider,请打开
81
+ **Manage → Model preferences**,查看显示的新增、更新、移除、跳过项和每次请求的输出
82
+ 默认值,然后选择 **Sync models**。页面使用当前已验证的账号快照准备这些信息,不强制
83
+ 重新发现;如果快照不可用,请使用 **Refresh models**。此显式单次快照只通过
84
+ Settings CAS 和回读替换 `llm-pi-ai.providers.github-copilot.models`。原生 profile
85
+ 中保存的非空列表会替代原生内置目录,卸载或停用插件后仍然保留。复制模型设置不会将
86
+ 托管路线的图像准入检查或工具 schema 过滤迁移到原生请求,也不能证明供应商调用成功。
87
+ 无法证明或与原生目录不兼容的协议、未知或更窄的服务端输入上限、未知上下文或图像支持,
88
+ 以及未知或不支持的推理控制会被跳过,不会猜测。缺少原生目录兼容性基线的新 Completions 和
89
+ Anthropic 模型也会被跳过;已有目录模型保留原生兼容性。只有账号明确支持 PNG、JPEG、WebP、GIF 四种原生请求图像格式时,
90
+ 才会同步图像模型。原生 provider 存在自定义认证、端点、请求头、非空模型覆盖或无法验证的
91
+ 路线兼容性覆盖时,同步会停止,不会修改这些设置。已有的 `compat.supportsStrictMode: false`
92
+ 会保留,但至少一个同步模型必须使用支持该设置的 Responses 或 Completions 协议。已有的
93
+ 原生默认推理级别也必须受模型支持。Core 会将配置的
94
+ `maxTokens` 同时作为模型的单次请求输出默认值。同步不修改凭据、选择或历史,也不会自动
95
+ 跟随后续账号变化。
96
+
97
+ 在原生 GitHub Copilot 账号面板的 **Manage → 账号管理 → 切换** 中选择账号,
98
+ 会将该账号应用到 DSH canonical 凭据槽 `llm-pi-ai/github-copilot`,供此 profile
99
+ 后续的原生请求使用。首次切换会将原有原生 OAuth 授权保留为已保存账号。
100
+ 切换不会重定向正在进行的请求,也不会更改模型选择、provider 设置或历史。
101
+ 原生 provider 的内置/配置模型目录不会因此按账号权限过滤。现有
102
+ `github-copilot-preview` 仍是独立的插件模型路线,但原生账号切换不依赖它。
103
+ 启动插件或完成登录时,不会自动修复原生 provider 设置。
104
+ 插件在 DSH 现有 Web 服务中注册可选的 `github-copilot-hosted` 搜索后端。
105
+ 请在原生 Web 设置中明确选择,并按需启用原生搜索工具;安装不会改变默认后端。
106
+ 搜索只使用 canonical OAuth 账号,以及原生配置目录与当前账号元数据共同支持的模型。
107
+ 在 **插件 → dsh-github-copilot → 详情 → Copilot search model** 中可选择“Automatic”(默认)
108
+ 或指定一个符合条件的模型。打开或重新加载此控件会获取账号模型元数据,可能刷新原生 OAuth;
109
+ 元数据本身不证明支持搜索。如果指定模型不再符合条件,搜索会明确失败,不会自动换模型。
110
+ 每次先发送一个固定能力探测,证明可用后才发送一次用户查询;两者均可能产生费用。
111
+ 自定义端点、凭据或传输覆盖,以及无法确认的模型,保持不可用。没有自动换模型重试、
112
+ Web 服务替换或旧插件路由 UI。
113
+ 原生 Auto reviewer 经确认的 Copilot Responses 审核请求会省略 `temperature`;
114
+ 普通聊天和原生 allow/deny/error/cancel 行为不变。即使插件解析到另一份 pi-ai,
115
+ 资格判断也使用原生适配器的目录;无法确认协议时仍不可用。参见
116
+ [审核兼容说明](./docs/auto-review-sampling.md)。
117
+ 原生路线的额度和可选身份显示只使用 canonical OAuth 账号;如果 provider 指定了其他凭据、
118
+ 端点或非空请求头,或无法确认其配置,则显示额度不可用,不会将其他账号的额度归到原生路线。
119
+ 这不证明单次请求实际计费的账号。
120
+ 原生上下文异常诊断不依赖可选的托管续接服务,也不会替代 DSH 的上下文计量。
121
+
122
+ ### 移除增强
123
+
124
+ 卸载插件只撤销插件自己的路线、界面和监听,不删除原生 Copilot 凭据、配置、模型选择或历史。
125
+ 原生 **GitHub Copilot** 继续使用最近一次明确应用到 canonical 凭据槽的账号。卸载不是退出登录;
126
+ 显式退出或移除原始授权是另一项操作,会影响原生登录。
127
+
128
+ 依赖插件的选择不会自动变成原生选择。卸载前,请明确将使用 `github-copilot-preview`
129
+ 的 Session/默认模型切回原生模型。如果 Web 选中了 `github-copilot-hosted`,
130
+ 请先在原生 Web 设置中选择其他可用后端。卸载不会改写 Web 设置;
131
+ 保留已缺失的后端会返回 `WEB_PROVIDER_CONFIGURED_MISSING`,不会自动回退。
132
+ 附加账号管理和插件专属搜索仍然依赖插件;最近选中的原生 OAuth 授权会保留在 DSH canonical 凭据记录中。
77
133
 
78
134
  Desktop 原生包管理器及其内置 CLI 与独立 profile 的操作约束不同。安装前请阅读
79
135
  [Desktop CLI 证据](./docs/npm-distribution.md#desktop-bundled-cli-on-official-rc2)及