Skip to content

Commit b2d572d

Browse files
committed
merge: absorb main's vendor snapshot, resolving every conflict toward this branch
2 parents 42a2c17 + c1a9d03 commit b2d572d

6 files changed

Lines changed: 16 additions & 8 deletions

File tree

_typos.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,11 @@ dows = "dows" # formatDows — days-of-week (cron)
2626
fo = "fo" # `/FO` flag of Windows schtasks
2727
pn = "pn" # "PNGs" tokenized as PN by the checker
2828
iterm = "iterm" # iTerm2 terminal app identifier
29+
bject = "bject" # regex fragment matching z.object and zObject
30+
nin = "nin" # Mongo-style $nin query operator
31+
ba = "ba" # before/after design-system CSS class prefix
32+
ot = "ot" # order-type binary codec variable
33+
als = "als" # AsyncLocalStorage field abbreviation
34+
oint = "oint" # LaTeX contour-integral command
35+
hom = "hom" # LaTeX homomorphism command
36+
multline = "multline" # LaTeX multiline equation environment

apps/pythinker-web/src/api/daemon/agentEventProjector.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,7 @@ export interface AgentProjector {
546546
/** Project a single raw agent-core event into zero or more AppEvents. Never throws. */
547547
project(rawType: string, payload: unknown, sessionId: string, meta?: ProjectMeta): AppEvent[];
548548
/**
549-
* Bind an externally-known promptId to the next turn.startd for this session.
549+
* Bind an externally-known promptId to the next turn.started for this session.
550550
* Call this right after submitPrompt() returns, before the first turn.started arrives.
551551
*/
552552
bindNextPromptId(sessionId: string, promptId: string): void;

docs/zh/guides/server.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Token: ...
2424
Stop: Ctrl+C
2525
```
2626

27-
服务在前台运行,按 `Ctrl-C` 干净退出。`--host``--log-level` 等完整选项见 [pythinker 命令参考](../reference/pythinker-command.md#pythinker-web)
27+
服务在前台运行,按 `Ctrl-C` 干净退出。`--host``--log-level` 等完整选项见 [pythinker 命令参考](../../reference/pythinker-command.md#pythinker-web)
2828

2929
## 鉴权
3030

@@ -41,7 +41,7 @@ token 泄露时运行 `pythinker web rotate-token` 轮换:新 token 立即写
4141
如果把服务绑定到非本机地址(`--host`),建议额外设置 `PYTHINKER_CODE_PASSWORD` 环境变量作为并列凭证;此时服务端会对鉴权失败自动限流。
4242

4343
::: danger 警告
44-
`--dangerous-bypass-auth` 会彻底关闭鉴权,任何能访问该端口的人都能控制你的会话、文件系统和 shell。仅在可信网络或自有鉴权代理之后使用,详见 [pythinker 命令参考](../reference/pythinker-command.md#pythinker-web)
44+
`--dangerous-bypass-auth` 会彻底关闭鉴权,任何能访问该端口的人都能控制你的会话、文件系统和 shell。仅在可信网络或自有鉴权代理之后使用,详见 [pythinker 命令参考](../../reference/pythinker-command.md#pythinker-web)
4545
:::
4646

4747
## 用 API 驱动一个会话
@@ -113,4 +113,4 @@ curl -s -H "Authorization: Bearer $TOKEN" \
113113
## 下一步
114114

115115
- [服务 API](../reference/server-api.md) — REST 端点全集、错误码、WebSocket 事件与转录协议
116-
- [pythinker 命令](../reference/pythinker-command.md#pythinker-web)`pythinker web` 的全部命令行选项
116+
- [pythinker 命令](../../reference/pythinker-command.md#pythinker-web)`pythinker web` 的全部命令行选项

docs/zh/reference/server-api.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# 服务 API
22

3-
`pythinker web` 启动的本地服务暴露两组程序化接口:REST API(`/api/v1`,另有 `/api/v2/sessions`)和 WebSocket 事件流(`/api/v1/ws`)。本页是这两组接口的协议参考;服务的启动方式与命令行选项见 [pythinker 命令](./pythinker-command.md#pythinker-web),端到端的上手流程见[本地服务与 API](../guides/server.md)
3+
`pythinker web` 启动的本地服务暴露两组程序化接口:REST API(`/api/v1`,另有 `/api/v2/sessions`)和 WebSocket 事件流(`/api/v1/ws`)。本页是这两组接口的协议参考;服务的启动方式与命令行选项见 [pythinker 命令](../../reference/pythinker-command.md#pythinker-web),端到端的上手流程见[本地服务与 API](../guides/server.md)
44

55
每个端点的完整请求 / 响应 schema 以服务自描述的规范文档为准:`GET /openapi.json`(OpenAPI)与 `GET /asyncapi.json`(AsyncAPI),两者都需要鉴权。
66

@@ -397,4 +397,4 @@ PTY 终端接口,仅 loopback 绑定时挂载。
397397
## 下一步
398398

399399
- [本地服务与 API](../guides/server.md) — 启动、鉴权与端到端调用流程
400-
- [pythinker 命令](./pythinker-command.md#pythinker-web)`pythinker web` 的全部命令行选项
400+
- [pythinker 命令](../../reference/pythinker-command.md#pythinker-web)`pythinker web` 的全部命令行选项

packages/agent-gateway/src/services/transcript/coreBinding.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export interface TranscriptBinding extends IDisposable {
3535
* resolve-time `approvalId` back-link. The service calls it after the
3636
* initial backfill for the main agent, and after each agent's on-demand
3737
* backfill for that agent's interactions — pass `agentId` to seed only the
38-
* pendings routed to that agent (a subagent's pending must not be placed
38+
* pending interactions routed to that agent (a subagent's pending must not be placed
3939
* before its own history is replayed).
4040
*/
4141
seedPendingInteractions(agentId?: string): void;

packages/tree-sitter-bash/src/parser.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1901,7 +1901,7 @@ export class Parser {
19011901
}
19021902
}
19031903

1904-
/** Pendings that never got a body (scope ended first): close them empty. */
1904+
/** Pending heredocs that never got a body (scope ended first): close them empty. */
19051905
private failOpenHeredocs(): void {
19061906
for (const pending of this.heredocQueue.splice(0)) {
19071907
this.hasError = true;

0 commit comments

Comments
 (0)