Compare commits
9 Commits
v0.7.3
...
52356ead6c
| Author | SHA1 | Date | |
|---|---|---|---|
|
52356ead6c
|
|||
|
ad9fc524d4
|
|||
|
af50909a89
|
|||
|
318d9ba1cd
|
|||
|
45d709f28e
|
|||
|
9cd074cb9b
|
|||
|
93eec45473
|
|||
|
e585e0b049
|
|||
|
13bfaf9aca
|
+1
-1
@@ -49,7 +49,7 @@ textwrap = "0.16.0"
|
|||||||
ansi_colours = "1.2.2"
|
ansi_colours = "1.2.2"
|
||||||
eventsource-stream = "0.2.3"
|
eventsource-stream = "0.2.3"
|
||||||
log = "0.4.28"
|
log = "0.4.28"
|
||||||
log4rs = { version = "1.4.0", features = ["file_appender"] }
|
log4rs = { version = "1.4.0", features = ["file_appender", "rolling_file_appender", "compound_policy", "fixed_window_roller", "size_trigger"] }
|
||||||
shell-words = "1.1.0"
|
shell-words = "1.1.0"
|
||||||
sha2 = "0.10.8"
|
sha2 = "0.10.8"
|
||||||
unicode-width = "0.2.0"
|
unicode-width = "0.2.0"
|
||||||
|
|||||||
@@ -98,7 +98,7 @@ You can use the following command to run a bash script that downloads and instal
|
|||||||
OS (Linux/MacOS) and architecture (x86_64/arm64):
|
OS (Linux/MacOS) and architecture (x86_64/arm64):
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
curl -fsSL https://raw.githubusercontent.com/Dark-Alex-17/coyote/main/install_coyote.sh | bash
|
curl -fsSL https://raw.githubusercontent.com/Dark-Alex-17/coyote/refs/heads/main/scripts/install_coyote.sh | bash
|
||||||
```
|
```
|
||||||
|
|
||||||
#### Windows/Linux/MacOS (`PowerShell`)
|
#### Windows/Linux/MacOS (`PowerShell`)
|
||||||
@@ -106,7 +106,7 @@ You can use the following command to run a PowerShell script that downloads and
|
|||||||
for your OS (Windows/Linux/MacOS) and architecture (x86_64/arm64):
|
for your OS (Windows/Linux/MacOS) and architecture (x86_64/arm64):
|
||||||
|
|
||||||
```powershell
|
```powershell
|
||||||
powershell -NoProfile -ExecutionPolicy Bypass -Command "iwr -useb https://raw.githubusercontent.com/Dark-Alex-17/coyote/main/scripts/install_coyote.ps1 | iex"
|
powershell -NoProfile -ExecutionPolicy Bypass -Command "iwr -useb https://raw.githubusercontent.com/Dark-Alex-17/coyote/refs/heads/main/scripts/install_coyote.ps1 | iex"
|
||||||
```
|
```
|
||||||
|
|
||||||
### Manual
|
### Manual
|
||||||
|
|||||||
+58
-53
@@ -5,7 +5,7 @@
|
|||||||
# sbx cp $HOME/.config/coyote/ testing:/home/agent/.config/
|
# sbx cp $HOME/.config/coyote/ testing:/home/agent/.config/
|
||||||
# sbx cp $HOME/.coyote_password testing:/home/agent/
|
# sbx cp $HOME/.coyote_password testing:/home/agent/
|
||||||
# sbx run testing --kit ./sbx-kit/
|
# sbx run testing --kit ./sbx-kit/
|
||||||
schemaVersion: "1"
|
schemaVersion: '1'
|
||||||
kind: agent
|
kind: agent
|
||||||
name: coyote
|
name: coyote
|
||||||
displayName: Coyote
|
displayName: Coyote
|
||||||
@@ -14,11 +14,10 @@ description: >
|
|||||||
CLI & REPL mode, RAG, AI tools & agents, MCP servers, skills, and macros.
|
CLI & REPL mode, RAG, AI tools & agents, MCP servers, skills, and macros.
|
||||||
|
|
||||||
agent:
|
agent:
|
||||||
image: "docker/sandbox-templates:shell-docker"
|
image: 'docker/sandbox-templates:shell-docker'
|
||||||
aiFilename: COYOTE.md
|
aiFilename: COYOTE.md
|
||||||
# persistence: persistent
|
|
||||||
entrypoint:
|
entrypoint:
|
||||||
run: ["bash", "-lc", "exec /home/agent/.cargo/bin/coyote"]
|
run: ['bash', '-lc', 'exec /home/agent/.cargo/bin/coyote']
|
||||||
|
|
||||||
network:
|
network:
|
||||||
# Proxy-managed LLM providers: the proxy substitutes `proxy-managed` for
|
# Proxy-managed LLM providers: the proxy substitutes `proxy-managed` for
|
||||||
@@ -51,96 +50,96 @@ network:
|
|||||||
serviceAuth:
|
serviceAuth:
|
||||||
openai:
|
openai:
|
||||||
headerName: Authorization
|
headerName: Authorization
|
||||||
valueFormat: "Bearer %s"
|
valueFormat: 'Bearer %s'
|
||||||
anthropic:
|
anthropic:
|
||||||
headerName: x-api-key
|
headerName: x-api-key
|
||||||
valueFormat: "%s"
|
valueFormat: '%s'
|
||||||
gemini:
|
gemini:
|
||||||
headerName: x-goog-api-key
|
headerName: x-goog-api-key
|
||||||
valueFormat: "%s"
|
valueFormat: '%s'
|
||||||
cohere:
|
cohere:
|
||||||
headerName: Authorization
|
headerName: Authorization
|
||||||
valueFormat: "Bearer %s"
|
valueFormat: 'Bearer %s'
|
||||||
groq:
|
groq:
|
||||||
headerName: Authorization
|
headerName: Authorization
|
||||||
valueFormat: "Bearer %s"
|
valueFormat: 'Bearer %s'
|
||||||
openrouter:
|
openrouter:
|
||||||
headerName: Authorization
|
headerName: Authorization
|
||||||
valueFormat: "Bearer %s"
|
valueFormat: 'Bearer %s'
|
||||||
ai21:
|
ai21:
|
||||||
headerName: Authorization
|
headerName: Authorization
|
||||||
valueFormat: "Bearer %s"
|
valueFormat: 'Bearer %s'
|
||||||
cloudflare:
|
cloudflare:
|
||||||
headerName: Authorization
|
headerName: Authorization
|
||||||
valueFormat: "Bearer %s"
|
valueFormat: 'Bearer %s'
|
||||||
deepinfra:
|
deepinfra:
|
||||||
headerName: Authorization
|
headerName: Authorization
|
||||||
valueFormat: "Bearer %s"
|
valueFormat: 'Bearer %s'
|
||||||
deepseek:
|
deepseek:
|
||||||
headerName: Authorization
|
headerName: Authorization
|
||||||
valueFormat: "Bearer %s"
|
valueFormat: 'Bearer %s'
|
||||||
mistral:
|
mistral:
|
||||||
headerName: Authorization
|
headerName: Authorization
|
||||||
valueFormat: "Bearer %s"
|
valueFormat: 'Bearer %s'
|
||||||
perplexity:
|
perplexity:
|
||||||
headerName: Authorization
|
headerName: Authorization
|
||||||
valueFormat: "Bearer %s"
|
valueFormat: 'Bearer %s'
|
||||||
voyageai:
|
voyageai:
|
||||||
headerName: Authorization
|
headerName: Authorization
|
||||||
valueFormat: "Bearer %s"
|
valueFormat: 'Bearer %s'
|
||||||
xai:
|
xai:
|
||||||
headerName: Authorization
|
headerName: Authorization
|
||||||
valueFormat: "Bearer %s"
|
valueFormat: 'Bearer %s'
|
||||||
jina:
|
jina:
|
||||||
headerName: Authorization
|
headerName: Authorization
|
||||||
valueFormat: "Bearer %s"
|
valueFormat: 'Bearer %s'
|
||||||
ernie:
|
ernie:
|
||||||
headerName: Authorization
|
headerName: Authorization
|
||||||
valueFormat: "Bearer %s"
|
valueFormat: 'Bearer %s'
|
||||||
hunyuan:
|
hunyuan:
|
||||||
headerName: Authorization
|
headerName: Authorization
|
||||||
valueFormat: "Bearer %s"
|
valueFormat: 'Bearer %s'
|
||||||
minimax:
|
minimax:
|
||||||
headerName: Authorization
|
headerName: Authorization
|
||||||
valueFormat: "Bearer %s"
|
valueFormat: 'Bearer %s'
|
||||||
moonshot:
|
moonshot:
|
||||||
headerName: Authorization
|
headerName: Authorization
|
||||||
valueFormat: "Bearer %s"
|
valueFormat: 'Bearer %s'
|
||||||
qianwen:
|
qianwen:
|
||||||
headerName: Authorization
|
headerName: Authorization
|
||||||
valueFormat: "Bearer %s"
|
valueFormat: 'Bearer %s'
|
||||||
zhipuai:
|
zhipuai:
|
||||||
headerName: Authorization
|
headerName: Authorization
|
||||||
valueFormat: "Bearer %s"
|
valueFormat: 'Bearer %s'
|
||||||
allowedDomains:
|
allowedDomains:
|
||||||
# Coyote release + self-update + model-registry sync
|
# Coyote release + self-update + model-registry sync
|
||||||
- "github.com:443"
|
- 'github.com:443'
|
||||||
- "api.github.com:443"
|
- 'api.github.com:443'
|
||||||
- "raw.githubusercontent.com:443"
|
- 'raw.githubusercontent.com:443'
|
||||||
- "objects.githubusercontent.com:443"
|
- 'objects.githubusercontent.com:443'
|
||||||
- "*.githubusercontent.com:443"
|
- '*.githubusercontent.com:443'
|
||||||
# Coyote install paths (cargo install + uv + rustup + Python tool deps at runtime)
|
# Coyote install paths (cargo install + uv + rustup + Python tool deps at runtime)
|
||||||
- "crates.io:443"
|
- 'crates.io:443'
|
||||||
- "static.crates.io:443"
|
- 'static.crates.io:443'
|
||||||
- "pypi.org:443"
|
- 'pypi.org:443'
|
||||||
- "files.pythonhosted.org:443"
|
- 'files.pythonhosted.org:443'
|
||||||
- "astral.sh:443"
|
- 'astral.sh:443'
|
||||||
- "sh.rustup.rs:443"
|
- 'sh.rustup.rs:443'
|
||||||
- "static.rust-lang.org:443"
|
- 'static.rust-lang.org:443'
|
||||||
|
|
||||||
# LLM model OAuth + API endpoints
|
# LLM model OAuth + API endpoints
|
||||||
- "claude.ai:443"
|
- 'claude.ai:443'
|
||||||
- "console.anthropic.com:443"
|
- 'console.anthropic.com:443'
|
||||||
- "accounts.google.com:443"
|
- 'accounts.google.com:443'
|
||||||
# *.googleapis.com covers oauth2 + userinfo + VertexAI regional endpoints
|
# *.googleapis.com covers oauth2 + userinfo + VertexAI regional endpoints
|
||||||
# (*-aiplatform.googleapis.com). Do not narrow without re-checking VertexAI.
|
# (*-aiplatform.googleapis.com). Do not narrow without re-checking VertexAI.
|
||||||
- "*.googleapis.com:443"
|
- '*.googleapis.com:443'
|
||||||
|
|
||||||
# Bedrock and GitHub Models use signed / GitHub-PAT auth that the proxy
|
# Bedrock and GitHub Models use signed / GitHub-PAT auth that the proxy
|
||||||
# cannot rewrite. Domains are allow-listed; credentials must be injected
|
# cannot rewrite. Domains are allow-listed; credentials must be injected
|
||||||
# separately (see README "Extending").
|
# separately (see README "Extending").
|
||||||
- "*.amazonaws.com:443"
|
- '*.amazonaws.com:443'
|
||||||
- "models.inference.ai.azure.com:443"
|
- 'models.inference.ai.azure.com:443'
|
||||||
|
|
||||||
credentials:
|
credentials:
|
||||||
sources:
|
sources:
|
||||||
@@ -211,8 +210,9 @@ credentials:
|
|||||||
|
|
||||||
environment:
|
environment:
|
||||||
variables:
|
variables:
|
||||||
IS_SANDBOX: "1"
|
IS_SANDBOX: '1'
|
||||||
COYOTE_LOG_LEVEL: INFO
|
COYOTE_LOG_LEVEL: INFO
|
||||||
|
COYOTE_CONFIG_DIR: /home/agent/.config/coyote
|
||||||
proxyManaged:
|
proxyManaged:
|
||||||
- OPENAI_API_KEY
|
- OPENAI_API_KEY
|
||||||
- ANTHROPIC_API_KEY
|
- ANTHROPIC_API_KEY
|
||||||
@@ -250,14 +250,14 @@ commands:
|
|||||||
libssl-dev \
|
libssl-dev \
|
||||||
pandoc \
|
pandoc \
|
||||||
bzip2
|
bzip2
|
||||||
user: "1000"
|
user: '1000'
|
||||||
description: Install system prerequisites (including pandoc for fetch_url_via_curl)
|
description: Install system prerequisites (including pandoc for fetch_url_via_curl)
|
||||||
- command: "curl -LsSf https://astral.sh/uv/install.sh | sh"
|
- command: 'curl -LsSf https://astral.sh/uv/install.sh | sh'
|
||||||
user: "1000"
|
user: '1000'
|
||||||
description: Install uv (required for Python-based custom tools)
|
description: Install uv (required for Python-based custom tools)
|
||||||
- command: |
|
- command: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
USQL_VERSION=$(curl -sSL https://api.github.com/repos/xo/usql/releases/latest | jq -r .tag_name | sed 's/^v//')
|
USQL_VERSION=0.21.4
|
||||||
ARCH=$(uname -m)
|
ARCH=$(uname -m)
|
||||||
case "$ARCH" in
|
case "$ARCH" in
|
||||||
x86_64) USQL_ARCH=amd64 ;;
|
x86_64) USQL_ARCH=amd64 ;;
|
||||||
@@ -266,10 +266,10 @@ commands:
|
|||||||
esac
|
esac
|
||||||
TMPDIR=$(mktemp -d)
|
TMPDIR=$(mktemp -d)
|
||||||
trap 'rm -rf "$TMPDIR"' EXIT
|
trap 'rm -rf "$TMPDIR"' EXIT
|
||||||
curl -sSL "https://github.com/xo/usql/releases/download/v${USQL_VERSION}/usql_static-${USQL_VERSION}-linux-${USQL_ARCH}.tar.bz2" -o "$TMPDIR/usql.tar.bz2"
|
curl -fsSL --retry 3 "https://github.com/xo/usql/releases/download/v${USQL_VERSION}/usql_static-${USQL_VERSION}-linux-${USQL_ARCH}.tar.bz2" -o "$TMPDIR/usql.tar.bz2"
|
||||||
tar -xjf "$TMPDIR/usql.tar.bz2" -C "$TMPDIR"
|
tar -xjf "$TMPDIR/usql.tar.bz2" -C "$TMPDIR"
|
||||||
sudo install -m 0755 "$TMPDIR/usql_static" /usr/local/bin/usql
|
sudo install -m 0755 "$TMPDIR/usql_static" /usr/local/bin/usql
|
||||||
user: "1000"
|
user: '1000'
|
||||||
description: Install the usql universal SQL CLI (used by the built-in sql agent and execute_sql_code tool)
|
description: Install the usql universal SQL CLI (used by the built-in sql agent and execute_sql_code tool)
|
||||||
- command: |
|
- command: |
|
||||||
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | \
|
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | \
|
||||||
@@ -279,12 +279,17 @@ commands:
|
|||||||
--target x86_64-unknown-linux-musl
|
--target x86_64-unknown-linux-musl
|
||||||
. "$HOME/.cargo/env"
|
. "$HOME/.cargo/env"
|
||||||
cargo install --locked coyote-ai
|
cargo install --locked coyote-ai
|
||||||
user: "1000"
|
user: '1000'
|
||||||
description: Install Coyote AI CLI via Rust's Cargo
|
description: Install Coyote AI CLI via Rust's Cargo
|
||||||
|
|
||||||
startup:
|
startup:
|
||||||
- command: ["sh", "-c", "test -f \"$HOME/.config/coyote/config.yaml\" || coyote --info >/dev/null 2>&1 || true"]
|
- command:
|
||||||
user: "1000"
|
[
|
||||||
|
'sh',
|
||||||
|
'-c',
|
||||||
|
'test -f "$HOME/.config/coyote/config.yaml" || coyote --info >/dev/null 2>&1 || true',
|
||||||
|
]
|
||||||
|
user: '1000'
|
||||||
background: false
|
background: false
|
||||||
description: Bootstrap Coyote config directory on first sandbox start
|
description: Bootstrap Coyote config directory on first sandbox start
|
||||||
|
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ switch ([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture) {
|
|||||||
|
|
||||||
if (-not $BinDir) {
|
if (-not $BinDir) {
|
||||||
if ($isWin) { $BinDir = Join-Path $env:LOCALAPPDATA 'coyote\bin' }
|
if ($isWin) { $BinDir = Join-Path $env:LOCALAPPDATA 'coyote\bin' }
|
||||||
else { $home = $env:HOME; if (-not $home) { $home = (Get-Item -Path ~).FullName }; $BinDir = Join-Path $home '.local/bin' }
|
else { $userHome = $env:HOME; if (-not $userHome) { $userHome = (Get-Item -Path ~).FullName }; $BinDir = Join-Path $userHome '.local/bin' }
|
||||||
}
|
}
|
||||||
New-Item -ItemType Directory -Force -Path $BinDir | Out-Null
|
New-Item -ItemType Directory -Force -Path $BinDir | Out-Null
|
||||||
|
|
||||||
@@ -95,13 +95,13 @@ if ($asset.name -match '\.zip$') {
|
|||||||
[System.IO.Compression.ZipFile]::ExtractToDirectory($archive, $extractDir)
|
[System.IO.Compression.ZipFile]::ExtractToDirectory($archive, $extractDir)
|
||||||
} elseif ($asset.name -match '\.tar\.gz$' -or $asset.name -match '\.tgz$') {
|
} elseif ($asset.name -match '\.tar\.gz$' -or $asset.name -match '\.tgz$') {
|
||||||
$tar = Get-Command tar -ErrorAction SilentlyContinue
|
$tar = Get-Command tar -ErrorAction SilentlyContinue
|
||||||
if ($tar) { & $tar.FullName -xzf $archive -C $extractDir }
|
if ($tar) { & $tar.Source -xzf $archive -C $extractDir }
|
||||||
else { Fail "Asset is tar archive but 'tar' is not available." }
|
else { Fail "Asset is tar archive but 'tar' is not available." }
|
||||||
} else {
|
} else {
|
||||||
try { Add-Type -AssemblyName System.IO.Compression.FileSystem; [System.IO.Compression.ZipFile]::ExtractToDirectory($archive, $extractDir) }
|
try { Add-Type -AssemblyName System.IO.Compression.FileSystem; [System.IO.Compression.ZipFile]::ExtractToDirectory($archive, $extractDir) }
|
||||||
catch {
|
catch {
|
||||||
$tar = Get-Command tar -ErrorAction SilentlyContinue
|
$tar = Get-Command tar -ErrorAction SilentlyContinue
|
||||||
if ($tar) { & $tar.FullName -xf $archive -C $extractDir } else { Fail "Unknown archive format; neither zip nor tar workable." }
|
if ($tar) { & $tar.Source -xf $archive -C $extractDir } else { Fail "Unknown archive format; neither zip nor tar workable." }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Regular → Executable
+13
-22
@@ -133,30 +133,21 @@ else
|
|||||||
echo "Error: unsupported OS for this installer: $OS" >&2; exit 1
|
echo "Error: unsupported OS for this installer: $OS" >&2; exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
DL_URLS=$(grep -oE '"browser_download_url":[[:space:]]*"[^"]+"' "$JSON" \
|
||||||
|
| sed -E 's/.*"browser_download_url":[[:space:]]*"//; s/"$//' \
|
||||||
|
|| true)
|
||||||
|
|
||||||
ASSET_NAME=""; ASSET_URL=""
|
ASSET_NAME=""; ASSET_URL=""
|
||||||
for candidate in "${ASSET_CANDIDATES[@]}"; do
|
for candidate in "${ASSET_CANDIDATES[@]}"; do
|
||||||
NAME=$(grep -oE '"name":\s*"[^"]+"' "$JSON" | sed 's/"name":\s*"//; s/"$//' | grep -Fx "$candidate" || true)
|
while IFS= read -r url; do
|
||||||
if [[ -n "$NAME" ]]; then
|
[[ -z "$url" ]] && continue
|
||||||
ASSET_NAME="$NAME"
|
if [[ "$url" == */"$candidate" ]]; then
|
||||||
ASSET_URL=$(awk -v pat="$NAME" '
|
ASSET_NAME="$candidate"
|
||||||
BEGIN{ FS=":"; want=0 }
|
ASSET_URL="$url"
|
||||||
/"name"/ {
|
break
|
||||||
line=$0;
|
fi
|
||||||
gsub(/^\s+|\s+$/,"",line);
|
done <<< "$DL_URLS"
|
||||||
gsub(/"name"\s*:\s*"|"/ ,"", line);
|
[[ -n "$ASSET_URL" ]] && break
|
||||||
want = (line==pat) ? 1 : 0;
|
|
||||||
next
|
|
||||||
}
|
|
||||||
want==1 && /"browser_download_url"/ {
|
|
||||||
u=$0;
|
|
||||||
gsub(/^\s+|\s+$/,"",u);
|
|
||||||
gsub(/.*"browser_download_url"\s*:\s*"|".*/ ,"", u);
|
|
||||||
print u;
|
|
||||||
exit
|
|
||||||
}
|
|
||||||
' "$JSON")
|
|
||||||
if [[ -n "$ASSET_URL" ]]; then break; fi
|
|
||||||
fi
|
|
||||||
done
|
done
|
||||||
|
|
||||||
if [[ -z "$ASSET_URL" ]]; then
|
if [[ -z "$ASSET_URL" ]]; then
|
||||||
|
|||||||
+19
-3
@@ -39,7 +39,10 @@ use client::ClientConfig;
|
|||||||
use inquire::{Select, Text, set_global_render_config};
|
use inquire::{Select, Text, set_global_render_config};
|
||||||
use log::{LevelFilter, warn};
|
use log::{LevelFilter, warn};
|
||||||
use log4rs::append::console::ConsoleAppender;
|
use log4rs::append::console::ConsoleAppender;
|
||||||
use log4rs::append::file::FileAppender;
|
use log4rs::append::rolling_file::RollingFileAppender;
|
||||||
|
use log4rs::append::rolling_file::policy::compound::CompoundPolicy;
|
||||||
|
use log4rs::append::rolling_file::policy::compound::roll::fixed_window::FixedWindowRoller;
|
||||||
|
use log4rs::append::rolling_file::policy::compound::trigger::size::SizeTrigger;
|
||||||
use log4rs::config::{Appender, Logger, Root};
|
use log4rs::config::{Appender, Logger, Root};
|
||||||
use log4rs::encode::pattern::PatternEncoder;
|
use log4rs::encode::pattern::PatternEncoder;
|
||||||
use oauth::OAuthProvider;
|
use oauth::OAuthProvider;
|
||||||
@@ -585,7 +588,20 @@ fn setup_logger() -> Result<Option<PathBuf>> {
|
|||||||
}
|
}
|
||||||
Some(path) => {
|
Some(path) => {
|
||||||
ensure_parent_exists(&path)?;
|
ensure_parent_exists(&path)?;
|
||||||
let file_appender = FileAppender::builder().encoder(encoder.clone()).build(path);
|
|
||||||
|
let archive_pattern = path
|
||||||
|
.with_extension("archived.{}.log")
|
||||||
|
.to_string_lossy()
|
||||||
|
.into_owned();
|
||||||
|
let trigger = SizeTrigger::new(10 * 1024 * 1024);
|
||||||
|
let roller = FixedWindowRoller::builder()
|
||||||
|
.build(&archive_pattern, 5)
|
||||||
|
.unwrap();
|
||||||
|
let policy = CompoundPolicy::new(Box::new(trigger), Box::new(roller));
|
||||||
|
|
||||||
|
let file_appender = RollingFileAppender::builder()
|
||||||
|
.encoder(encoder.clone())
|
||||||
|
.build(path, Box::new(policy));
|
||||||
|
|
||||||
match file_appender {
|
match file_appender {
|
||||||
Ok(appender) => {
|
Ok(appender) => {
|
||||||
@@ -608,7 +624,7 @@ fn setup_logger() -> Result<Option<PathBuf>> {
|
|||||||
fn init_file_logger(
|
fn init_file_logger(
|
||||||
log_level: LevelFilter,
|
log_level: LevelFilter,
|
||||||
log_filter: Option<String>,
|
log_filter: Option<String>,
|
||||||
file_appender: FileAppender,
|
file_appender: RollingFileAppender,
|
||||||
) -> log4rs::Config {
|
) -> log4rs::Config {
|
||||||
let root_log_level = if log_filter.is_some() {
|
let root_log_level = if log_filter.is_some() {
|
||||||
LevelFilter::Off
|
LevelFilter::Off
|
||||||
|
|||||||
+26
-3
@@ -356,9 +356,9 @@ fn build_create_args(
|
|||||||
args.push(mixin_str);
|
args.push(mixin_str);
|
||||||
}
|
}
|
||||||
|
|
||||||
args.push(SANDBOX_AGENT.to_string());
|
|
||||||
args.push("--name".to_string());
|
args.push("--name".to_string());
|
||||||
args.push(name.to_string());
|
args.push(name.to_string());
|
||||||
|
args.push(SANDBOX_AGENT.to_string());
|
||||||
args.push(".".to_string());
|
args.push(".".to_string());
|
||||||
|
|
||||||
Ok(args)
|
Ok(args)
|
||||||
@@ -373,6 +373,7 @@ fn copy_host_files(name: &str) -> Result<()> {
|
|||||||
let src = format!("{}/", config_dir.display());
|
let src = format!("{}/", config_dir.display());
|
||||||
let dest = format!("{name}:/home/agent/.config/");
|
let dest = format!("{name}:/home/agent/.config/");
|
||||||
sbx_cp(&src, &dest)?;
|
sbx_cp(&src, &dest)?;
|
||||||
|
chown_agent_recursive(name, "/home/agent/.config")?;
|
||||||
} else {
|
} else {
|
||||||
debug!(
|
debug!(
|
||||||
"Skipping config copy: {} does not exist",
|
"Skipping config copy: {} does not exist",
|
||||||
@@ -390,6 +391,7 @@ fn copy_host_files(name: &str) -> Result<()> {
|
|||||||
}
|
}
|
||||||
let dest = format!("{name}:{dest_path}");
|
let dest = format!("{name}:{dest_path}");
|
||||||
sbx_cp(&password_file.display().to_string(), &dest)?;
|
sbx_cp(&password_file.display().to_string(), &dest)?;
|
||||||
|
chown_agent_recursive(name, &dest_path)?;
|
||||||
}
|
}
|
||||||
Some(password_file) => {
|
Some(password_file) => {
|
||||||
debug!(
|
debug!(
|
||||||
@@ -520,6 +522,27 @@ fn exec_run(name: &str, kit_path: &Path) -> Result<()> {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn chown_agent_recursive(sandbox: &str, path: &str) -> Result<()> {
|
||||||
|
let path_q = shell_words::quote(path);
|
||||||
|
let cmd = format!("sudo chown -R agent:agent {path_q}");
|
||||||
|
|
||||||
|
debug!("sbx exec {sandbox}: {cmd}");
|
||||||
|
|
||||||
|
let status = Command::new(SBX_BINARY)
|
||||||
|
.args(["exec", sandbox, "sh", "-c", &cmd])
|
||||||
|
.stdin(Stdio::inherit())
|
||||||
|
.stdout(Stdio::inherit())
|
||||||
|
.stderr(Stdio::inherit())
|
||||||
|
.status()
|
||||||
|
.context("Failed to spawn `sbx exec` to chown copied files")?;
|
||||||
|
|
||||||
|
if !status.success() {
|
||||||
|
bail!("Chowning '{path}' in sandbox failed: sbx exec exited with {status}");
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
@@ -627,9 +650,9 @@ mod tests {
|
|||||||
dir_a.display().to_string(),
|
dir_a.display().to_string(),
|
||||||
"--kit".to_string(),
|
"--kit".to_string(),
|
||||||
dir_b.display().to_string(),
|
dir_b.display().to_string(),
|
||||||
"coyote".to_string(),
|
|
||||||
"--name".to_string(),
|
"--name".to_string(),
|
||||||
"my-box".to_string(),
|
"my-box".to_string(),
|
||||||
|
"coyote".to_string(),
|
||||||
".".to_string(),
|
".".to_string(),
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
@@ -648,9 +671,9 @@ mod tests {
|
|||||||
"create".to_string(),
|
"create".to_string(),
|
||||||
"--kit".to_string(),
|
"--kit".to_string(),
|
||||||
"/cache/sbx-kit".to_string(),
|
"/cache/sbx-kit".to_string(),
|
||||||
"coyote".to_string(),
|
|
||||||
"--name".to_string(),
|
"--name".to_string(),
|
||||||
"box".to_string(),
|
"box".to_string(),
|
||||||
|
"coyote".to_string(),
|
||||||
".".to_string(),
|
".".to_string(),
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
|
|||||||
+33
-8
@@ -1,9 +1,11 @@
|
|||||||
use crate::config::paths;
|
use crate::config::paths;
|
||||||
use colored::Colorize;
|
use colored::Colorize;
|
||||||
use fancy_regex::Regex;
|
use fancy_regex::Regex;
|
||||||
use std::fs::File;
|
use std::fs::{self, File};
|
||||||
use std::io::{BufRead, BufReader, Seek, SeekFrom};
|
use std::io::{BufRead, BufReader, Seek, SeekFrom};
|
||||||
use std::process;
|
use std::process;
|
||||||
|
use std::time::Duration;
|
||||||
|
use tokio::time::sleep;
|
||||||
|
|
||||||
pub async fn tail_logs(no_color: bool) {
|
pub async fn tail_logs(no_color: bool) {
|
||||||
let re = Regex::new(r"^(?P<timestamp>\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3})\s+<(?P<opid>[^\s>]+)>\s+\[(?P<level>[A-Z]+)\]\s+(?P<logger>[^:]+):(?P<line>\d+)\s+-\s+(?P<message>.*)$").unwrap();
|
let re = Regex::new(r"^(?P<timestamp>\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3})\s+<(?P<opid>[^\s>]+)>\s+\[(?P<level>[A-Z]+)\]\s+(?P<logger>[^:]+):(?P<line>\d+)\s+-\s+(?P<message>.*)$").unwrap();
|
||||||
@@ -16,20 +18,43 @@ pub async fn tail_logs(no_color: bool) {
|
|||||||
process::exit(1);
|
process::exit(1);
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut lines = reader.lines();
|
let mut line_buf = String::new();
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
if let Some(Ok(line)) = lines.next() {
|
match reader.read_line(&mut line_buf) {
|
||||||
if no_color {
|
Ok(0) => {
|
||||||
println!("{line}");
|
if file_was_rotated(&file_path, &mut reader) {
|
||||||
} else {
|
let file = File::open(&file_path).expect("Cannot open file");
|
||||||
let colored_line = colorize_log_line(&line, &re);
|
reader = BufReader::new(file);
|
||||||
println!("{colored_line}");
|
}
|
||||||
|
sleep(Duration::from_millis(100)).await;
|
||||||
|
}
|
||||||
|
Ok(_) => {
|
||||||
|
let line = line_buf.trim_end();
|
||||||
|
if no_color {
|
||||||
|
println!("{line}");
|
||||||
|
} else {
|
||||||
|
let colored_line = colorize_log_line(line, &re);
|
||||||
|
println!("{colored_line}");
|
||||||
|
}
|
||||||
|
line_buf.clear();
|
||||||
|
}
|
||||||
|
Err(_) => {
|
||||||
|
line_buf.clear();
|
||||||
|
sleep(Duration::from_millis(100)).await;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn file_was_rotated(path: &std::path::Path, reader: &mut BufReader<File>) -> bool {
|
||||||
|
let current_pos = reader.stream_position().unwrap_or(0);
|
||||||
|
match fs::metadata(path) {
|
||||||
|
Ok(metadata) => metadata.len() < current_pos,
|
||||||
|
Err(_) => true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn colorize_log_line(line: &str, re: &Regex) -> String {
|
fn colorize_log_line(line: &str, re: &Regex) -> String {
|
||||||
if let Some(caps) = re.captures(line).expect("Failed to capture log line") {
|
if let Some(caps) = re.captures(line).expect("Failed to capture log line") {
|
||||||
let level = &caps["level"];
|
let level = &caps["level"];
|
||||||
|
|||||||
Reference in New Issue
Block a user