Commit af988db
test
Merge origin/master into fix/issue-885
Three textual conflicts, all resolved by keeping both sides:
- docs/PRIVACY.md: master's disclosure of the launchd LaunchAgent stays,
re-tensed as residue of the proxy-attach releases to match this branch's
"nothing installs the CA into a system trust store any more"; the lifetime
paragraph keeps master's added facts (permitted hosts, launchd variable)
inside this branch's wording about detach and the grant.
- src/core/commands/status.js: master's describePermittedHosts is kept
verbatim; describeLaunchdEnv keeps this branch's doc comment explaining
why it states rather than prescribes.
- src/core/daemon/status.js: collectProxyTrust takes both master's
timeout-bounded probes and this branch's `config` argument, and returns
both `hosts` and `proxyModeConfigured`.
One semantic conflict, from master's #817 pinning the `--json` shape of the
migration pointer against `claude` while this branch stops the claude row
declaring `compose.gateway_proxy_mode`. Both pins are kept by driving them
through the staged picker row that still declares proxy attach, the way this
branch already converted the rest of the file, plus a new pin that a `--json`
claude attach on a TTY carries no pointer either.
LLP 0251 gains the `Extended-by: LLP 0262` forward-ref LLP 0243 already
carried, since its section 2 names the claude declarers this branch removes.46 files changed
Lines changed: 3268 additions & 95 deletions
File tree
- docs
- hypaware-core/plugins-workspace
- ai-gateway/src
- claude/skills/hypaware-query
- codex/skills/hypaware-query
- llp
- src/core
- cli
- wizard
- commands
- daemon
- tls
- test
- core
- cli/wizard
- plugins
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
338 | 338 | | |
339 | 339 | | |
340 | 340 | | |
341 | | - | |
342 | | - | |
343 | | - | |
344 | | - | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
| 344 | + | |
| 345 | + | |
| 346 | + | |
| 347 | + | |
| 348 | + | |
| 349 | + | |
| 350 | + | |
| 351 | + | |
| 352 | + | |
| 353 | + | |
| 354 | + | |
| 355 | + | |
| 356 | + | |
| 357 | + | |
| 358 | + | |
| 359 | + | |
345 | 360 | | |
346 | 361 | | |
347 | 362 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
78 | 78 | | |
79 | 79 | | |
80 | 80 | | |
81 | | - | |
82 | | - | |
83 | | - | |
84 | | - | |
85 | | - | |
86 | | - | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
87 | 102 | | |
88 | 103 | | |
89 | 104 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
432 | 432 | | |
433 | 433 | | |
434 | 434 | | |
435 | | - | |
436 | | - | |
437 | | - | |
| 435 | + | |
| 436 | + | |
| 437 | + | |
| 438 | + | |
| 439 | + | |
| 440 | + | |
| 441 | + | |
| 442 | + | |
438 | 443 | | |
439 | 444 | | |
440 | 445 | | |
441 | 446 | | |
442 | 447 | | |
443 | 448 | | |
444 | 449 | | |
445 | | - | |
| 450 | + | |
| 451 | + | |
446 | 452 | | |
447 | 453 | | |
448 | 454 | | |
| |||
0 commit comments