Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b0c2b74c16 | ||
|
|
14d2d8cb28 | ||
|
|
03836bbc4c | ||
|
|
76ce62025a | ||
|
|
b15473d24e |
@@ -33,25 +33,6 @@ jobs:
|
|||||||
brew install xcodegen
|
brew install xcodegen
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Prepare Runner Keychain
|
|
||||||
env:
|
|
||||||
HOME: /var/lib/act_runner
|
|
||||||
run: |
|
|
||||||
set -euo pipefail
|
|
||||||
mkdir -p "${HOME}/Library/Keychains"
|
|
||||||
|
|
||||||
login_keychain="${HOME}/Library/Keychains/login.keychain"
|
|
||||||
if [ ! -f "${login_keychain}-db" ]; then
|
|
||||||
security create-keychain -p "" "${login_keychain}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
security unlock-keychain -p "" "${login_keychain}" 2>/dev/null || \
|
|
||||||
security unlock-keychain -p "sybil-ci-keychain-password" "${login_keychain}" 2>/dev/null || true
|
|
||||||
security default-keychain -d user -s "${login_keychain}"
|
|
||||||
security list-keychains -d user -s "${login_keychain}-db"
|
|
||||||
security delete-keychain "${HOME}/Library/Keychains/sybil_ci_keychain" >/dev/null 2>&1 || true
|
|
||||||
rm -f "${HOME}/Library/Keychains/sybil_ci_keychain" "${HOME}/Library/Keychains/sybil_ci_keychain-db"
|
|
||||||
|
|
||||||
- name: Upload to TestFlight
|
- name: Upload to TestFlight
|
||||||
working-directory: ios
|
working-directory: ios
|
||||||
env:
|
env:
|
||||||
|
|||||||
@@ -285,6 +285,7 @@ Behavior notes:
|
|||||||
- For `chatId` calls, server stores only *new* non-assistant messages from provided history to avoid duplicates.
|
- For `chatId` calls, server stores only *new* non-assistant messages from provided history to avoid duplicates.
|
||||||
- `additionalSystemPrompt`, when present directly or loaded from stored chat settings, is prepended to the provider request as a `system` message and is not inserted into the persisted chat transcript by this endpoint.
|
- `additionalSystemPrompt`, when present directly or loaded from stored chat settings, is prepended to the provider request as a `system` message and is not inserted into the persisted chat transcript by this endpoint.
|
||||||
- `enabledTools` limits Sybil-managed tools for this request. When omitted for a saved chat, the stored chat setting is used; otherwise all available tools are enabled by default. An empty array disables Sybil-managed tools.
|
- `enabledTools` limits Sybil-managed tools for this request. When omitted for a saved chat, the stored chat setting is used; otherwise all available tools are enabled by default. An empty array disables Sybil-managed tools.
|
||||||
|
- `maxTokens` is optional. For `anthropic`, when omitted the backend requests the selected model's maximum output token limit from Anthropic's Models API and uses that as `max_tokens`; if the model limit cannot be loaded, the fallback is 128000. For other providers, omitted `maxTokens` is not sent as an explicit cap.
|
||||||
- Server persists final assistant output and call metadata (`LlmCall`) in DB.
|
- Server persists final assistant output and call metadata (`LlmCall`) in DB.
|
||||||
- Server updates chat-level model metadata on each call: `lastUsedProvider`/`lastUsedModel`; first successful/failed call also initializes `initiatedProvider`/`initiatedModel` if unset.
|
- Server updates chat-level model metadata on each call: `lastUsedProvider`/`lastUsedModel`; first successful/failed call also initializes `initiatedProvider`/`initiatedModel` if unset.
|
||||||
- Attachments are optional and currently apply to `user` messages. Persisted chat history stores them under `message.metadata.attachments`.
|
- Attachments are optional and currently apply to `user` messages. Persisted chat history stores them under `message.metadata.attachments`.
|
||||||
|
|||||||
@@ -64,6 +64,7 @@ Notes:
|
|||||||
- For persisted streams, backend stores only new non-assistant input history rows to avoid duplicates.
|
- For persisted streams, backend stores only new non-assistant input history rows to avoid duplicates.
|
||||||
- `additionalSystemPrompt`, when present directly or loaded from stored chat settings, is prepended to the provider request as a `system` message and is not inserted into the persisted chat transcript by this endpoint.
|
- `additionalSystemPrompt`, when present directly or loaded from stored chat settings, is prepended to the provider request as a `system` message and is not inserted into the persisted chat transcript by this endpoint.
|
||||||
- `enabledTools` limits Sybil-managed tools for this request. When omitted for a saved chat, the stored chat setting is used; otherwise all available tools are enabled by default. An empty array disables Sybil-managed tools.
|
- `enabledTools` limits Sybil-managed tools for this request. When omitted for a saved chat, the stored chat setting is used; otherwise all available tools are enabled by default. An empty array disables Sybil-managed tools.
|
||||||
|
- `maxTokens` is optional. For `anthropic`, when omitted the backend requests the selected model's maximum output token limit from Anthropic's Models API and uses that as `max_tokens`; if the model limit cannot be loaded, the fallback is 128000. For other providers, omitted `maxTokens` is not sent as an explicit cap.
|
||||||
- Attachments are optional and are persisted under `message.metadata.attachments` on stored user messages when `persist` is `true`.
|
- Attachments are optional and are persisted under `message.metadata.attachments` on stored user messages when `persist` is `true`.
|
||||||
|
|
||||||
Persisted chat streams with a `chatId` are backend-owned active runs:
|
Persisted chat streams with a `chatId` are backend-owned active runs:
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ targets:
|
|||||||
GENERATE_INFOPLIST_FILE: YES
|
GENERATE_INFOPLIST_FILE: YES
|
||||||
INFOPLIST_FILE: Apps/Sybil/Info.plist
|
INFOPLIST_FILE: Apps/Sybil/Info.plist
|
||||||
ASSETCATALOG_COMPILER_APPICON_NAME: AppIcon
|
ASSETCATALOG_COMPILER_APPICON_NAME: AppIcon
|
||||||
MARKETING_VERSION: "1.10"
|
MARKETING_VERSION: "1.13.2"
|
||||||
CURRENT_PROJECT_VERSION: 11
|
CURRENT_PROJECT_VERSION: 11
|
||||||
INFOPLIST_KEY_CFBundleDisplayName: Sybil
|
INFOPLIST_KEY_CFBundleDisplayName: Sybil
|
||||||
INFOPLIST_KEY_ITSAppUsesNonExemptEncryption: NO
|
INFOPLIST_KEY_ITSAppUsesNonExemptEncryption: NO
|
||||||
|
|||||||
+15
-1
@@ -12,6 +12,7 @@ CI_KEYCHAIN_DB_PATH = File.expand_path("~/Library/Keychains/#{CI_KEYCHAIN_NAME}-
|
|||||||
IOS_ROOT = File.expand_path("..", __dir__)
|
IOS_ROOT = File.expand_path("..", __dir__)
|
||||||
PROJECT_FILE = File.join(IOS_ROOT, "Sybil.xcodeproj")
|
PROJECT_FILE = File.join(IOS_ROOT, "Sybil.xcodeproj")
|
||||||
PROJECT_SPEC = File.join(IOS_ROOT, "project.yml")
|
PROJECT_SPEC = File.join(IOS_ROOT, "project.yml")
|
||||||
|
APP_PROJECT_SPEC = File.join(IOS_ROOT, "Apps/Sybil/project.yml")
|
||||||
|
|
||||||
def present?(value)
|
def present?(value)
|
||||||
!value.to_s.strip.empty?
|
!value.to_s.strip.empty?
|
||||||
@@ -49,6 +50,17 @@ def build_number
|
|||||||
value.to_i
|
value.to_i
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def stamp_marketing_version(version)
|
||||||
|
contents = File.read(APP_PROJECT_SPEC)
|
||||||
|
updated = contents.sub(/^(\s*MARKETING_VERSION:\s*).*/, "\\1\"#{version}\"")
|
||||||
|
|
||||||
|
if updated == contents
|
||||||
|
UI.user_error!("Could not find MARKETING_VERSION in #{APP_PROJECT_SPEC}")
|
||||||
|
end
|
||||||
|
|
||||||
|
File.write(APP_PROJECT_SPEC, updated)
|
||||||
|
end
|
||||||
|
|
||||||
platform :ios do
|
platform :ios do
|
||||||
private_lane :app_store_api_key do
|
private_lane :app_store_api_key do
|
||||||
app_store_connect_api_key(
|
app_store_connect_api_key(
|
||||||
@@ -104,9 +116,11 @@ platform :ios do
|
|||||||
|
|
||||||
api_key = app_store_api_key
|
api_key = app_store_api_key
|
||||||
|
|
||||||
|
version = release_version
|
||||||
|
stamp_marketing_version(version)
|
||||||
sh("xcodegen", "--spec", PROJECT_SPEC)
|
sh("xcodegen", "--spec", PROJECT_SPEC)
|
||||||
|
|
||||||
increment_version_number(version_number: release_version, xcodeproj: PROJECT_FILE)
|
increment_version_number(version_number: version, xcodeproj: PROJECT_FILE)
|
||||||
increment_build_number(build_number: build_number, xcodeproj: PROJECT_FILE)
|
increment_build_number(build_number: build_number, xcodeproj: PROJECT_FILE)
|
||||||
|
|
||||||
sync_signing(api_key: api_key, readonly: true)
|
sync_signing(api_key: api_key, readonly: true)
|
||||||
|
|||||||
@@ -28,6 +28,45 @@ import type { ChatMessage } from "../types.js";
|
|||||||
const INTERNAL_CORRECTION =
|
const INTERNAL_CORRECTION =
|
||||||
"Internal correction: the previous assistant message claimed it would run a tool, but no tool call was made. If the task needs an available tool, call it now. Otherwise provide the final answer directly without saying you will run a tool.";
|
"Internal correction: the previous assistant message claimed it would run a tool, but no tool call was made. If the task needs an available tool, call it now. Otherwise provide the final answer directly without saying you will run a tool.";
|
||||||
|
|
||||||
|
const DEFAULT_ANTHROPIC_MAX_TOKENS = 128_000;
|
||||||
|
const MODEL_MAX_TOKENS_CACHE_MS = 24 * 60 * 60 * 1000;
|
||||||
|
|
||||||
|
const modelMaxTokensCache = new Map<string, { maxTokens: number; expiresAt: number }>();
|
||||||
|
|
||||||
|
function readMaxTokens(value: unknown) {
|
||||||
|
return Number.isSafeInteger(value) && (value as number) > 0 ? (value as number) : undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
function getModelInfoMaxTokens(modelInfo: any) {
|
||||||
|
return readMaxTokens(modelInfo?.max_tokens) ?? readMaxTokens(modelInfo?.maxTokens);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getMessagesMaxTokens(params: ToolAwareCompletionParams) {
|
||||||
|
if (params.maxTokens) return params.maxTokens;
|
||||||
|
|
||||||
|
const cached = modelMaxTokensCache.get(params.model);
|
||||||
|
if (cached && cached.expiresAt > Date.now()) return cached.maxTokens;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const retrieve = params.client?.models?.retrieve;
|
||||||
|
if (typeof retrieve === "function") {
|
||||||
|
const modelInfo = await retrieve.call(params.client.models, params.model);
|
||||||
|
const maxTokens = getModelInfoMaxTokens(modelInfo);
|
||||||
|
if (maxTokens) {
|
||||||
|
modelMaxTokensCache.set(params.model, {
|
||||||
|
maxTokens,
|
||||||
|
expiresAt: Date.now() + MODEL_MAX_TOKENS_CACHE_MS,
|
||||||
|
});
|
||||||
|
return maxTokens;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
// Fall back to the documented max for Claude Opus 4.8 and related high-output models.
|
||||||
|
}
|
||||||
|
|
||||||
|
return DEFAULT_ANTHROPIC_MAX_TOKENS;
|
||||||
|
}
|
||||||
|
|
||||||
function toTools(tools: any[]) {
|
function toTools(tools: any[]) {
|
||||||
return tools
|
return tools
|
||||||
.map((tool) => {
|
.map((tool) => {
|
||||||
@@ -160,11 +199,12 @@ function mergeUsage(acc: Required<ToolAwareUsage>, usage: any) {
|
|||||||
|
|
||||||
export async function completeWithMessagesApi(params: ToolAwareCompletionParams): Promise<ToolAwareCompletionResult> {
|
export async function completeWithMessagesApi(params: ToolAwareCompletionParams): Promise<ToolAwareCompletionResult> {
|
||||||
const enabledTools = getEnabledChatTools(params);
|
const enabledTools = getEnabledChatTools(params);
|
||||||
|
const maxTokens = await getMessagesMaxTokens(params);
|
||||||
if (!enabledTools.length) {
|
if (!enabledTools.length) {
|
||||||
const response = await params.client.messages.create({
|
const response = await params.client.messages.create({
|
||||||
model: params.model,
|
model: params.model,
|
||||||
system: buildTopLevelSystemPrompt(params.messages, params.userLocation),
|
system: buildTopLevelSystemPrompt(params.messages, params.userLocation),
|
||||||
max_tokens: params.maxTokens ?? 1024,
|
max_tokens: maxTokens,
|
||||||
temperature: params.temperature,
|
temperature: params.temperature,
|
||||||
messages: buildBaseMessages(params),
|
messages: buildBaseMessages(params),
|
||||||
} as any);
|
} as any);
|
||||||
@@ -192,7 +232,7 @@ export async function completeWithMessagesApi(params: ToolAwareCompletionParams)
|
|||||||
const response = await params.client.messages.create({
|
const response = await params.client.messages.create({
|
||||||
model: params.model,
|
model: params.model,
|
||||||
system: buildTopLevelSystemPrompt(params.messages, params.userLocation, buildChatToolSystemPrompt(params)),
|
system: buildTopLevelSystemPrompt(params.messages, params.userLocation, buildChatToolSystemPrompt(params)),
|
||||||
max_tokens: params.maxTokens ?? 1024,
|
max_tokens: maxTokens,
|
||||||
temperature: params.temperature,
|
temperature: params.temperature,
|
||||||
messages: conversation,
|
messages: conversation,
|
||||||
tools: toTools(enabledTools),
|
tools: toTools(enabledTools),
|
||||||
@@ -248,6 +288,7 @@ export async function completeWithMessagesApi(params: ToolAwareCompletionParams)
|
|||||||
|
|
||||||
export async function* streamWithMessagesApi(params: ToolAwareCompletionParams): AsyncGenerator<ToolAwareStreamingEvent> {
|
export async function* streamWithMessagesApi(params: ToolAwareCompletionParams): AsyncGenerator<ToolAwareStreamingEvent> {
|
||||||
const enabledTools = getEnabledChatTools(params);
|
const enabledTools = getEnabledChatTools(params);
|
||||||
|
const maxTokens = await getMessagesMaxTokens(params);
|
||||||
if (!enabledTools.length) {
|
if (!enabledTools.length) {
|
||||||
const rawResponses: unknown[] = [];
|
const rawResponses: unknown[] = [];
|
||||||
const usageAcc: Required<ToolAwareUsage> = { inputTokens: 0, outputTokens: 0, totalTokens: 0 };
|
const usageAcc: Required<ToolAwareUsage> = { inputTokens: 0, outputTokens: 0, totalTokens: 0 };
|
||||||
@@ -259,7 +300,7 @@ export async function* streamWithMessagesApi(params: ToolAwareCompletionParams):
|
|||||||
const stream = await params.client.messages.create({
|
const stream = await params.client.messages.create({
|
||||||
model: params.model,
|
model: params.model,
|
||||||
system: buildTopLevelSystemPrompt(params.messages, params.userLocation),
|
system: buildTopLevelSystemPrompt(params.messages, params.userLocation),
|
||||||
max_tokens: params.maxTokens ?? 1024,
|
max_tokens: maxTokens,
|
||||||
temperature: params.temperature,
|
temperature: params.temperature,
|
||||||
messages: buildBaseMessages(params),
|
messages: buildBaseMessages(params),
|
||||||
stream: true,
|
stream: true,
|
||||||
@@ -315,7 +356,7 @@ export async function* streamWithMessagesApi(params: ToolAwareCompletionParams):
|
|||||||
const stream = await params.client.messages.create({
|
const stream = await params.client.messages.create({
|
||||||
model: params.model,
|
model: params.model,
|
||||||
system: buildTopLevelSystemPrompt(params.messages, params.userLocation, buildChatToolSystemPrompt(params)),
|
system: buildTopLevelSystemPrompt(params.messages, params.userLocation, buildChatToolSystemPrompt(params)),
|
||||||
max_tokens: params.maxTokens ?? 1024,
|
max_tokens: maxTokens,
|
||||||
temperature: params.temperature,
|
temperature: params.temperature,
|
||||||
messages: conversation,
|
messages: conversation,
|
||||||
tools: toTools(enabledTools),
|
tools: toTools(enabledTools),
|
||||||
|
|||||||
@@ -140,6 +140,94 @@ test("plain Chat Completions stream does not send Sybil-managed tools", async ()
|
|||||||
assert.equal(events.at(-1)?.type === "done" ? events.at(-1)?.result.text : null, "Hi");
|
assert.equal(events.at(-1)?.type === "done" ? events.at(-1)?.result.text : null, "Hi");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("Messages API defaults max_tokens to the Anthropic model maximum", async () => {
|
||||||
|
let requestBody: any = null;
|
||||||
|
let retrievedModel: string | null = null;
|
||||||
|
const client = {
|
||||||
|
models: {
|
||||||
|
retrieve: async (model: string) => {
|
||||||
|
retrievedModel = model;
|
||||||
|
return { id: model, max_tokens: 128000 };
|
||||||
|
},
|
||||||
|
},
|
||||||
|
messages: {
|
||||||
|
create: async (body: any) => {
|
||||||
|
requestBody = body;
|
||||||
|
return {
|
||||||
|
content: [{ type: "text", text: "Done" }],
|
||||||
|
usage: { input_tokens: 1, output_tokens: 1 },
|
||||||
|
};
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
const result = await completeWithMessagesApi({
|
||||||
|
client: client as any,
|
||||||
|
model: "claude-max-default-test",
|
||||||
|
messages: [{ role: "user", content: "Say done" }],
|
||||||
|
});
|
||||||
|
|
||||||
|
assert.equal(retrievedModel, "claude-max-default-test");
|
||||||
|
assert.equal(requestBody?.max_tokens, 128000);
|
||||||
|
assert.equal(result.text, "Done");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("Messages API preserves explicit maxTokens", async () => {
|
||||||
|
let requestBody: any = null;
|
||||||
|
let didRetrieveModel = false;
|
||||||
|
const client = {
|
||||||
|
models: {
|
||||||
|
retrieve: async () => {
|
||||||
|
didRetrieveModel = true;
|
||||||
|
return { max_tokens: 128000 };
|
||||||
|
},
|
||||||
|
},
|
||||||
|
messages: {
|
||||||
|
create: async (body: any) => {
|
||||||
|
requestBody = body;
|
||||||
|
return streamFrom([
|
||||||
|
{
|
||||||
|
type: "message_start",
|
||||||
|
message: {
|
||||||
|
usage: { input_tokens: 1, output_tokens: 0 },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: "content_block_start",
|
||||||
|
index: 0,
|
||||||
|
content_block: { type: "text", text: "" },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: "content_block_delta",
|
||||||
|
index: 0,
|
||||||
|
delta: { type: "text_delta", text: "Done" },
|
||||||
|
},
|
||||||
|
{ type: "content_block_stop", index: 0 },
|
||||||
|
{
|
||||||
|
type: "message_delta",
|
||||||
|
delta: { stop_reason: "end_turn", stop_sequence: null },
|
||||||
|
usage: { output_tokens: 1 },
|
||||||
|
},
|
||||||
|
{ type: "message_stop" },
|
||||||
|
]);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
const events = await collectEvents(
|
||||||
|
streamWithMessagesApi({
|
||||||
|
client: client as any,
|
||||||
|
model: "claude-explicit-max-test",
|
||||||
|
messages: [{ role: "user", content: "Say done" }],
|
||||||
|
maxTokens: 4096,
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
assert.equal(didRetrieveModel, false);
|
||||||
|
assert.equal(requestBody?.max_tokens, 4096);
|
||||||
|
assert.equal(events.at(-1)?.type === "done" ? events.at(-1)?.result.text : null, "Done");
|
||||||
|
});
|
||||||
|
|
||||||
test("fetch_url sends browser-like navigation headers", async () => {
|
test("fetch_url sends browser-like navigation headers", async () => {
|
||||||
const originalFetch = globalThis.fetch;
|
const originalFetch = globalThis.fetch;
|
||||||
const fetchCalls: Array<{ input: RequestInfo | URL; init?: RequestInit }> = [];
|
const fetchCalls: Array<{ input: RequestInfo | URL; init?: RequestInit }> = [];
|
||||||
|
|||||||
+30
-1
@@ -286,6 +286,14 @@ textarea {
|
|||||||
word-break: break-word;
|
word-break: break-word;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.md-content > :first-child {
|
||||||
|
margin-top: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.md-content > :last-child {
|
||||||
|
margin-bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
.md-table-scroll {
|
.md-table-scroll {
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
margin: 0.35rem 0 1rem;
|
margin: 0.35rem 0 1rem;
|
||||||
@@ -384,7 +392,8 @@ textarea {
|
|||||||
|
|
||||||
.md-content ul,
|
.md-content ul,
|
||||||
.md-content ol {
|
.md-content ol {
|
||||||
margin-top: 0.65rem;
|
margin-top: 0.85rem;
|
||||||
|
margin-bottom: 0.85rem;
|
||||||
margin-left: 0;
|
margin-left: 0;
|
||||||
padding-left: 0;
|
padding-left: 0;
|
||||||
list-style: none;
|
list-style: none;
|
||||||
@@ -396,6 +405,26 @@ textarea {
|
|||||||
padding-left: 1.35rem;
|
padding-left: 1.35rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.md-content ul > li {
|
||||||
|
position: relative;
|
||||||
|
padding-left: 1.1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.md-content ul > li::before {
|
||||||
|
content: "";
|
||||||
|
position: absolute;
|
||||||
|
left: 0;
|
||||||
|
top: 0.76em;
|
||||||
|
width: 0.36rem;
|
||||||
|
height: 0.36rem;
|
||||||
|
border-radius: 9999px;
|
||||||
|
background: hsl(188 86% 62%);
|
||||||
|
box-shadow:
|
||||||
|
0 0 0 2px hsl(188 86% 62% / 0.12),
|
||||||
|
0 0 10px hsl(188 86% 62% / 0.42);
|
||||||
|
transform: translateY(-50%);
|
||||||
|
}
|
||||||
|
|
||||||
.md-content li + li {
|
.md-content li + li {
|
||||||
margin-top: 0.3rem;
|
margin-top: 0.3rem;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user