+12
-2
@@ -10,7 +10,7 @@ Review has no Shell or EDA editing access. Production starts the same thread wit
|
||||
|
||||
## Runtime
|
||||
|
||||
- Model: `PCB_MODEL` (default `gpt-6.1-sol`), reasoning `PCB_REASONING_EFFORT` (default `high`); no automatic model substitution. API projects must have access to the configured model.
|
||||
- Default provider: `PCB_AI_PROVIDER=openai`; OpenAI-compatible endpoint `PCB_OPENAI_BASE_URL=https://api.vip1129.cc`, model `PCB_OPENAI_MODEL=gpt-6.1-sol`. New designs can select DeepSeek or Doubao after server credentials are configured. Reasoning defaults to `PCB_REASONING_EFFORT=high`; there is no automatic model/provider substitution. API projects must have access to the configured model.
|
||||
- Service: `vibemake-pcb2-session.service`, FastAPI on loopback `8003`.
|
||||
- Web: `vibemake-pcb2-web.service`, HTTPS `15182`, `/pcb/pcb-api/` proxy.
|
||||
- Source: the installed checkout's `codex_pcb/` directory.
|
||||
@@ -37,7 +37,11 @@ Backend settings are documented in `codex_pcb/.env.example`; they are separate f
|
||||
|
||||
Existing installations must explicitly keep `PCB_SESSION_ROOT` pointing at their original runtime to retain access to task records and Codex history; the new portable default does not migrate old directories.
|
||||
|
||||
For API authentication set `PCB_CODEX_AUTH=apikey` and either `OPENAI_API_KEY` or `OPENAI_API_KEY_FILE`. The environment value takes precedence; the file is useful with Docker secrets. The service configures a dedicated Codex provider using the OpenAI Responses API at `https://api.openai.com/v1`, with `env_key=OPENAI_API_KEY`. It passes the key only to the Codex process, without adding it to CLI arguments or writing an `auth.json`. No interactive Codex login is required in this mode. Existing login credentials are not used as a fallback. API use is billed to the OpenAI API project; authentication does not guarantee access to the configured model.
|
||||
For API authentication set `PCB_CODEX_AUTH=apikey` and either `OPENAI_API_KEY` or `OPENAI_API_KEY_FILE`. The environment value takes precedence; the file is useful with Docker secrets. The service configures a dedicated Codex provider using the Responses API at the configured `PCB_OPENAI_BASE_URL` (project default `https://api.vip1129.cc`), with `env_key=OPENAI_API_KEY`. It passes the key only to the Codex process, without adding it to CLI arguments or writing an `auth.json`. No interactive Codex login is required in this mode. Existing login credentials are not used as a fallback. API use is billed to the OpenAI API project; authentication does not guarantee access to the configured model.
|
||||
|
||||
`PCB_OPENAI_BASE_URL` explicitly overrides that API base URL for credentials issued by another Responses-compatible provider. Use the exact base path supplied by the provider, paired with its own key; personal Codex configuration is not imported and there is no automatic provider/model fallback. The base URL is included in the approval runtime hash. Health metadata exposes the configured non-secret endpoint and authentication mode, but does not probe inference.
|
||||
|
||||
Native `error` notifications, including retry details, are surfaced to the website. A terminal native error fails the task immediately. `PCB_CODEX_IDLE_TIMEOUT` (default 300 seconds) fails a stalled model turn and retains the native session for retry; heartbeat/status/retry notifications alone do not count as model progress. Active native tool requests use their existing execution timeouts. This avoids an indefinitely opaque planning state while preserving normal reasoning/token progress and long tool execution.
|
||||
|
||||
To retain the earlier login setup, explicitly set `PCB_CODEX_AUTH=chatgpt` (also the default for compatibility) and provision the service's `PCB_CODEX_HOME` with the existing login. This mode removes API keys from the Codex process environment. Use a dedicated service home rather than your IDE's session directory. Both `thread/start` and `thread/resume` select the same provider.
|
||||
|
||||
@@ -120,3 +124,9 @@ python3 /path/to/vibemake-pcb-studio/codex_pcb/freerouting.py \
|
||||
版本升级时重新核对参数和弹窗行为,不将 1.9.0 的命令行约定直接套到其他版本。
|
||||
|
||||
依据:[1.9.0 命令行说明](https://github.com/freerouting/freerouting/blob/v1.9.0/README.md#using-the-command-line-arguments)、[参数解析](https://github.com/freerouting/freerouting/blob/v1.9.0/src/main/java/app/freerouting/gui/StartupOptions.java)、[确认框与自动启动](https://github.com/freerouting/freerouting/blob/v1.9.0/src/main/java/app/freerouting/gui/MainApplication.java#L430-L488)。
|
||||
|
||||
## Per-design AI providers
|
||||
|
||||
`GET /api/providers` supplies the frontend selector without secrets. `POST /api/sessions` accepts an optional `provider` (`openai`, `deepseek`, `doubao`), defaulting to `PCB_AI_PROVIDER` / `openai`. Each task persists its non-secret runtime snapshot. Comments, production and restart keep that selection; runtime changes are rejected rather than migrating a native thread. Approval fingerprints cover the selected task runtime, so changing only the default for future tasks does not redirect existing ones. Credentials are injected only into their corresponding Codex process and removed from EDA subprocesses.
|
||||
|
||||
DeepSeek defaults to `deepseek-flash` at `https://api.deepseek.com` with `DEEPSEEK_API_KEY` (or `_FILE`); Doubao defaults to `doubao-seed-2-1-pro-260915` at `https://ark.cn-beijing.volces.com/api/v3` with `ARK_API_KEY` (or `_FILE`; DOUBAO_API_KEY aliases are accepted). Both use the native Responses API and provider-specific model metadata; no legacy agent loop or Chat Completions bridge is used. Doubao requires account model entitlement and has no built-in web search enabled by this integration. See the backend deployment guide for all provider-specific overrides.
|
||||
|
||||
+22
-3
@@ -2,9 +2,28 @@
|
||||
# EnvironmentFile, or uvicorn --env-file (requires python-dotenv).
|
||||
# Never put a real key in this example or a VITE_* variable.
|
||||
PCB_CODEX_AUTH=apikey
|
||||
PCB_AI_PROVIDER=openai
|
||||
OPENAI_API_KEY=
|
||||
# Alternatively mount a secret file; leave OPENAI_API_KEY empty when using it.
|
||||
# OPENAI_API_KEY_FILE=/run/secrets/openai_api_key
|
||||
# Explicit API endpoint paired with that key. Use the provider's exact base URL;
|
||||
# the service does not import your personal Codex configuration automatically.
|
||||
PCB_OPENAI_BASE_URL=https://api.vip1129.cc
|
||||
PCB_OPENAI_MODEL=gpt-6.1-sol
|
||||
|
||||
# Optional alternatives, selectable for new designs in the website.
|
||||
DEEPSEEK_API_KEY=
|
||||
# DEEPSEEK_API_KEY_FILE=/run/secrets/deepseek_api_key
|
||||
PCB_DEEPSEEK_BASE_URL=https://api.deepseek.com
|
||||
PCB_DEEPSEEK_MODEL=deepseek-flash
|
||||
|
||||
ARK_API_KEY=
|
||||
# ARK_API_KEY_FILE=/run/secrets/ark_api_key
|
||||
# DOUBAO_API_KEY / DOUBAO_API_KEY_FILE are accepted aliases.
|
||||
PCB_DOUBAO_BASE_URL=https://ark.cn-beijing.volces.com/api/v3
|
||||
PCB_DOUBAO_MODEL=doubao-seed-2-1-pro-260915
|
||||
# Fail visibly if no native model progress arrives (heartbeats do not count).
|
||||
PCB_CODEX_IDLE_TIMEOUT=300
|
||||
|
||||
# Container examples: set these to the actual installed/mounted paths.
|
||||
PCB_SESSION_ROOT=/data
|
||||
@@ -14,9 +33,9 @@ PCB_EDA_BIN=/opt/lceda-pro/lceda-pro
|
||||
PCB_BLENDER_BIN=/usr/bin/blender
|
||||
PCB_FREEROUTING_JAR=/opt/pcb-resources/freerouting.jar
|
||||
|
||||
# Must be a model and reasoning effort supported by your OpenAI API project.
|
||||
# The existing model is retained by default; it is not an entitlement check.
|
||||
PCB_MODEL=gpt-6.1-sol
|
||||
# Use exact model IDs supported by each provider account; no model fallback.
|
||||
# Legacy PCB_MODEL applies only to the default provider. Prefer the provider-
|
||||
# specific settings above so changing PCB_AI_PROVIDER cannot reuse a wrong ID.
|
||||
PCB_REASONING_EFFORT=high
|
||||
|
||||
DISPLAY=:99
|
||||
|
||||
+30
-2
@@ -70,8 +70,16 @@ chmod 600 codex_pcb/.env.local
|
||||
在 1Panel 文件编辑器中填写:
|
||||
|
||||
```dotenv
|
||||
PCB_AI_PROVIDER=openai
|
||||
PCB_CODEX_AUTH=apikey
|
||||
OPENAI_API_KEY=填入新生成的服务端Key
|
||||
OPENAI_API_KEY=填入与该地址对应的服务端Key
|
||||
PCB_OPENAI_BASE_URL=https://api.vip1129.cc
|
||||
PCB_OPENAI_MODEL=gpt-6.1-sol
|
||||
DEEPSEEK_API_KEY=
|
||||
PCB_DEEPSEEK_MODEL=deepseek-flash
|
||||
ARK_API_KEY=
|
||||
PCB_DOUBAO_MODEL=doubao-seed-2-1-pro-260915
|
||||
PCB_CODEX_IDLE_TIMEOUT=300
|
||||
PCB_SESSION_ROOT=/data
|
||||
PCB_CODEX_HOME=/data/codex-home
|
||||
PCB_CODEX_BIN=/usr/local/bin/codex
|
||||
@@ -82,7 +90,27 @@ DISPLAY=:99
|
||||
XDG_RUNTIME_DIR=/tmp/pcb-xdg
|
||||
```
|
||||
|
||||
`PCB_MODEL` 必须是 OpenAI API 项目有权限使用的准确模型 ID;示例保留现有的 `gpt-6.1-sol`,这不代表每个 API 项目均可访问。`PCB_REASONING_EFFORT` 也必须受所选模型支持。真实 Key 只放服务器的 `.env.local`,不要放进 `.env.example`、Dockerfile 或 `VITE_*`。
|
||||
`PCB_OPENAI_MODEL`、`PCB_DEEPSEEK_MODEL`、`PCB_DOUBAO_MODEL` 必须分别是对应账号可用的准确模型 ID;服务不会自动替换模型。`PCB_REASONING_EFFORT` 也必须受所选模型支持,可用 `PCB_<服务>_REASONING_EFFORT` 分别覆盖。旧的 `PCB_MODEL` 只作用于默认服务,建议迁移为各服务独立设置。真实 Key 只放服务器的 `.env.local`,不要放进 `.env.example`、Dockerfile 或 `VITE_*`。
|
||||
|
||||
`PCB_OPENAI_BASE_URL` 是模型 API 的基础地址,与前端连接 PCB 后端的 `PCB_API_TARGET` 不同。当前项目的 OpenAI 兼容服务默认地址为 `https://api.vip1129.cc`;这是用户指定的兼容服务,不是 OpenAI 官方地址。若使用官方 OpenAI 账号,明确设为 `https://api.openai.com/v1` 并使用与该服务对应的 Key。如果凭据由兼容 Responses API 的其他服务签发,需明确配置该服务提供的基础地址,并使用与之匹配的 Key;是否带 `/v1` 以该服务说明为准,不要填写 `/responses` 完整接口地址。后端不会读取或继承个人 `~/.codex/config.toml` 中的模型服务地址,也不会自动切换服务或模型。地址禁止包含用户名、密码、查询参数或片段;Key 仍通过环境变量或 secret 文件注入。
|
||||
|
||||
### OpenAI / DeepSeek / 豆包切换
|
||||
|
||||
`PCB_AI_PROVIDER` 设定网站新建设计的默认服务,可选 `openai`(项目默认)、`deepseek`、`doubao`。用户可在新建设计表单的「AI 服务」中切换已配置的服务;缺少凭据的选项会禁用。选择在任务创建时保存,方案修改、生产和重启继续使用同一服务、模型及原生会话;已有设计不跨服务迁移,需要切换时新建设计。
|
||||
|
||||
| 服务 | 基础地址变量 / 默认值 | 模型变量 / 默认值 | 凭据变量 |
|
||||
|---|---|---|---|
|
||||
| OpenAI 兼容服务 | `PCB_OPENAI_BASE_URL` / `https://api.vip1129.cc` | `PCB_OPENAI_MODEL` / `gpt-6.1-sol` | `OPENAI_API_KEY` 或 `OPENAI_API_KEY_FILE` |
|
||||
| DeepSeek | `PCB_DEEPSEEK_BASE_URL` / `https://api.deepseek.com` | `PCB_DEEPSEEK_MODEL` / `deepseek-flash` | `DEEPSEEK_API_KEY` 或 `DEEPSEEK_API_KEY_FILE` |
|
||||
| 豆包(火山方舟) | `PCB_DOUBAO_BASE_URL` / `https://ark.cn-beijing.volces.com/api/v3` | `PCB_DOUBAO_MODEL` / `doubao-seed-2-1-pro-260915` | `ARK_API_KEY` 或 `ARK_API_KEY_FILE`;兼容 `DOUBAO_API_KEY` / `DOUBAO_API_KEY_FILE` |
|
||||
|
||||
三种服务都通过原生 Codex 的 Responses 协议运行,不引入旧版设计流水线。DeepSeek 使用官方 Responses 接口及原生模型元数据;豆包使用方舟 Responses 接口,需先在方舟控制台开通所选模型,亦可将模型设置为账号实际部署的 Endpoint ID。豆包当前未启用内置联网搜索,批准生产后代理仍可通过原生Shell访问厂商文档。不能仅凭成功的HTTP健康检查认定Key、额度或模型权限可用。
|
||||
|
||||
`GET /api/providers` 返回默认服务、各服务模型及凭据是否配置,不返回Key。`POST /api/sessions` 可发送 `{"text":"设计要求…","provider":"deepseek"}`;不填provider使用服务端默认值,未知服务返回400,未配置凭据返回503。每个任务仅向对应Codex进程传递该服务的凭据,其他模型Key及Key文件路径会从子进程环境中剔除;EDA子进程不接收模型凭据。变更已保存任务的模型/服务/地址会阻止继续执行,Key轮换不改变审批哈希。
|
||||
|
||||
参考:[DeepSeek Responses API](https://api-docs.deepseek.com/guides/responses_api/)、[DeepSeek Codex接入](https://api-docs.deepseek.com/quick_start/agent_integrations/codex)、[火山方舟 Responses API](https://docs.volcengine.com/docs/ark/1585128)。
|
||||
|
||||
原生模型请求的重试错误现在会显示在网站运行记录中,终止错误会将任务标记为失败。若连续 `PCB_CODEX_IDLE_TIMEOUT` 秒(默认300秒)没有原生模型进展,也会明确失败并保留会话供重试;仅有HTTP心跳或重连错误不会延长此期限。正在执行的原生工具请求使用其自身的执行超时,不由这个模型空闲期限中断。`/api/health` 返回当前认证模式、provider及API基础地址供核对,不返回凭据;`ok: true` 仍只代表HTTP服务可用。
|
||||
|
||||
Compose 的 `env_file` 会将 `.env.local` 注入后端。Dockerfile 的专用 ignore 文件只允许后端源码和 API 文档进入构建上下文,排除密钥、程序包及运行数据。不要使用 `docker compose config` 的完整输出对外分享配置,其中可能包含已展开的环境变量。
|
||||
|
||||
|
||||
+93
-18
@@ -9,9 +9,9 @@ from pathlib import Path
|
||||
from fastapi import FastAPI, HTTPException
|
||||
from fastapi.responses import FileResponse
|
||||
from pydantic import BaseModel, Field
|
||||
from .config import BLENDER_BIN, FREEROUTING_JAR, PROVIDER
|
||||
from .config import BLENDER_BIN, FREEROUTING_JAR, CODEX_IDLE_TIMEOUT, DEFAULT_PROVIDER, PROVIDERS, CODEX_HOME, runtime_for
|
||||
from .storage import SOURCE, ROOT, TASKS, MODEL, EFFORT, task_dir, workspace, load, save, write, event, events, fingerprint, digest, inside
|
||||
from .rpc import AppServer
|
||||
from .rpc import AppServer, api_key
|
||||
from .eda import execute
|
||||
from .delivery import deliver
|
||||
|
||||
@@ -31,6 +31,7 @@ TOOLS=[
|
||||
tool('pcb_deliver','Submit real exported files for independent validation. Rejected submission returns evidence so you can repair in the SAME session.',{'schematic_id':STR,'pcb_id':STR,'notes':STR,'files':{'type':'array','items':object_schema({'path':STR,'kind':{'type':'string','enum':['project','schematic','layout','step','render','bom','report','other']},'label':STR}), 'minItems':5}}),
|
||||
tool('pcb_blocked','Record a concrete unrecoverable blocker and preserve draft. Do not use for ordinary tool errors; investigate and repair first.',{'reason':STR,'evidence':STR}),
|
||||
]
|
||||
NATIVE_TOOL_ITEMS={'commandExecution','dynamicToolCall','mcpToolCall','webSearch','fileChange','imageGeneration'}
|
||||
|
||||
def get(tid):
|
||||
try:
|
||||
@@ -44,9 +45,40 @@ def public(t):
|
||||
return {k:v for k,v in t.items() if k not in {'pending_prompt','internal'}}
|
||||
|
||||
def frozen(t):
|
||||
if t.get('approval') and fingerprint()!=t['frozen_source']:
|
||||
if t.get('approval') and fingerprint(task_runtime(t))!=t['frozen_source']:
|
||||
raise RuntimeError('Backend source or runtime settings changed after approval. This acceptance run is invalid; start a new task.')
|
||||
|
||||
|
||||
def task_runtime(t):
|
||||
provider_id = t.get('ai_provider')
|
||||
if not provider_id:
|
||||
# Existing tasks predate per-task selection and used OpenAI exclusively.
|
||||
provider_id = 'openai' if t.get('provider') in {'openai','vibemake_openai'} else DEFAULT_PROVIDER
|
||||
runtime = runtime_for(provider_id)
|
||||
if (t.get('runtime') and t['runtime'] != runtime.snapshot()) or any(
|
||||
t.get(key, value) != value for key, value in (
|
||||
('model', runtime.model), ('effort', runtime.effort), ('provider', runtime.provider))
|
||||
):
|
||||
raise RuntimeError('Task model or provider settings changed; restore its original configuration or create a new design. Existing sessions cannot switch providers.')
|
||||
return runtime
|
||||
|
||||
|
||||
def provider_status(runtime):
|
||||
try:
|
||||
if runtime.auth_mode == 'chatgpt':
|
||||
configured = (CODEX_HOME/'auth.json').is_file()
|
||||
else:
|
||||
api_key(runtime)
|
||||
configured = True
|
||||
return {'id':runtime.id,'label':runtime.label,'model':runtime.model,'effort':runtime.effort,'configured':configured}
|
||||
except ValueError:
|
||||
return {'id':runtime.id,'label':runtime.label,'model':runtime.model,'effort':runtime.effort,'configured':False}
|
||||
|
||||
|
||||
def codex_error(error):
|
||||
error = error or {}
|
||||
return ': '.join(str(error[key]) for key in ('message', 'additionalDetails') if error.get(key)) or 'Unknown Codex error'
|
||||
|
||||
async def handle(t, method, p):
|
||||
if method != 'item/tool/call':
|
||||
event(t,'request.unhandled',{'method':method})
|
||||
@@ -114,12 +146,14 @@ async def handle(t, method, p):
|
||||
|
||||
async def run_turn(t, prompt, production):
|
||||
frozen(t)
|
||||
if t.get('model', MODEL) != MODEL or t.get('effort', EFFORT) != EFFORT or (t.get('thread_id') and t.get('provider', 'openai') != PROVIDER):
|
||||
raise RuntimeError('Task model, effort or provider differs from the current runtime; restore the previous settings or start a new task.')
|
||||
runtime=task_runtime(t)
|
||||
directory=workspace(t)
|
||||
async with AppServer(directory, production, lambda m,p:handle(t,m,p)) as client:
|
||||
async with AppServer(directory, production, lambda m,p:handle(t,m,p), runtime=runtime) as client:
|
||||
CLIENTS[t['id']]=client
|
||||
common={'model':MODEL,'modelProvider':PROVIDER,'cwd':str(directory),'approvalPolicy':'never','sandbox':'workspace-write' if production else 'read-only','developerInstructions':(SOURCE/'instructions.md').read_text(),'serviceTier':'default'}
|
||||
instructions=(SOURCE/'instructions.md').read_text()
|
||||
if runtime.id=='doubao':
|
||||
instructions+='\nThis provider has no built-in web-search tool in this integration. In review, mark unverified library/device choices as assumptions. During approved production, retrieve manufacturer references using native Shell/network and inspect the downloaded evidence.\n'
|
||||
common={'model':runtime.model,'modelProvider':runtime.provider,'cwd':str(directory),'approvalPolicy':'never','sandbox':'workspace-write' if production else 'read-only','developerInstructions':instructions,'serviceTier':'default'}
|
||||
if t.get('thread_id'):
|
||||
result=await client.call('thread/resume',dict(common,threadId=t['thread_id'],excludeTurns=True))
|
||||
if result['thread']['id']!=t['thread_id']:
|
||||
@@ -129,18 +163,33 @@ async def run_turn(t, prompt, production):
|
||||
result=await client.call('thread/start',dict(common,ephemeral=False,dynamicTools=TOOLS,serviceName='vibemake-persistent-pcb',allowProviderModelFallback=False))
|
||||
t['thread_id']=result['thread']['id']
|
||||
event(t,'session.created',{'thread_id':t['thread_id'],'model':result.get('model')})
|
||||
if result.get('model') not in {None,MODEL}:
|
||||
if result.get('model') not in {None,runtime.model}:
|
||||
raise RuntimeError('Unexpected model substitution')
|
||||
policy={'type':'workspaceWrite','writableRoots':[str(directory)],'networkAccess':True,'excludeSlashTmp':True,'excludeTmpdirEnvVar':True} if production else {'type':'readOnly','networkAccess':False}
|
||||
reply=await client.call('turn/start',{'threadId':t['thread_id'],'input':[{'type':'text','text':prompt}],'model':MODEL,'effort':EFFORT,'approvalPolicy':'never','sandboxPolicy':policy})
|
||||
reply=await client.call('turn/start',{'threadId':t['thread_id'],'input':[{'type':'text','text':prompt}],'model':runtime.model,'effort':runtime.effort,'approvalPolicy':'never','sandboxPolicy':policy})
|
||||
t['turn_id']=reply['turn']['id'];t['turn_started_at']=time.time()
|
||||
event(t,'turn.started',{'turn_id':t['turn_id'],'production':production,'model':MODEL,'effort':EFFORT,'source_hash':fingerprint()})
|
||||
event(t,'turn.started',{'turn_id':t['turn_id'],'production':production,'ai_provider':runtime.id,'model':runtime.model,'effort':runtime.effort,'source_hash':fingerprint(runtime)})
|
||||
trace=directory/'evidence'/'codex-events.jsonl'
|
||||
trace.parent.mkdir(exist_ok=True)
|
||||
last_heartbeat=time.monotonic()
|
||||
last_progress=time.monotonic()
|
||||
last_error=None
|
||||
active_tools=set()
|
||||
tools_were_active=False
|
||||
while True:
|
||||
# A live transport/heartbeat is not evidence that the model is making
|
||||
# progress. Native tool requests have their own execution timeouts.
|
||||
tools_active=bool(client.requests or active_tools)
|
||||
# Give a request that finished during the wait a fresh model idle
|
||||
# window, rather than charging its execution time to the model.
|
||||
if tools_active or tools_were_active:
|
||||
last_progress=time.monotonic()
|
||||
tools_were_active=tools_active
|
||||
remaining=CODEX_IDLE_TIMEOUT-(time.monotonic()-last_progress)
|
||||
if remaining<=0:
|
||||
detail=' Last upstream error: '+last_error if last_error else ''
|
||||
raise RuntimeError(f'Codex made no progress for {CODEX_IDLE_TIMEOUT} seconds. Check the model API address, authentication and network; the same session is retained for retry.'+detail)
|
||||
try:
|
||||
msg=await asyncio.wait_for(client.events.get(),30)
|
||||
msg=await asyncio.wait_for(client.events.get(),min(30,remaining))
|
||||
except asyncio.TimeoutError:
|
||||
event(t,'heartbeat',{'turn_id':t['turn_id'],'elapsed':round(time.time()-t['turn_started_at'])})
|
||||
continue
|
||||
@@ -149,17 +198,30 @@ async def run_turn(t, prompt, production):
|
||||
raise ConnectionError(p.get('message','Codex disconnected'))
|
||||
if p.get('threadId') not in {None,t['thread_id']}:
|
||||
continue
|
||||
if p.get('turnId') not in {None,t['turn_id']}:
|
||||
continue
|
||||
# Store complete native event evidence; no lossy context reconstruction.
|
||||
with trace.open('a') as f:
|
||||
f.write(json.dumps(msg,ensure_ascii=False)+'\n')
|
||||
if method=='item/completed':
|
||||
if method.startswith('item/') or method=='thread/tokenUsage/updated':
|
||||
last_progress=time.monotonic()
|
||||
if method=='error':
|
||||
last_error=codex_error(p.get('error'))
|
||||
if p.get('willRetry'):
|
||||
event(t,'session.reconnecting',{'message':last_error,'native_retry':True})
|
||||
else:
|
||||
raise RuntimeError(last_error)
|
||||
elif method=='item/completed':
|
||||
item=p.get('item',{})
|
||||
active_tools.discard(item.get('id'))
|
||||
if item.get('type')=='agentMessage':
|
||||
event(t,'message',{'role':'assistant','text':item.get('text',''),'phase':item.get('phase')})
|
||||
elif item.get('type') not in {'userMessage','reasoning'}:
|
||||
event(t,'activity',{'kind':item.get('type'),'status':item.get('status'),'command':item.get('command'),'tool':item.get('tool')})
|
||||
elif method=='item/started':
|
||||
item=p.get('item',{})
|
||||
if item.get('type') in NATIVE_TOOL_ITEMS and item.get('id'):
|
||||
active_tools.add(item['id'])
|
||||
if item.get('type') not in {'userMessage','agentMessage','reasoning'}:
|
||||
event(t,'activity',{'kind':item.get('type'),'status':'running','command':item.get('command'),'tool':item.get('tool')})
|
||||
elif method=='thread/tokenUsage/updated':
|
||||
@@ -168,7 +230,7 @@ async def run_turn(t, prompt, production):
|
||||
turn=p['turn']
|
||||
event(t,'turn.completed',{'turn_id':turn['id'],'status':turn['status'],'error':turn.get('error')})
|
||||
if turn['status']!='completed':
|
||||
raise RuntimeError('Codex turn '+turn['status']+': '+json.dumps(turn.get('error'),ensure_ascii=False))
|
||||
raise RuntimeError('Codex turn '+turn['status']+': '+codex_error(turn.get('error')))
|
||||
return
|
||||
|
||||
async def work(t, prompt, production):
|
||||
@@ -246,22 +308,35 @@ app=FastAPI(lifespan=lifespan)
|
||||
|
||||
class Request(BaseModel):
|
||||
text:str=Field(min_length=5,max_length=16000)
|
||||
class DesignRequest(Request):
|
||||
provider:str | None=None
|
||||
class Approval(BaseModel):
|
||||
revision:int
|
||||
hash:str
|
||||
|
||||
@app.get('/api/health')
|
||||
async def health():
|
||||
return {'ok':True,'engine':'persistent-codex','model':MODEL,'effort':EFFORT,'source_hash':fingerprint(),'legacy_pipeline':False}
|
||||
runtime=runtime_for()
|
||||
return {'ok':True,'engine':'persistent-codex','model':runtime.model,'effort':runtime.effort,'source_hash':fingerprint(),'legacy_pipeline':False,'auth_mode':runtime.auth_mode,'model_provider':runtime.provider,'model_api_base_url':runtime.api_base_url if runtime.auth_mode=='apikey' else None,'default_provider':DEFAULT_PROVIDER}
|
||||
|
||||
@app.get('/api/providers')
|
||||
async def list_providers():
|
||||
return {'default_provider':DEFAULT_PROVIDER,'providers':[provider_status(runtime_for(name)) for name in PROVIDERS]}
|
||||
|
||||
@app.get('/api/sessions')
|
||||
async def list_sessions():
|
||||
return sorted([public(t) for t in CACHE.values()],key=lambda t:t['created_at'],reverse=True)
|
||||
|
||||
@app.post('/api/sessions',status_code=201)
|
||||
async def create(req:Request):
|
||||
async def create(req:DesignRequest):
|
||||
try:
|
||||
runtime=runtime_for(req.provider)
|
||||
except ValueError as e:
|
||||
raise HTTPException(400,str(e)) from None
|
||||
if not provider_status(runtime)['configured']:
|
||||
raise HTTPException(503,runtime.label+' 未配置可用的服务端凭据,请先配置 '+runtime.key_name+' 或对应登录文件。')
|
||||
tid='pcb-'+uuid.uuid4().hex[:24]
|
||||
t={'id':tid,'request':req.text,'created_at':time.time(),'state':'planning','cursor':0,'model':MODEL,'effort':EFFORT,'provider':PROVIDER,'busy':False}
|
||||
t={'id':tid,'request':req.text,'created_at':time.time(),'state':'planning','cursor':0,'model':runtime.model,'effort':runtime.effort,'provider':runtime.provider,'ai_provider':runtime.id,'runtime':runtime.snapshot(),'busy':False}
|
||||
directory=workspace(t);directory.mkdir(parents=True)
|
||||
for name in ('artifacts','evidence','scripts','tmp'):
|
||||
(directory/name).mkdir()
|
||||
@@ -301,7 +376,7 @@ async def approve(tid:str,req:Approval):
|
||||
if t['state']!='review' or t.get('busy') or p.get('revision')!=req.revision or p.get('hash')!=req.hash:
|
||||
raise HTTPException(409,'Approve the latest completed proposal revision')
|
||||
t['approval']={'revision':req.revision,'hash':req.hash,'at':time.time()}
|
||||
t['frozen_source']=fingerprint()
|
||||
t['frozen_source']=fingerprint(task_runtime(t))
|
||||
event(t,'proposal.approved',t['approval'])
|
||||
prompt=f'''The user explicitly clicked APPROVE AND START for proposal revision {req.revision}, SHA256 {req.hash}.
|
||||
This server-owned approval authorizes production of the accepted proposal in this same persistent session. Earlier requests to wait applied only to review.
|
||||
|
||||
+65
-8
@@ -1,7 +1,9 @@
|
||||
"""Deployment settings; credentials are read separately and never fingerprinted."""
|
||||
import os
|
||||
from dataclasses import dataclass
|
||||
from pathlib import Path
|
||||
import shutil
|
||||
from urllib.parse import urlsplit
|
||||
|
||||
|
||||
def path_setting(name, default):
|
||||
@@ -13,12 +15,66 @@ def executable(name, default):
|
||||
return shutil.which(os.path.expanduser(value)) or os.path.expanduser(value)
|
||||
|
||||
|
||||
PROVIDERS = {
|
||||
'deepseek': ('DeepSeek', 'deepseek-flash', 'https://api.deepseek.com', 'DEEPSEEK_API_KEY', ()),
|
||||
'openai': ('OpenAI', 'gpt-6.1-sol', 'https://api.vip1129.cc', 'OPENAI_API_KEY', ()),
|
||||
'doubao': ('豆包', 'doubao-seed-2-1-pro-260915', 'https://ark.cn-beijing.volces.com/api/v3', 'ARK_API_KEY', ('DOUBAO_API_KEY',)),
|
||||
}
|
||||
DEFAULT_PROVIDER = os.environ.get('PCB_AI_PROVIDER') or 'openai'
|
||||
|
||||
|
||||
def model_api_base_url(provider_id='openai'):
|
||||
variable = f'PCB_{provider_id.upper()}_BASE_URL'
|
||||
value = (os.environ.get(variable) or PROVIDERS[provider_id][2]).strip().rstrip('/')
|
||||
try:
|
||||
url = urlsplit(value)
|
||||
valid = url.scheme in {'http', 'https'} and url.hostname and url.port != 0
|
||||
except ValueError:
|
||||
valid = False
|
||||
if not valid or url.username or url.password or url.query or url.fragment:
|
||||
raise ValueError(variable+' must be an HTTP(S) base URL without credentials, query or fragment')
|
||||
return value
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ModelRuntime:
|
||||
id: str
|
||||
label: str
|
||||
model: str
|
||||
effort: str
|
||||
auth_mode: str
|
||||
provider: str
|
||||
api_base_url: str
|
||||
key_name: str
|
||||
key_aliases: tuple
|
||||
|
||||
def snapshot(self):
|
||||
return {key: getattr(self, key) for key in ('id', 'model', 'effort', 'auth_mode', 'provider', 'api_base_url')}
|
||||
|
||||
|
||||
def runtime_for(provider_id=None):
|
||||
provider_id = provider_id or DEFAULT_PROVIDER
|
||||
if provider_id not in PROVIDERS:
|
||||
raise ValueError('Unknown PCB AI provider; choose deepseek, openai or doubao')
|
||||
label, default_model, _, key, aliases = PROVIDERS[provider_id]
|
||||
prefix = 'PCB_'+provider_id.upper()
|
||||
legacy_model = os.environ.get('PCB_MODEL') if provider_id == DEFAULT_PROVIDER else None
|
||||
model = os.environ.get(prefix+'_MODEL') or legacy_model or default_model
|
||||
effort = os.environ.get(prefix+'_REASONING_EFFORT') or os.environ.get('PCB_REASONING_EFFORT') or 'high'
|
||||
auth = (os.environ.get('PCB_CODEX_AUTH') or 'chatgpt') if provider_id == 'openai' else 'apikey'
|
||||
provider = 'openai' if auth == 'chatgpt' else 'vibemake_'+provider_id
|
||||
return ModelRuntime(provider_id, label, model, effort, auth, provider,
|
||||
model_api_base_url(provider_id), key, aliases)
|
||||
|
||||
|
||||
ROOT = path_setting('PCB_SESSION_ROOT', Path.home() / '.local/share/vibemake-pcb')
|
||||
MODEL = os.environ.get('PCB_MODEL') or 'gpt-6.1-sol'
|
||||
EFFORT = os.environ.get('PCB_REASONING_EFFORT') or 'high'
|
||||
# Preserve existing installations unless API authentication is explicitly selected.
|
||||
AUTH_MODE = os.environ.get('PCB_CODEX_AUTH') or 'chatgpt'
|
||||
PROVIDER = 'vibemake_openai' if AUTH_MODE == 'apikey' else 'openai'
|
||||
DEFAULT_RUNTIME = runtime_for()
|
||||
MODEL, EFFORT = DEFAULT_RUNTIME.model, DEFAULT_RUNTIME.effort
|
||||
AUTH_MODE, PROVIDER = DEFAULT_RUNTIME.auth_mode, DEFAULT_RUNTIME.provider
|
||||
MODEL_API_BASE_URL = DEFAULT_RUNTIME.api_base_url
|
||||
CODEX_IDLE_TIMEOUT = int(os.environ.get('PCB_CODEX_IDLE_TIMEOUT') or '300')
|
||||
if CODEX_IDLE_TIMEOUT <= 0:
|
||||
raise ValueError('PCB_CODEX_IDLE_TIMEOUT must be a positive number of seconds')
|
||||
CODEX_HOME = path_setting('PCB_CODEX_HOME', ROOT / 'codex-home')
|
||||
CODEX_BIN = executable('PCB_CODEX_BIN', 'codex')
|
||||
EDA_BIN = executable('PCB_EDA_BIN', 'lceda-pro')
|
||||
@@ -26,11 +82,12 @@ BLENDER_BIN = executable('PCB_BLENDER_BIN', 'blender')
|
||||
FREEROUTING_JAR = path_setting('PCB_FREEROUTING_JAR', ROOT / 'resources/freerouting.jar')
|
||||
|
||||
|
||||
def frozen_settings():
|
||||
def frozen_settings(runtime=None):
|
||||
runtime = runtime or runtime_for()
|
||||
# Key rotation is allowed; changing the runtime of an approved design is not.
|
||||
return {name: str(value) for name, value in {
|
||||
'root': ROOT, 'model': MODEL, 'effort': EFFORT, 'auth_mode': AUTH_MODE,
|
||||
'provider': PROVIDER, 'codex_home': CODEX_HOME, 'codex_bin': CODEX_BIN,
|
||||
'root': ROOT, **runtime.snapshot(), 'codex_home': CODEX_HOME, 'codex_bin': CODEX_BIN,
|
||||
'codex_idle_timeout': CODEX_IDLE_TIMEOUT,
|
||||
'eda_bin': EDA_BIN, 'blender_bin': BLENDER_BIN,
|
||||
'freerouting_jar': FREEROUTING_JAR,
|
||||
}.items()}
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@ EDA_LOCK = asyncio.Lock()
|
||||
|
||||
async def cli(args, code=None, timeout=210):
|
||||
env = dict(os.environ, DISPLAY=os.environ.get('DISPLAY',':0'), XDG_RUNTIME_DIR=os.environ.get('XDG_RUNTIME_DIR') or f'/run/user/{os.getuid()}')
|
||||
for key in ('OPENAI_API_KEY', 'OPENAI_API_KEY_FILE', 'DEEPSEEK_API_KEY', 'CODEX_API_KEY'):
|
||||
for key in ('OPENAI_API_KEY', 'OPENAI_API_KEY_FILE', 'DEEPSEEK_API_KEY', 'DEEPSEEK_API_KEY_FILE', 'ARK_API_KEY', 'ARK_API_KEY_FILE', 'DOUBAO_API_KEY', 'DOUBAO_API_KEY_FILE', 'CODEX_API_KEY', 'CODEX_API_KEY_FILE'):
|
||||
env.pop(key, None)
|
||||
if not env.get('XAUTHORITY'):
|
||||
auth = list(Path(f'/run/user/{os.getuid()}').glob('.mutter-Xwaylandauth.*'))
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
"""Non-secret native model metadata for Responses-compatible providers."""
|
||||
import hashlib
|
||||
import json
|
||||
|
||||
|
||||
def catalog_path(home, runtime):
|
||||
identity = json.dumps(runtime.snapshot(), sort_keys=True).encode()
|
||||
return home/'model-catalogs'/(hashlib.sha256(identity).hexdigest()+'.json')
|
||||
|
||||
|
||||
def catalog(runtime):
|
||||
vision = runtime.id == 'doubao' or runtime.model == 'deepseek-flash'
|
||||
return {'models': [{
|
||||
'slug': runtime.model, 'display_name': runtime.label+' · '+runtime.model,
|
||||
'description': 'PCB design through native Codex tools and server-approved EDA operations.',
|
||||
'default_reasoning_level': runtime.effort,
|
||||
'supported_reasoning_levels': [{'effort': runtime.effort, 'description': 'Configured reasoning level'}],
|
||||
'shell_type': 'shell_command', 'visibility': 'list', 'supported_in_api': True,
|
||||
'priority': 0, 'prefer_websockets': False, 'upgrade': None,
|
||||
'base_instructions': 'You are a PCB engineering assistant. Follow the developer instructions, user requirements and server approval boundaries.',
|
||||
'supports_reasoning_summaries': False, 'default_reasoning_summary': 'none',
|
||||
'support_verbosity': False, 'default_verbosity': None,
|
||||
'apply_patch_tool_type': None, 'truncation_policy': {'mode': 'bytes', 'limit': 10000},
|
||||
'supports_parallel_tool_calls': True, 'supports_image_detail_original': False,
|
||||
'supports_standalone_web_search': runtime.id == 'deepseek',
|
||||
'context_window': 1000000 if runtime.id == 'deepseek' else 128000,
|
||||
'auto_compact_token_limit': 800000 if runtime.id == 'deepseek' else 100000,
|
||||
'effective_context_window_percent': 95, 'experimental_supported_tools': [],
|
||||
'input_modalities': ['text', 'image'] if vision else ['text'],
|
||||
'tool_mode': None, 'supports_search_tool': False,
|
||||
}]}
|
||||
+37
-22
@@ -3,30 +3,38 @@ import asyncio
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
from .config import AUTH_MODE, CODEX_BIN, CODEX_HOME, MODEL, EFFORT, PROVIDER
|
||||
from .config import CODEX_BIN, CODEX_HOME, runtime_for
|
||||
from .models import catalog, catalog_path
|
||||
from .storage import write
|
||||
|
||||
SECRET_ENV_NAMES = tuple(name for key in ('OPENAI_API_KEY', 'DEEPSEEK_API_KEY', 'ARK_API_KEY', 'DOUBAO_API_KEY', 'CODEX_API_KEY') for name in (key, key+'_FILE'))
|
||||
|
||||
|
||||
def api_key():
|
||||
key = os.environ.get('OPENAI_API_KEY', '').strip()
|
||||
if not key and os.environ.get('OPENAI_API_KEY_FILE'):
|
||||
def api_key(runtime=None):
|
||||
runtime = runtime or runtime_for()
|
||||
names = (runtime.key_name, *runtime.key_aliases)
|
||||
key = next((os.environ[name].strip() for name in names if os.environ.get(name, '').strip()), '')
|
||||
file_name = next((name+'_FILE' for name in names if os.environ.get(name+'_FILE')), None)
|
||||
if not key and file_name:
|
||||
try:
|
||||
with Path(os.environ['OPENAI_API_KEY_FILE']).expanduser().open() as stream:
|
||||
with Path(os.environ[file_name]).expanduser().open() as stream:
|
||||
key = stream.read(16385).strip()
|
||||
except (OSError, UnicodeError):
|
||||
raise ValueError('Cannot read OPENAI_API_KEY_FILE') from None
|
||||
raise ValueError('Cannot read '+file_name) from None
|
||||
if not key:
|
||||
raise ValueError('PCB_CODEX_AUTH=apikey requires OPENAI_API_KEY or OPENAI_API_KEY_FILE')
|
||||
raise ValueError(runtime.label+' requires '+runtime.key_name+' or '+runtime.key_name+'_FILE')
|
||||
if len(key) > 16384 or any(c.isspace() for c in key):
|
||||
raise ValueError('OpenAI API key must be a single non-empty value')
|
||||
raise ValueError(runtime.label+' API key must be a single non-empty value')
|
||||
return key
|
||||
|
||||
|
||||
def process_config(production):
|
||||
if AUTH_MODE not in {'apikey', 'chatgpt'}:
|
||||
def process_config(production, runtime=None):
|
||||
runtime = runtime or runtime_for()
|
||||
if runtime.auth_mode not in {'apikey', 'chatgpt'}:
|
||||
raise ValueError('PCB_CODEX_AUTH must be apikey or chatgpt')
|
||||
config = {
|
||||
'model': MODEL, 'model_provider': PROVIDER, 'model_reasoning_effort': EFFORT,
|
||||
'approval_policy': 'never', 'web_search': 'live',
|
||||
'model': runtime.model, 'model_provider': runtime.provider, 'model_reasoning_effort': runtime.effort,
|
||||
'approval_policy': 'never', 'web_search': 'live' if runtime.id == 'openai' else 'disabled',
|
||||
'sandbox_mode': 'workspace-write' if production else 'read-only',
|
||||
'features.shell_tool': production, 'features.multi_agent': False,
|
||||
'sandbox_workspace_write.network_access': True,
|
||||
@@ -35,19 +43,23 @@ def process_config(production):
|
||||
'shell_environment_policy.ignore_default_excludes': False,
|
||||
}
|
||||
env = dict(os.environ, CODEX_HOME=str(CODEX_HOME))
|
||||
for key in ('OPENAI_API_KEY', 'OPENAI_API_KEY_FILE', 'OPENAI_BASE_URL',
|
||||
'DEEPSEEK_API_KEY', 'CODEX_API_KEY'):
|
||||
for key in (*SECRET_ENV_NAMES, 'OPENAI_BASE_URL'):
|
||||
env.pop(key, None)
|
||||
if AUTH_MODE == 'apikey':
|
||||
env['OPENAI_API_KEY'] = api_key()
|
||||
prefix = 'model_providers.' + PROVIDER + '.'
|
||||
if runtime.auth_mode == 'apikey':
|
||||
env[runtime.key_name] = api_key(runtime)
|
||||
prefix = 'model_providers.' + runtime.provider + '.'
|
||||
config.update({
|
||||
prefix + 'name': 'VibeMake OpenAI API',
|
||||
prefix + 'base_url': 'https://api.openai.com/v1',
|
||||
prefix + 'name': 'VibeMake '+runtime.label,
|
||||
prefix + 'base_url': runtime.api_base_url,
|
||||
prefix + 'wire_api': 'responses',
|
||||
prefix + 'env_key': 'OPENAI_API_KEY',
|
||||
prefix + 'env_key': runtime.key_name,
|
||||
prefix + 'requires_openai_auth': False,
|
||||
})
|
||||
if runtime.id != 'openai':
|
||||
config['model_catalog_json'] = str(catalog_path(CODEX_HOME, runtime))
|
||||
if runtime.id == 'deepseek':
|
||||
config['web_search'] = 'live'
|
||||
config['features.standalone_web_search'] = True
|
||||
args = [CODEX_BIN, 'app-server', '--listen', 'stdio://']
|
||||
for key, value in config.items():
|
||||
args += ['-c', key + '=' + json.dumps(value)]
|
||||
@@ -55,17 +67,20 @@ def process_config(production):
|
||||
|
||||
|
||||
class AppServer:
|
||||
def __init__(self, directory, production, handler):
|
||||
def __init__(self, directory, production, handler, runtime=None):
|
||||
self.directory, self.production, self.handler = directory, production, handler
|
||||
self.pending, self.requests, self.counter = {}, set(), 0
|
||||
self.events = asyncio.Queue()
|
||||
self.proc = None
|
||||
self.reader = None
|
||||
self.err = None
|
||||
self.runtime = runtime or runtime_for()
|
||||
|
||||
async def __aenter__(self):
|
||||
args, env = process_config(self.production)
|
||||
args, env = process_config(self.production, self.runtime)
|
||||
CODEX_HOME.mkdir(parents=True, exist_ok=True, mode=0o700)
|
||||
if self.runtime.id != 'openai':
|
||||
write(catalog_path(CODEX_HOME, self.runtime), catalog(self.runtime))
|
||||
self.err = (self.directory / 'codex-stderr.log').open('ab')
|
||||
try:
|
||||
self.proc = await asyncio.create_subprocess_exec(*args, stdin=asyncio.subprocess.PIPE, stdout=asyncio.subprocess.PIPE, stderr=self.err, env=env, cwd=self.directory, limit=64*1024*1024)
|
||||
|
||||
@@ -12,9 +12,9 @@ TASKS = ROOT / 'tasks'
|
||||
def digest(data):
|
||||
return hashlib.sha256(data).hexdigest()
|
||||
|
||||
def fingerprint():
|
||||
def fingerprint(runtime=None):
|
||||
source = b''.join(p.name.encode() + p.read_bytes() for p in sorted(SOURCE.iterdir()) if p.suffix in {'.py', '.md'})
|
||||
return digest(source + json.dumps(frozen_settings(), sort_keys=True).encode())
|
||||
return digest(source + json.dumps(frozen_settings(runtime), sort_keys=True).encode())
|
||||
|
||||
def write(path, value):
|
||||
path = Path(path)
|
||||
|
||||
@@ -33,6 +33,7 @@ class ContainerStartup(unittest.TestCase):
|
||||
'PCB_CODEX_HOME': str(self.root / 'codex-home'),
|
||||
'PCB_CODEX_AUTH': 'apikey',
|
||||
'OPENAI_API_KEY': 'unit-test-api-credential',
|
||||
'PCB_AI_PROVIDER': 'openai',
|
||||
'PCB_FREEROUTING_JAR': str(self.jar),
|
||||
'PCB_CODEX_BIN': str(self.bin / 'codex'),
|
||||
'PCB_EDA_BIN': str(self.bin / 'lceda-pro'),
|
||||
|
||||
@@ -0,0 +1,192 @@
|
||||
"""Native error propagation and stalled-model handling, without model requests."""
|
||||
import asyncio
|
||||
import importlib
|
||||
import json
|
||||
from pathlib import Path
|
||||
import tempfile
|
||||
import unittest
|
||||
from unittest.mock import patch
|
||||
|
||||
app = importlib.import_module('codex_pcb.app')
|
||||
|
||||
|
||||
def notification(method, **params):
|
||||
return {'method': method, 'params': {'threadId': 'test-thread', 'turnId': 'test-turn', **params}}
|
||||
|
||||
|
||||
class FakeAppServer:
|
||||
def __init__(self, messages):
|
||||
self.events = asyncio.Queue()
|
||||
self.requests = set()
|
||||
for message in messages:
|
||||
self.events.put_nowait(message)
|
||||
|
||||
async def __aenter__(self):
|
||||
return self
|
||||
|
||||
async def __aexit__(self, *args):
|
||||
return False
|
||||
|
||||
async def call(self, method, params):
|
||||
if method == 'thread/start':
|
||||
return {'thread': {'id': 'test-thread'}, 'model': app.MODEL}
|
||||
if method == 'turn/start':
|
||||
return {'turn': {'id': 'test-turn'}}
|
||||
raise AssertionError('Unexpected call: ' + method)
|
||||
|
||||
|
||||
class ModelProgress(unittest.IsolatedAsyncioTestCase):
|
||||
def setUp(self):
|
||||
self.temp = tempfile.TemporaryDirectory()
|
||||
self.addCleanup(self.temp.cleanup)
|
||||
self.directory = Path(self.temp.name)
|
||||
self.entries = []
|
||||
self.task = {'id': 'test-task', 'state': 'planning', 'busy': True}
|
||||
self.patches = [
|
||||
patch.object(app, 'workspace', return_value=self.directory),
|
||||
patch.object(app, 'save'),
|
||||
patch.object(app, 'event', side_effect=lambda t, kind, data: self.entries.append((kind, data))),
|
||||
patch.object(app, 'fingerprint', return_value='test-source'),
|
||||
patch.object(app, 'CODEX_IDLE_TIMEOUT', 0.04),
|
||||
]
|
||||
for p in self.patches:
|
||||
p.start()
|
||||
self.addCleanup(p.stop)
|
||||
|
||||
async def run_work(self, messages, prepare=None):
|
||||
client = FakeAppServer(messages)
|
||||
if prepare:
|
||||
prepare(client)
|
||||
with patch.object(app, 'AppServer', return_value=client):
|
||||
await asyncio.wait_for(app.work(self.task, 'Publish a proposal only.', False), 1)
|
||||
return client
|
||||
|
||||
async def test_native_retries_and_terminal_error_reach_public_state(self):
|
||||
retry = notification('error', willRetry=True, error={
|
||||
'message': 'Reconnecting... 1/5', 'additionalDetails': 'upstream returned 403 Forbidden'})
|
||||
terminal = notification('error', willRetry=False, error={
|
||||
'message': '403 Forbidden', 'additionalDetails': 'Country, region, or territory not supported'})
|
||||
await self.run_work([retry, terminal])
|
||||
self.assertEqual(self.task['state'], 'failed')
|
||||
self.assertFalse(self.task['busy'])
|
||||
self.assertIn('Country, region', self.task['error'])
|
||||
retries = [data for kind, data in self.entries if kind == 'session.reconnecting']
|
||||
self.assertEqual(len(retries), 1)
|
||||
self.assertIn('upstream returned 403', retries[0]['message'])
|
||||
trace = [json.loads(line) for line in (self.directory / 'evidence/codex-events.jsonl').read_text().splitlines()]
|
||||
self.assertEqual(trace, [retry, terminal])
|
||||
|
||||
async def test_silent_model_fails_and_retains_thread_for_retry(self):
|
||||
await self.run_work([])
|
||||
self.assertEqual(self.task['state'], 'failed')
|
||||
self.assertFalse(self.task['busy'])
|
||||
self.assertEqual(self.task['thread_id'], 'test-thread')
|
||||
self.assertIn('no progress', self.task['error'])
|
||||
self.assertNotIn('test-task', app.CLIENTS)
|
||||
self.assertFalse(any(kind == 'session.reconnecting' for kind, _ in self.entries))
|
||||
|
||||
async def test_status_and_retry_noise_do_not_keep_turn_alive(self):
|
||||
producer = None
|
||||
|
||||
def prepare(client):
|
||||
async def send_noise():
|
||||
for _ in range(40):
|
||||
await client.events.put(notification('thread/status/changed', status={'type': 'active'}))
|
||||
await client.events.put(notification('error', willRetry=True, error={'message': 'Retrying'}))
|
||||
await asyncio.sleep(0.01)
|
||||
nonlocal producer
|
||||
producer = asyncio.create_task(send_noise())
|
||||
|
||||
try:
|
||||
await self.run_work([], prepare)
|
||||
self.assertEqual(self.task['state'], 'failed')
|
||||
self.assertIn('no progress', self.task['error'])
|
||||
self.assertIn('Last upstream error: Retrying', self.task['error'])
|
||||
self.assertFalse(producer.done())
|
||||
finally:
|
||||
producer.cancel()
|
||||
await asyncio.gather(producer, return_exceptions=True)
|
||||
|
||||
async def test_real_model_deltas_reset_idle_deadline(self):
|
||||
async def send_progress(client):
|
||||
for _ in range(6):
|
||||
await asyncio.sleep(0.015)
|
||||
await client.events.put(notification('item/reasoning/textDelta', delta='progress'))
|
||||
self.task['proposal'] = {'revision': 1}
|
||||
await client.events.put(notification('turn/completed', turn={'id': 'test-turn', 'status': 'completed'}))
|
||||
|
||||
producer = None
|
||||
|
||||
def prepare(client):
|
||||
nonlocal producer
|
||||
producer = asyncio.create_task(send_progress(client))
|
||||
|
||||
await self.run_work([], prepare)
|
||||
await producer
|
||||
self.assertEqual(self.task['state'], 'review')
|
||||
self.assertFalse(self.task['busy'])
|
||||
self.assertNotIn('error', self.task)
|
||||
|
||||
async def test_active_native_tool_is_not_cut_off_by_model_idle_deadline(self):
|
||||
producer = None
|
||||
|
||||
def prepare(client):
|
||||
async def finish_tool():
|
||||
await asyncio.sleep(0.1)
|
||||
client.requests.clear()
|
||||
self.task['proposal'] = {'revision': 1}
|
||||
await client.events.put(notification('turn/completed', turn={'id': 'test-turn', 'status': 'completed'}))
|
||||
nonlocal producer
|
||||
producer = asyncio.create_task(finish_tool())
|
||||
client.requests.add(producer)
|
||||
|
||||
await self.run_work([], prepare)
|
||||
await producer
|
||||
self.assertEqual(self.task['state'], 'review')
|
||||
|
||||
async def test_error_from_another_turn_is_ignored(self):
|
||||
stale = notification('error', turnId='old-turn', willRetry=False, error={'message': 'old error'})
|
||||
self.task['proposal'] = {'revision': 1}
|
||||
done = notification('turn/completed', turn={'id': 'test-turn', 'status': 'completed'})
|
||||
await self.run_work([stale, done])
|
||||
self.assertEqual(self.task['state'], 'review')
|
||||
self.assertNotIn('error', self.task)
|
||||
|
||||
async def test_long_native_shell_uses_its_own_execution_timeout(self):
|
||||
producer = None
|
||||
|
||||
def prepare(client):
|
||||
async def finish_command():
|
||||
await asyncio.sleep(0.1)
|
||||
await client.events.put(notification('item/completed', item={
|
||||
'id': 'command-1', 'type': 'commandExecution', 'status': 'completed'}))
|
||||
self.task['proposal'] = {'revision': 1}
|
||||
await client.events.put(notification('turn/completed', turn={'id': 'test-turn', 'status': 'completed'}))
|
||||
nonlocal producer
|
||||
producer = asyncio.create_task(finish_command())
|
||||
|
||||
start = notification('item/started', item={
|
||||
'id': 'command-1', 'type': 'commandExecution', 'status': 'inProgress'})
|
||||
await self.run_work([start], prepare)
|
||||
await producer
|
||||
self.assertEqual(self.task['state'], 'review')
|
||||
|
||||
async def test_idle_deadline_resumes_after_native_tool_finishes(self):
|
||||
producer = None
|
||||
|
||||
def prepare(client):
|
||||
async def finish_tool():
|
||||
await asyncio.sleep(0.1)
|
||||
client.requests.clear()
|
||||
nonlocal producer
|
||||
producer = asyncio.create_task(finish_tool())
|
||||
client.requests.add(producer)
|
||||
|
||||
await self.run_work([], prepare)
|
||||
await producer
|
||||
self.assertEqual(self.task['state'], 'failed')
|
||||
self.assertIn('no progress', self.task['error'])
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
@@ -0,0 +1,155 @@
|
||||
"""Per-design provider selection, credential isolation and runtime immutability."""
|
||||
import importlib
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
import tempfile
|
||||
import unittest
|
||||
from unittest.mock import patch
|
||||
|
||||
import httpx
|
||||
from codex_pcb import config, rpc, storage
|
||||
from codex_pcb.models import catalog
|
||||
|
||||
app = importlib.import_module('codex_pcb.app')
|
||||
|
||||
|
||||
class ProviderSelection(unittest.IsolatedAsyncioTestCase):
|
||||
def setUp(self):
|
||||
self.temp = tempfile.TemporaryDirectory()
|
||||
self.addCleanup(self.temp.cleanup)
|
||||
self.root = Path(self.temp.name)
|
||||
self.environment = patch.dict(os.environ, {
|
||||
'HOME': str(self.root), 'PATH': os.defpath,
|
||||
'PCB_SESSION_ROOT': str(self.root/'runtime'), 'PCB_CODEX_AUTH': 'apikey',
|
||||
'OPENAI_API_KEY': 'test-openai-only', 'DEEPSEEK_API_KEY': 'test-deepseek-only',
|
||||
'ARK_API_KEY': 'test-ark-only', 'DOUBAO_API_KEY': 'test-unused-alias',
|
||||
}, clear=True)
|
||||
self.environment.start()
|
||||
self.reload()
|
||||
self.scheduler = patch.object(app, 'schedule')
|
||||
self.schedule = self.scheduler.start()
|
||||
self.addCleanup(self.restore)
|
||||
|
||||
def reload(self):
|
||||
for module in (config, storage, rpc, app):
|
||||
importlib.reload(module)
|
||||
|
||||
def restore(self):
|
||||
self.scheduler.stop()
|
||||
self.environment.stop()
|
||||
self.reload()
|
||||
|
||||
async def request(self, method, path, **kwargs):
|
||||
async with httpx.AsyncClient(transport=httpx.ASGITransport(app=app.app), base_url='http://test') as client:
|
||||
return await client.request(method, path, **kwargs)
|
||||
|
||||
async def create(self, provider=None):
|
||||
body = {'text': 'Publish a proposal only; no production approval.'}
|
||||
if provider is not None:
|
||||
body['provider'] = provider
|
||||
return await self.request('POST', '/api/sessions', json=body)
|
||||
|
||||
async def test_default_is_openai_at_requested_compatible_endpoint(self):
|
||||
response = await self.create()
|
||||
self.assertEqual(response.status_code, 201)
|
||||
task = response.json()
|
||||
self.assertEqual(task['ai_provider'], 'openai')
|
||||
self.assertEqual(task['model'], 'gpt-6.1-sol')
|
||||
self.assertEqual(task['runtime']['api_base_url'], 'https://api.vip1129.cc')
|
||||
self.assertEqual(storage.load(task['id'])['runtime'], task['runtime'])
|
||||
self.assertFalse(self.schedule.call_args.args[2])
|
||||
|
||||
async def test_select_deepseek_and_doubao_for_independent_tasks(self):
|
||||
for name, model in (('deepseek','deepseek-flash'), ('doubao','doubao-seed-2-1-pro-260915')):
|
||||
with self.subTest(provider=name):
|
||||
response = await self.create(name)
|
||||
self.assertEqual(response.status_code, 201)
|
||||
task = response.json()
|
||||
self.assertEqual(task['ai_provider'], name)
|
||||
self.assertEqual(task['model'], model)
|
||||
self.assertEqual(task['provider'], 'vibemake_'+name)
|
||||
self.assertNotIn('test-', json.dumps(task))
|
||||
|
||||
async def test_unknown_or_unconfigured_provider_creates_no_task(self):
|
||||
response = await self.create('unsupported')
|
||||
self.assertEqual(response.status_code, 400)
|
||||
del os.environ['DEEPSEEK_API_KEY']
|
||||
response = await self.create('deepseek')
|
||||
self.assertEqual(response.status_code, 503)
|
||||
self.assertIn('DEEPSEEK_API_KEY', response.json()['detail'])
|
||||
self.assertFalse(storage.TASKS.exists())
|
||||
self.schedule.assert_not_called()
|
||||
|
||||
async def test_provider_list_reports_readiness_without_credentials(self):
|
||||
del os.environ['ARK_API_KEY']
|
||||
del os.environ['DOUBAO_API_KEY']
|
||||
response = await self.request('GET', '/api/providers')
|
||||
result = response.json()
|
||||
self.assertEqual(result['default_provider'], 'openai')
|
||||
readiness = {p['id']:p['configured'] for p in result['providers']}
|
||||
self.assertEqual(readiness, {'openai':True,'deepseek':True,'doubao':False})
|
||||
self.assertNotIn('test-', response.text)
|
||||
self.assertNotIn('API_KEY', response.text)
|
||||
|
||||
def test_each_process_receives_only_its_provider_credential(self):
|
||||
for name, key, expected in (('openai','OPENAI_API_KEY','test-openai-only'),
|
||||
('deepseek','DEEPSEEK_API_KEY','test-deepseek-only'),
|
||||
('doubao','ARK_API_KEY','test-ark-only')):
|
||||
with self.subTest(provider=name):
|
||||
runtime = config.runtime_for(name)
|
||||
args, env = rpc.process_config(False, runtime)
|
||||
self.assertEqual(env[key], expected)
|
||||
self.assertNotIn(expected, ' '.join(args))
|
||||
for other in rpc.SECRET_ENV_NAMES:
|
||||
if other != key:
|
||||
self.assertNotIn(other, env)
|
||||
setting = next(args[i+1] for i, arg in enumerate(args) if arg=='-c' and args[i+1].startswith('model_providers.'+runtime.provider+'.wire_api='))
|
||||
self.assertTrue(setting.endswith('"responses"'))
|
||||
if name == 'deepseek':
|
||||
self.assertIn('features.standalone_web_search=true', args)
|
||||
self.assertFalse(any('alpha_search' in arg for arg in args))
|
||||
|
||||
def test_doubao_alias_and_file_secret_do_not_leak_other_keys(self):
|
||||
del os.environ['ARK_API_KEY']
|
||||
runtime = config.runtime_for('doubao')
|
||||
self.assertEqual(rpc.api_key(runtime), 'test-unused-alias')
|
||||
del os.environ['DOUBAO_API_KEY']
|
||||
secret = self.root/'ark-secret'
|
||||
secret.write_text('file-ark-credential\n')
|
||||
os.environ['ARK_API_KEY_FILE'] = str(secret)
|
||||
args, env = rpc.process_config(False, runtime)
|
||||
self.assertEqual(env['ARK_API_KEY'], 'file-ark-credential')
|
||||
self.assertNotIn('ARK_API_KEY_FILE', env)
|
||||
self.assertNotIn('file-ark-credential', ' '.join(args))
|
||||
|
||||
async def test_selected_runtime_is_independent_of_default_and_key_rotation(self):
|
||||
task = (await self.create('deepseek')).json()
|
||||
runtime = app.task_runtime(task)
|
||||
before = storage.fingerprint(runtime)
|
||||
os.environ.update(PCB_AI_PROVIDER='doubao', DEEPSEEK_API_KEY='rotated-provider-secret')
|
||||
importlib.reload(config)
|
||||
self.assertEqual(app.task_runtime(task).snapshot(), runtime.snapshot())
|
||||
self.assertEqual(storage.fingerprint(app.task_runtime(task)), before)
|
||||
|
||||
async def test_saved_task_cannot_silently_change_model_or_endpoint(self):
|
||||
task = (await self.create('deepseek')).json()
|
||||
os.environ['PCB_DEEPSEEK_MODEL'] = 'different-model'
|
||||
with self.assertRaisesRegex(RuntimeError, 'cannot switch providers'):
|
||||
app.task_runtime(task)
|
||||
del os.environ['PCB_DEEPSEEK_MODEL']
|
||||
os.environ['PCB_DEEPSEEK_BASE_URL'] = 'https://different.example.test'
|
||||
with self.assertRaisesRegex(RuntimeError, 'cannot switch providers'):
|
||||
app.task_runtime(task)
|
||||
|
||||
def test_non_openai_metadata_keeps_requested_model_and_vision(self):
|
||||
for name in ('deepseek','doubao'):
|
||||
runtime = config.runtime_for(name)
|
||||
metadata = catalog(runtime)['models'][0]
|
||||
self.assertEqual(metadata['slug'], runtime.model)
|
||||
self.assertIn('image', metadata['input_modalities'])
|
||||
self.assertNotIn('test-', json.dumps(metadata))
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
@@ -28,6 +28,7 @@ class RuntimeConfig(unittest.IsolatedAsyncioTestCase):
|
||||
environment = {
|
||||
'HOME': str(self.root), 'PATH': os.defpath,
|
||||
'PCB_CODEX_AUTH': 'apikey',
|
||||
'PCB_AI_PROVIDER': 'openai',
|
||||
'PCB_SESSION_ROOT': str(self.root / 'runtime'),
|
||||
'PCB_CODEX_BIN': str(self.root / 'codex'),
|
||||
'PCB_EDA_BIN': str(self.root / 'native eda'),
|
||||
@@ -52,7 +53,7 @@ class RuntimeConfig(unittest.IsolatedAsyncioTestCase):
|
||||
args, env = rpc.process_config(True)
|
||||
settings = command_settings(args)
|
||||
provider = settings['model_providers'][config.PROVIDER]
|
||||
self.assertEqual(provider['base_url'], 'https://api.openai.com/v1')
|
||||
self.assertEqual(provider['base_url'], 'https://api.vip1129.cc')
|
||||
self.assertEqual(provider['env_key'], 'OPENAI_API_KEY')
|
||||
self.assertEqual(provider['wire_api'], 'responses')
|
||||
self.assertFalse(provider['requires_openai_auth'])
|
||||
@@ -73,6 +74,34 @@ class RuntimeConfig(unittest.IsolatedAsyncioTestCase):
|
||||
self.assertNotIn(FAKE_KEY, ' '.join(args))
|
||||
self.assertFalse(config.CODEX_HOME.exists())
|
||||
|
||||
def test_explicit_api_endpoint_and_approval_fingerprint(self):
|
||||
os.environ['OPENAI_API_KEY'] = FAKE_KEY
|
||||
before = storage.fingerprint()
|
||||
os.environ['PCB_OPENAI_BASE_URL'] = 'https://gateway.example.test/v1/'
|
||||
self.reload()
|
||||
args, _ = rpc.process_config(False)
|
||||
provider = command_settings(args)['model_providers'][config.PROVIDER]
|
||||
self.assertEqual(provider['base_url'], 'https://gateway.example.test/v1')
|
||||
self.assertNotEqual(before, storage.fingerprint())
|
||||
os.environ['OPENAI_API_KEY'] = 'rotated-unit-test-credential'
|
||||
self.assertEqual(provider['base_url'], config.MODEL_API_BASE_URL)
|
||||
|
||||
def test_api_endpoint_rejects_embedded_secrets_and_invalid_urls(self):
|
||||
for value in ('file:///tmp/socket', 'https://user:secret@example.test/v1',
|
||||
'https://example.test/v1?key=secret', 'https://example.test/#secret',
|
||||
'https://', 'https://example.test:invalid', 'https://example.test:0'):
|
||||
with self.subTest(value=value):
|
||||
os.environ['PCB_OPENAI_BASE_URL'] = value
|
||||
with self.assertRaisesRegex(ValueError, 'PCB_OPENAI_BASE_URL'):
|
||||
config.model_api_base_url()
|
||||
|
||||
def test_idle_timeout_is_part_of_frozen_runtime(self):
|
||||
before = storage.fingerprint()
|
||||
os.environ['PCB_CODEX_IDLE_TIMEOUT'] = '60'
|
||||
self.reload()
|
||||
self.assertEqual(config.CODEX_IDLE_TIMEOUT, 60)
|
||||
self.assertNotEqual(before, storage.fingerprint())
|
||||
|
||||
def test_environment_key_takes_precedence_over_file(self):
|
||||
os.environ.update(OPENAI_API_KEY=FAKE_KEY, OPENAI_API_KEY_FILE='/missing/file')
|
||||
self.assertEqual(rpc.api_key(), FAKE_KEY)
|
||||
|
||||
@@ -7,7 +7,9 @@ import { TaskProgress } from './TaskProgress.js';
|
||||
import { Markdown as RichMarkdown } from '@ziroeda/ai/markdown.js';
|
||||
|
||||
type Artifact = { name: string; kind: string; label: string; bytes: number; sha256: string };
|
||||
type Session = { id: string; request: string; state: string; busy: boolean; thread_id?: string; error?: string; cursor: number; created_at: number; updated_at?: number; proposal?: { title: string; markdown: string; revision: number; hash: string; at?: number }; approval?: { revision: number; at?: number }; delivery?: { files: Artifact[]; notes: string }; };
|
||||
type Session = { id: string; request: string; state: string; busy: boolean; ai_provider?: string; model?: string; effort?: string; thread_id?: string; error?: string; cursor: number; created_at: number; updated_at?: number; proposal?: { title: string; markdown: string; revision: number; hash: string; at?: number }; approval?: { revision: number; at?: number }; delivery?: { files: Artifact[]; notes: string }; };
|
||||
type AiProvider = { id: string; label: string; model: string; effort: string; configured: boolean };
|
||||
type ProviderConfig = { default_provider: string; providers: AiProvider[] };
|
||||
type Entry = { seq: number; at: number; type: string; data: Record<string, unknown> };
|
||||
const BASE = `${import.meta.env.BASE_URL}pcb-api`;
|
||||
const ACTIVE = 'vibemake.pcb2.persistent-session';
|
||||
@@ -33,6 +35,8 @@ function ConnectedCodexPcbDock(): JSX.Element {
|
||||
const [task, setTask] = useState<Session | null>(null);
|
||||
const [entries, setEntries] = useState<Entry[]>([]);
|
||||
const [request, setRequest] = useState('');
|
||||
const [providers, setProviders] = useState<AiProvider[]>([]);
|
||||
const [selectedProvider, setSelectedProvider] = useState('');
|
||||
const [comment, setComment] = useState('');
|
||||
const [busy, setBusy] = useState(false);
|
||||
const [error, setError] = useState('');
|
||||
@@ -44,7 +48,7 @@ function ConnectedCodexPcbDock(): JSX.Element {
|
||||
useEffect(() => { if (!open) return; let cancelled = false; let timer: number;
|
||||
const poll = async () => {
|
||||
try {
|
||||
const list = await api<Session[]>('/sessions'); if (cancelled) return; setSessions(list);
|
||||
const [list, config] = await Promise.all([api<Session[]>('/sessions'), api<ProviderConfig>('/providers')]); if (cancelled) return; setSessions(list); setProviders(config.providers); setSelectedProvider(current => current || config.default_provider);
|
||||
if (active) {
|
||||
const [next, changes] = await Promise.all([api<Session>(`/sessions/${active}`), api<Entry[]>(`/sessions/${active}/events?after=${cursor.current}`)]);
|
||||
if (cancelled || activeRef.current !== active) return;
|
||||
@@ -58,7 +62,7 @@ function ConnectedCodexPcbDock(): JSX.Element {
|
||||
// biome-ignore lint/correctness/useExhaustiveDependencies: Entry count triggers scrolling when new activity arrives.
|
||||
useEffect(() => { if (tab === 'activity') activity.current?.scrollTo({ top: activity.current.scrollHeight, behavior: 'smooth' }); }, [entries.length, tab]);
|
||||
const action = async (fn: () => Promise<void>) => { setBusy(true); setError(''); try { await fn(); } catch(e) { setError(String(e)); } finally { setBusy(false); } };
|
||||
const create = () => action(async () => { const t = await api<Session>('/sessions', { text: request }); choose(t.id); setTask(t); setRequest(''); });
|
||||
const create = () => action(async () => { const t = await api<Session>('/sessions', { text: request, provider: selectedProvider }); choose(t.id); setTask(t); setRequest(''); });
|
||||
const send = () => action(async () => { const t = await api<Session>(`/sessions/${active}/comments`, { text: comment }); setTask(t); setComment(''); });
|
||||
const approve = () => action(async () => { if (!task?.proposal) return; setTask(await api<Session>(`/sessions/${active}/approve`, { revision: task.proposal.revision, hash: task.proposal.hash })); setTab('activity'); });
|
||||
const cancel = () => action(async () => { setTask(await api<Session>(`/sessions/${active}/cancel`, {})); });
|
||||
@@ -68,18 +72,21 @@ function ConnectedCodexPcbDock(): JSX.Element {
|
||||
const objArchive = findObjArchive(task?.delivery?.files ?? []);
|
||||
const canReview = task && !task.approval && !task.busy && ['review','needs_input','failed'].includes(task.state);
|
||||
const interesting = entries.filter(e => ['message','activity','eda.started','eda.error','session.reconnecting','session.failed','production.blocked','delivery.completed','proposal.approved','session.resumed'].includes(e.type));
|
||||
const provider = providers.find(p => p.id === selectedProvider);
|
||||
const taskProvider = providers.find(p => p.id === task?.ai_provider)?.label || task?.ai_provider || 'OpenAI';
|
||||
const view = <div className="cp-root" data-native-text-shortcuts="true">
|
||||
{!open ? <button className="cp-launch" onClick={() => setOpen(true)}>✦ Codex AI 自动绘板</button> : <section className="cp-window" aria-label="Codex PCB 工作台">
|
||||
<header className="cp-header"><div><strong>Codex PCB 工作台</strong><span>从方案到真实电路板</span></div><button className="cp-close" onClick={() => setOpen(false)} aria-label="关闭工作台">×</button></header>
|
||||
<div className="cp-body"><aside className="cp-sidebar"><button className="cp-primary" onClick={() => choose(null)}>+ 新建设计</button><p className="cp-muted">设计记录</p>{sessions.map(s => <button key={s.id} className={`cp-session ${s.id === active ? 'selected' : ''}`} onClick={() => choose(s.id)}><strong>{s.proposal?.title || s.request.slice(0,36)}</strong><small>{STATES[s.state] || s.state}</small></button>)}<div className="cp-side-note">审核方案后开始设计。<br/>关闭网页,后台仍会继续。</div></aside>
|
||||
<div className="cp-content">{active && task && <TaskProgress key={task.id} task={task} entries={entries} sessions={sessions}/>}
|
||||
<main className="cp-main">{error && <div className="cp-error" role="alert">{error}<button onClick={() => setError('')}>×</button></div>}
|
||||
{!active ? <div className="cp-intake"><div className="cp-eyebrow">让需求成为电路板</div><h1>你想设计什么?</h1><p>描述用途、供电、接口和尺寸要求。AI 会先提出方案,由你审核后再开始绘制。</p><textarea aria-label="设计需求" value={request} onChange={e => setRequest(e.target.value)} placeholder="例如:设计一块 ESP32 最小系统板,5V 供电,带下载接口、复位和 BOOT 按键,双层板……" rows={7}/><button className="cp-primary" disabled={busy || request.trim().length < 5} onClick={create}>{busy ? '正在提交…' : '生成设计方案 →'}</button><div className="cp-delivery-hint">最终交付:原理图 · Layout · 板子 STEP · 3D 渲染图 · 可编辑工程</div></div> : !task ? <p>正在加载设计…</p> : <>
|
||||
{!active ? <div className="cp-intake"><div className="cp-eyebrow">让需求成为电路板</div><h1>你想设计什么?</h1><p>描述用途、供电、接口和尺寸要求。AI 会先提出方案,由你审核后再开始绘制。</p><div className="cp-provider"><label htmlFor="cp-provider">AI 服务</label><select id="cp-provider" value={selectedProvider} onChange={e => setSelectedProvider(e.target.value)} disabled={busy || !providers.length} aria-describedby="cp-provider-help">{!providers.length && <option value="">正在读取服务配置…</option>}{providers.map(p => <option key={p.id} value={p.id} disabled={!p.configured}>{p.label} · {p.model}{!p.configured ? '(未配置凭据)' : ''}</option>)}</select><small id="cp-provider-help">{provider && !provider.configured ? `${provider.label} 尚未配置服务端凭据,请先配置后端或选择其他服务。` : '所选服务及模型在本次设计中保持固定;新建设计时可以切换。'}</small></div><textarea aria-label="设计需求" value={request} onChange={e => setRequest(e.target.value)} placeholder="例如:设计一块 ESP32 最小系统板,5V 供电,带下载接口、复位和 BOOT 按键,双层板……" rows={7}/><button className="cp-primary" disabled={busy || !provider?.configured || request.trim().length < 5} onClick={create}>{busy ? '正在提交…' : '生成设计方案 →'}</button><div className="cp-delivery-hint">最终交付:原理图 · Layout · 板子 STEP · 3D 渲染图 · 可编辑工程</div></div> : !task ? <p>正在加载设计…</p> : <>
|
||||
<div className="cp-task-header"><div><h2>{task.proposal?.title || task.request.slice(0,60)}</h2><span className={`cp-status state-${task.state}`}>{task.busy && <i/>}{STATES[task.state] || task.state}</span></div>{task.busy && <button className="cp-stop" disabled={busy} onClick={cancel}>停止运行</button>}{!task.busy && task.approval && ['failed','blocked','cancelled','interrupted'].includes(task.state) && <button disabled={busy} onClick={resume}>继续此设计</button>}</div>
|
||||
<p className="cp-task-model">{taskProvider} · {task.model || '原会话模型'}</p>
|
||||
<nav className="cp-tabs"><button aria-selected={tab === 'plan'} onClick={() => setTab('plan')}>设计方案{task.proposal ? ` · v${task.proposal.revision}` : ''}</button><button aria-selected={tab === 'activity'} onClick={() => setTab('activity')}>运行记录</button><button aria-selected={tab === 'files'} onClick={() => setTab('files')}>交付文件{task.delivery ? ` · ${task.delivery.files.length}` : ''}</button></nav>
|
||||
{task.error && <div className="cp-error">{task.error}</div>}
|
||||
{tab === 'plan' && <div className="cp-plan"><details><summary>原始需求</summary><p>{task.request}</p></details>{task.proposal ? <Markdown value={task.proposal.markdown}/> : <p className="cp-muted">AI 正在研究需求和制定方案,可以在运行记录中查看进度。</p>}{task.approval && <div className="cp-approved">已确认方案 v{task.approval.revision},设计按此方案执行。</div>}{canReview && <div className="cp-review"><label htmlFor="cp-comment">对方案有修改意见?</label><textarea id="cp-comment" value={comment} onChange={e => setComment(e.target.value)} placeholder="补充要求或指出需要修改的地方…" rows={3}/><div className="cp-actions"><button disabled={busy || comment.trim().length < 5} onClick={send}>提交意见,修改方案</button><button className="cp-primary" disabled={busy || task.state !== 'review' || !!comment.trim()} onClick={approve}>同意此方案,开始运行</button></div>{comment.trim() && <small>请先提交修改意见,待新方案生成后再确认。</small>}</div>}</div>}
|
||||
{tab === 'activity' && <div className="cp-activity" ref={activity}>{interesting.map(e => <article key={e.seq} className={e.type === 'message' ? `cp-message ${text(e.data.role)}` : 'cp-event'}><time>{new Date(e.at * 1000).toLocaleTimeString()}</time>{e.type === 'message' ? <Markdown value={text(e.data.text)}/> : <><strong>{e.type === 'eda.started' ? '嘉立创 EDA · ' + text(e.data.label) : e.type === 'activity' ? ({ commandExecution: '执行脚本', webSearch: '查阅资料', dynamicToolCall: '调用工具', fileChange: '编辑文件' }[text(e.data.kind)] || text(e.data.kind)) : ({ 'eda.error':'EDA 返回错误,AI 可继续处理', 'session.reconnecting':'正在恢复会话', 'session.failed':'会话失败', 'production.blocked':'遇到阻碍', 'delivery.completed':'交付校验通过', 'proposal.approved':'方案已确认,开始设计', 'session.resumed':'已继续原会话' }[e.type] || e.type)}</strong>{text(e.data.message) && <p>{text(e.data.message)}</p>}{text(e.data.command) && <details><summary>查看执行命令</summary><pre>{text(e.data.command)}</pre></details>}</>}</article>)}{task.busy && <p className="cp-muted">● AI 正在继续处理,请稍候…</p>}<details className="cp-session-info"><summary>会话信息</summary><code>{task.thread_id || '正在创建'}</code><p>模型:GPT-6.1 Sol · 方案与生产共用此会话</p></details></div>}
|
||||
{tab === 'activity' && <div className="cp-activity" ref={activity}>{interesting.map(e => <article key={e.seq} className={e.type === 'message' ? `cp-message ${text(e.data.role)}` : 'cp-event'}><time>{new Date(e.at * 1000).toLocaleTimeString()}</time>{e.type === 'message' ? <Markdown value={text(e.data.text)}/> : <><strong>{e.type === 'eda.started' ? '嘉立创 EDA · ' + text(e.data.label) : e.type === 'activity' ? ({ commandExecution: '执行脚本', webSearch: '查阅资料', dynamicToolCall: '调用工具', fileChange: '编辑文件' }[text(e.data.kind)] || text(e.data.kind)) : ({ 'eda.error':'EDA 返回错误,AI 可继续处理', 'session.reconnecting':'正在恢复会话', 'session.failed':'会话失败', 'production.blocked':'遇到阻碍', 'delivery.completed':'交付校验通过', 'proposal.approved':'方案已确认,开始设计', 'session.resumed':'已继续原会话' }[e.type] || e.type)}</strong>{text(e.data.message) && <p>{text(e.data.message)}</p>}{text(e.data.command) && <details><summary>查看执行命令</summary><pre>{text(e.data.command)}</pre></details>}</>}</article>)}{task.busy && <p className="cp-muted">● AI 正在继续处理,请稍候…</p>}<details className="cp-session-info"><summary>会话信息</summary><code>{task.thread_id || '正在创建'}</code><p>模型:{taskProvider} · {task.model || '原会话模型'} · 方案与生产共用此会话</p></details></div>}
|
||||
{tab === 'files' && <div className="cp-files">{!task.delivery ? <p className="cp-muted">完成设计和原生检查后,交付文件会显示在这里。</p> : <>{step && <DeliveryModel3D key={`${active}/${step.name}/${step.sha256}`} url={downloadable(step)} sha256={step.sha256} name={step.name} objUrl={objArchive ? downloadable(objArchive) : undefined} objSha256={objArchive?.sha256}/>}<p>{task.delivery.notes}</p>{task.delivery.files.filter(f => ['render','layout','schematic'].includes(f.kind) && /\.(png|jpe?g|svg)$/i.test(f.name)).map(f => <figure key={f.name}><img src={downloadable(f)} alt={f.label}/><figcaption>{f.label}</figcaption></figure>)}{task.delivery.files.map(f => <a className="cp-file" key={f.name} href={downloadable(f)} download><div><strong>{f.label}</strong><small>{f.name} · {(f.bytes / 1024).toFixed(1)} KB</small></div><span>下载 ↓</span></a>)}</>}</div>}
|
||||
</>}
|
||||
</main></div></div>
|
||||
|
||||
@@ -7,3 +7,5 @@
|
||||
.cp-content{display:flex;flex-direction:column;flex:1;min-width:0;min-height:0}.cp-progress{flex-shrink:0;padding:18px 34px 14px;border-bottom:1px solid var(--cp-border);background:#142233}.cp-progress-heading,.cp-progress-timing{display:flex;justify-content:space-between;align-items:center;gap:10px;flex-wrap:wrap}.cp-progress-heading strong{color:#b7e2ff;font-size:15px}.cp-progress-heading>div>span{margin-left:12px;color:var(--cp-muted);font-size:12px}.cp-progress-elapsed{font-variant-numeric:tabular-nums;color:var(--cp-muted);font-size:12px}.cp-progress-track{display:grid;grid-template-columns:repeat(5,minmax(0,1fr));gap:8px;margin:14px 0}.cp-progress-segment{height:5px;overflow:hidden;border-radius:4px;background:var(--cp-border);margin-bottom:9px}.cp-progress-segment i{display:block;height:100%;width:0;background:var(--cp-blue);border-radius:inherit}.cp-progress-step.is-done .cp-progress-segment i{width:100%;background:#78d7b1}.cp-progress-step.is-current .cp-progress-segment i{width:45%;animation:cp-pulse 1.8s infinite}.cp-progress-step>span{color:var(--cp-muted);font-size:12px;display:flex;align-items:center;gap:6px}.cp-progress-step b{font-size:11px;font-weight:500;display:inline-flex;justify-content:center;align-items:center;width:18px;height:18px;border:1px solid var(--cp-border);border-radius:50%;flex-shrink:0}.cp-progress-step.is-done>span{color:#a3dfc5}.cp-progress-step.is-current>span{color:#c7eaff;font-weight:600}.cp-progress-step.is-current b{border-color:var(--cp-blue);color:var(--cp-blue)}.cp-progress-timing strong{font-size:13px;font-weight:500;color:#c7eaff}.cp-progress-timing>span{font-size:11px;color:var(--cp-muted)}.cp-progress-note{font-size:11px;margin:7px 0 0;color:var(--cp-muted)}.cp-progress.is-paused .is-current .cp-progress-segment i{animation:none;background:#e4b875}.cp-progress.is-paused .cp-progress-heading strong{color:#e4b875}.cp-progress.is-complete .cp-progress-heading strong{color:#a3dfc5}@media(max-width:850px){.cp-progress{padding:14px 18px 12px}.cp-progress-track{gap:5px}.cp-progress-step>span{font-size:11px;gap:4px}}@media(max-width:550px){.cp-progress{padding:12px}.cp-progress-heading>div>span{margin-left:7px}.cp-progress-track{margin:10px 0}.cp-progress-step>span{flex-direction:column;align-items:flex-start;gap:4px}.cp-progress-note{font-size:10px}}@media(prefers-reduced-motion:reduce){.cp-progress-step.is-current .cp-progress-segment i{animation:none}}
|
||||
|
||||
.cp-model-actions{display:flex;gap:8px;flex-wrap:wrap;justify-content:flex-end}.cp-model-source{display:block;font-size:12px;margin-top:4px;color:var(--cp-muted)}@media(max-width:850px){.cp-model-header{flex-wrap:wrap}.cp-model-actions{justify-content:flex-start}}
|
||||
|
||||
.cp-provider{display:grid;gap:7px;margin:22px 0}.cp-provider label{font-weight:600}.cp-provider select{font:inherit;min-height:44px;width:100%;max-width:540px;padding:9px 12px;border:1px solid #3a4e65;border-radius:9px;background:#0c1520;color:#f1f5f9}.cp-provider select:focus-visible{outline:2px solid var(--cp-blue);outline-offset:2px}.cp-provider select:disabled{opacity:.6}.cp-provider small,.cp-task-model{color:var(--cp-muted);font-size:12px}.cp-task-model{margin:12px 0 0}
|
||||
|
||||
@@ -51,6 +51,7 @@ The configured AI backend for this release is http://39.105.93.138:8003. The bro
|
||||
}
|
||||
|
||||
Verify /pcb/pcb-api/health returns JSON with ok=true after deployment. The AI entry is enabled in this build and appears only after opening a project and loading its workbench.
|
||||
This build also requires /pcb/pcb-api/providers from the updated backend. New designs can select OpenAI, DeepSeek or Doubao; OpenAI is the default. Configure each provider's key only in the backend environment, never in the frontend ZIP. Unconfigured providers remain disabled.
|
||||
Serve index.html, sw.js, registerSW.js, build-info.json and the web manifest with Cache-Control: no-cache. Hashed assets can use immutable caching. Keep old hashed assets for already open editors.
|
||||
`);
|
||||
execFileSync('zip', ['-qr', join(stage, 'vibemake-pcb.zip'), '.'], { cwd: pcb });
|
||||
|
||||
Reference in New Issue
Block a user