Merge remote-tracking branch 'origin/main' into fix/release-pr-ci

Author: elkaix

.changeset/dsml-tool-call-recovery.md

@@ -0,0 +1,6 @@
+---
+"@pymodel/pythinker-code": patch
+"@pymodel/pythinker-desktop": patch
+---
+
+Run tool calls that some models (such as DeepSeek) write as DSML or <tool_call> text instead of showing them as plain text.

.changeset/opencode-billing-error.md

@@ -0,0 +1,6 @@
+---
+"@pymodel/pythinker-code": patch
+"@pymodel/pythinker-desktop": patch
+---
+
+Report an insufficient-balance response from OpenAI-compatible providers as a billing error instead of an authentication error.

.changeset/provider-env-api-key-auth.md

@@ -0,0 +1,6 @@
+---
+"@pymodel/pythinker-code": patch
+"@pymodel/pythinker-desktop": patch
+---
+
+Accept a vendor API key or base URL set in a provider's env table (for example ANTHROPIC_API_KEY or ANTHROPIC_BASE_URL) instead of ignoring it.

apps/pythinker-code/src/cli/sub/provider.ts

@@ -406,7 +406,7 @@ export async function handleCatalogAdd(
 
   // Always restore `[thinking]` from what was there before — including
   // `undefined`. Persisting `enabled: false` when the user never set it would
-  // make `resolveThinkingEffort` (agent-core-v2/src/kosong/model/thinking.ts) treat
+  // make `resolveThinkingEffort` (agent-core-v2/src/llm-adapter/model/thinking.ts) treat
   // it as an explicit "off" request and silently disable thinking, even for
   // thinking-capable models.
   config.thinking = previousThinking;

apps/vis/server/src/lib/context-projector.ts

@@ -10,7 +10,7 @@ import {
   selectCompactionUserMessages,
   selectRecentUserMessages,
 } from '@pymodel/agent-core-v2/agent/contextMemory/compactionHandoff';
-import { estimateTokensForMessages } from '@pymodel/agent-core-v2/kosong/contract/tokens';
+import { estimateTokensForMessages } from '@pymodel/agent-core-v2/llm-adapter/contract/tokens';
 import { renderToolResultForModel } from '@pymodel/agent-core-v2/agent/contextMemory/toolResultRender';
 import type {
   ContentPart,
@@ -678,7 +678,7 @@ const MICRO_MIN_CONTENT_TOKENS = 100;
 
 /** Replicates the engine's per-char token weighting exactly, over the same
  *  `text` + `think` parts its gate counts. The engine
- *  (`packages/agent-core-v2/src/kosong/contract/tokens.ts`) sums per-part
+ *  (`packages/agent-core-v2/src/llm-adapter/contract/tokens.ts`) sums per-part
  *  estimates, each
  *  `estimateTokens(s) = Math.ceil(asciiCount / 4) + nonAsciiCount` (ASCII ~4
  *  chars/token, every non-ASCII/CJK code point a full token); other part types

apps/vis/server/test/lib/context-projector.test.ts

@@ -1,6 +1,6 @@
 // apps/vis/server/test/lib/context-projector.test.ts
 import { describe, it, expect, afterEach } from 'vitest';
-import { estimateTokensForMessages } from '@pymodel/agent-core-v2/kosong/contract/tokens';
+import { estimateTokensForMessages } from '@pymodel/agent-core-v2/llm-adapter/contract/tokens';
 import { buildCompactionContinuationText } from '@pymodel/agent-core-v2/agent/contextMemory/compactionHandoff';
 import { buildSessionFixture } from '../fixtures/build';
 import { projectContext } from '../../src/lib/context-projector';

packages/agent-core-v2/src/app/auth/auth.ts

@@ -1,7 +1,7 @@
 import { createDecorator, type ServiceIdentifier } from '#/_base/di/instantiation';
 import { Error2 } from '#/_base/errors/errors';
 
-import type { OAuthRef } from '#/kosong/provider/provider';
+import type { OAuthRef } from '#/llm-adapter/provider/provider';
 
 import { AuthErrors } from './errors';
 

packages/agent-core-v2/src/app/auth/authService.ts

@@ -14,15 +14,15 @@ import { type ILogger, ILogService } from '#/_base/log/log';
 import { IBootstrapService } from '#/app/bootstrap/bootstrap';
 import { IConfigService } from '#/app/config/config';
 import { LifecycleScope } from '#/app/scopes';
-import { IModelService, type ModelRecord } from '#/kosong/model/model';
+import { IModelService, type ModelRecord } from '#/llm-adapter/model/model';
 import {
   effectiveModelConfig,
   nonEmpty,
   providerNameFromFlatModel,
   resolveModelAuthMaterial,
   resolveModelForReady,
-} from '#/kosong/model/modelAuth';
-import { IProviderService, type OAuthRef } from '#/kosong/provider/provider';
+} from '#/llm-adapter/model/model-auth';
+import { IProviderService, type OAuthRef } from '#/llm-adapter/provider/provider';
 
 import {
   AuthModelNotResolvedError,

packages/agent-core-v2/src/app/auth/authStatusService.ts

@@ -1,8 +1,8 @@
 import { ScopeActivation, registerScopedService } from '#/_base/di/scope';
 import { LifecycleScope } from '#/app/scopes';
-import { IModelService } from '#/kosong/model/model';
-import { resolveModelForReady } from '#/kosong/model/modelAuth';
-import { IProviderService } from '#/kosong/provider/provider';
+import { IModelService } from '#/llm-adapter/model/model';
+import { resolveModelForReady } from '#/llm-adapter/model/model-auth';
+import { IProviderService } from '#/llm-adapter/provider/provider';
 
 import type { AuthSummary } from './authStatus';
 import { IAuthStatusService } from './authStatus';

packages/agent-core-v2/src/app/auth/configSection.ts

@@ -19,7 +19,7 @@ import {
   transformPlainObject,
 } from '#/app/config/toml';
 import { type AssertExact, type Equal } from '#/_base/utils/typeEquality';
-import type { OAuthRef } from '#/kosong/provider/provider';
+import type { OAuthRef } from '#/llm-adapter/provider/provider';
 
 export const SERVICES_SECTION = 'services';